diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml
index f50cfdfd..d7fdc3f4 100644
--- a/.github/workflows/build_bench.yml
+++ b/.github/workflows/build_bench.yml
@@ -35,7 +35,6 @@ jobs:
         uses: docker/bake-action@v1.7.0
         with:
           targets: bench-test
-          set: "*.platform=${{ github.event_name != 'pull_request' && 'linux/amd64,linux/arm64' || 'linux/amd64' }}"
 
       - name: Login
         if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
@@ -50,3 +49,4 @@ jobs:
         with:
           targets: bench
           push: true
+          set: "*.platform=linux/amd64,linux/arm64"
diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index d0558e98..78a2c4cf 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -28,7 +28,7 @@ jobs:
       repo: erpnext
       version: develop
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-      platforms: ${{ github.event_name != 'pull_request' && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
+      platforms: linux/amd64,linux/arm64
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
index 36c4f757..732bf14f 100644
--- a/.github/workflows/build_stable.yml
+++ b/.github/workflows/build_stable.yml
@@ -40,7 +40,7 @@ jobs:
       repo: erpnext
       version: "13"
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-      platforms: linux/amd64
+      platforms: linux/amd64,linux/arm64
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -51,7 +51,7 @@ jobs:
       repo: erpnext
       version: "13"
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-      platforms: linux/amd64
+      platforms: linux/amd64,linux/arm64
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 1ea563d6..e584cae3 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -56,7 +56,6 @@ jobs:
         uses: docker/bake-action@v1.7.0
         with:
           push: true
-          set: "*.platform=${{ inputs.platforms }}"
         env:
           REGISTRY_USER: localhost:5000/frappe
 
@@ -88,3 +87,4 @@ jobs:
         uses: docker/bake-action@v1.7.0
         with:
           push: true
+          set: "*.platform=${{ inputs.platforms }}"