diff --git a/.github/workflows/climatemappedafrica-deploy-dev.yml b/.github/workflows/climatemappedafrica-deploy-dev.yml
index 804cbaede..cd5ee3ca3 100644
--- a/.github/workflows/climatemappedafrica-deploy-dev.yml
+++ b/.github/workflows/climatemappedafrica-deploy-dev.yml
@@ -2,7 +2,9 @@ name: Climate Mapped Africa | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
     paths:
       - "apps/climatemappedafrica/**"
       - "Dockerfile"
@@ -33,6 +35,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -58,6 +64,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           target: climatemappedafrica-runner
           push: true
           tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}"
diff --git a/.github/workflows/codeforafrica-deploy-dev.yml b/.github/workflows/codeforafrica-deploy-dev.yml
index 44b7d919b..c84bba404 100644
--- a/.github/workflows/codeforafrica-deploy-dev.yml
+++ b/.github/workflows/codeforafrica-deploy-dev.yml
@@ -2,7 +2,9 @@ name: Code for Africa | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
     paths:
       - "apps/codeforafrica/**"
       - "Dockerfile"
@@ -34,6 +36,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -66,6 +72,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"
diff --git a/.github/workflows/pesayetu-deploy-dev.yml b/.github/workflows/pesayetu-deploy-dev.yml
index a9a268c18..a9f7c70aa 100644
--- a/.github/workflows/pesayetu-deploy-dev.yml
+++ b/.github/workflows/pesayetu-deploy-dev.yml
@@ -2,7 +2,9 @@ name: Pesayetu | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
     paths:
       - "apps/pesayetu/**"
       - "Dockerfile.pesayetu"
@@ -34,6 +36,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -68,6 +74,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}"
           target: pesayetu-runner
diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml
index 104f05e56..b2a0754ce 100644
--- a/.github/workflows/roboshield-deploy-dev.yml
+++ b/.github/workflows/roboshield-deploy-dev.yml
@@ -2,7 +2,9 @@ name: RoboShield | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
     paths:
       - "apps/roboshield/**"
       - "Dockerfile"
@@ -34,6 +36,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -65,6 +71,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"