diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 9887720..fb3cadf 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         dotnet-version: [ '9.0.x' ]
-        arch: ['ubuntu-latest', 'ubuntu-latest-arm']
+        arch: ['ubuntu-latest']
 
     steps:
       - uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
     name: Build Containers
     strategy:
       matrix:
-        arch: ['ubuntu-latest', 'ubuntu-latest-arm']
+        arch: ['ubuntu-latest']
     needs: [build] # for ignoring bad builds
     if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
 
@@ -45,6 +45,9 @@ jobs:
         with: 
           github-server-url: https://gitea.sheep-ghoul.ts.net
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -59,6 +62,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: gitea.sheep-ghoul.ts.net/sarsoo/overflow:latest
           file: Dockerfile
           context: .
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 33858e7..c88d261 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         dotnet-version: [ '9.0.x' ]
-        arch: ['ubuntu-latest', 'ubuntu-24.04-arm']
+        arch: ['ubuntu-latest']
 
     steps:
       - uses: actions/checkout@v2
@@ -33,13 +33,16 @@ jobs:
     name: Build Containers
     strategy:
       matrix:
-        arch: ['ubuntu-latest', 'ubuntu-24.04-arm']
+        arch: ['ubuntu-latest']
     needs: [build] # for ignoring bad builds
     if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
 
     steps:
       - uses: actions/checkout@v3
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -53,6 +56,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             sarsoo/overflow:latest
             sarsoo/overflow:${{ github.ref_name }}