diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 8a24c38..4654ded 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -12,9 +12,6 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        arch:
-          - amd64
-          - arm64
         version:
           - buster
           - bullseye
@@ -35,12 +32,28 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build amd64
+        uses: docker/build-push-action@v5
+        with:
+          load: true
+          tags: eumau/debian:${{ matrix.version }}${{ matrix.variant }}
+          platforms: linux/amd64
+          build-args: |
+            TARGET_ARCH=amd64
+      -
+        name: Build arm64
+        uses: docker/build-push-action@v5
+        with:
+          load: true
+          tags: eumau/debian:${{ matrix.version }}${{ matrix.variant }}
+          platforms: linux/arm64
+          build-args: |
+            TARGET_ARCH=arm64
       -
         name: Build and push
         uses: docker/build-push-action@v5
         with:
           push: true
           tags: eumau/debian:${{ matrix.version }}${{ matrix.variant }}
-          platforms: linux/${{ matrix.arch }}
-          build-args: |
-            TARGET_ARCH=${{ matrix.arch }}
+          platforms: linux/amd64,linux/arm64