diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index 3129b36..703803a 100644
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -44,16 +44,18 @@ jobs:
 
   build_and_push:
     name: Build and push
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
     needs:
       - test
-    runs-on: ubuntu-latest
+    runs-on:
+      - ubuntu-latest
+      - linux_${{ matrix.arch }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -75,9 +77,6 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: |
-            linux/amd64
-            linux/arm64
           push: true
           tags: |
             ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}