diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml
index 1e0dc261..d7fdc3f4 100644
--- a/.github/workflows/build_bench.yml
+++ b/.github/workflows/build_bench.yml
@@ -22,6 +22,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v1
 
@@ -43,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 a852c953..78a2c4cf 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -28,6 +28,7 @@ jobs:
       repo: erpnext
       version: develop
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+      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 62341c5b..6ddea4a7 100644
--- a/.github/workflows/build_stable.yml
+++ b/.github/workflows/build_stable.yml
@@ -40,6 +40,7 @@ jobs:
       repo: erpnext
       version: "12"
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+      platforms: linux/amd64
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -50,6 +51,7 @@ jobs:
       repo: erpnext
       version: "13"
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+      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 aa3fa1c0..4479dbd2 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -14,6 +14,10 @@ on:
       push:
         required: true
         type: boolean
+      platforms:
+        required: true
+        type: string
+        description: "list of target platforms"
     secrets:
       DOCKERHUB_USERNAME:
         required: true
@@ -83,3 +87,4 @@ jobs:
         uses: docker/bake-action@v1.7.0
         with:
           push: true
+          set: "*.platform=${{ inputs.platforms }}"