diff --git a/.github/workflows/aam-backend-service-build-and-publish-pr.yml b/.github/workflows/aam-backend-service-build-and-publish-pr.yml
index b7565b2..bba98c9 100644
--- a/.github/workflows/aam-backend-service-build-and-publish-pr.yml
+++ b/.github/workflows/aam-backend-service-build-and-publish-pr.yml
@@ -29,6 +29,12 @@ jobs:
         working-directory: application/aam-backend-service
         run: ./gradlew installDist
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -39,7 +45,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           context: ./application/aam-backend-service
           push: true
           tags: ghcr.io/aam-digital/aam-backend-service:pr-${{ github.event.number }}
diff --git a/.github/workflows/aam-backend-service-build-and-publish.yml b/.github/workflows/aam-backend-service-build-and-publish.yml
index 8f5a6b1..e45b1ec 100644
--- a/.github/workflows/aam-backend-service-build-and-publish.yml
+++ b/.github/workflows/aam-backend-service-build-and-publish.yml
@@ -26,6 +26,12 @@ jobs:
         working-directory: application/aam-backend-service
         run: ./gradlew installDist
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -41,7 +47,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           context: ./application/aam-backend-service
           push: true
           tags: ghcr.io/aam-digital/aam-backend-service:${{ env.TAG_VERSION }},ghcr.io/aam-digital/aam-backend-service:latest