diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 26a4e2f8..a402e592 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -34,12 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     services:
       registry:
-        image: registry:2
+        image: docker.io/registry:2
         ports:
           - 5000:5000
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
 
     steps:
       - name: Checkout
@@ -47,6 +44,9 @@ jobs:
 
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
 
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v3
@@ -92,3 +92,4 @@ jobs:
         uses: docker/bake-action@v6.5.0
         with:
           push: true
+          set: "*.platform=linux/amd64,linux/arm64"