diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 8042a94c..fc189eff 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -45,14 +45,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
+      - 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
-        with:
-          driver-opts: network=host
-          platforms: linux/${{ matrix.arch }}
 
       - name: Get latest versions
         run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }}
@@ -95,3 +95,4 @@ jobs:
         uses: docker/bake-action@v6.5.0
         with:
           push: true
+          set: "*.platform=linux/amd64,linux/arm64"