diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index ac0d872e..26a4e2f8 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -45,16 +45,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup QEMU for Test Builds
-        if: ${{ !inputs.push }}
-        uses: docker/setup-qemu-action@v3
-
       - name: Setup QEMU
-        if: ${{ inputs.push }}
         uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:latest
-          platforms: all
 
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v3
@@ -100,4 +92,3 @@ jobs:
         uses: docker/bake-action@v6.5.0
         with:
           push: true
-          set: "*.platform=linux/amd64,linux/arm64"