diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml
index 7f01096..b569766 100644
--- a/.github/workflows/build-push.yaml
+++ b/.github/workflows/build-push.yaml
@@ -18,6 +18,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: imagetag
     steps:
+    - 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
@@ -30,5 +32,6 @@ jobs:
       id: docker_build
       uses: docker/build-push-action@v5
       with:
+        platforms: linux/amd64,linux/arm64
         push: true
         tags: ghcr.io/amazeeio/opensearch:${{ needs.imagetag.outputs.version }}
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2b1f0b2..2298835 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,6 +18,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: imagetag
     steps:
+    - 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
@@ -30,12 +32,15 @@ jobs:
       id: docker_build
       uses: docker/build-push-action@v5
       with:
+        platforms: linux/amd64,linux/arm64
         tags: ghcr.io/amazeeio/opensearch:pr${{ github.event.pull_request.number }}-${{ needs.imagetag.outputs.version }}
   build-push:
     runs-on: ubuntu-latest
     needs: imagetag
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
+    - 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
@@ -48,5 +53,6 @@ jobs:
       id: docker_build
       uses: docker/build-push-action@v5
       with:
+        platforms: linux/amd64,linux/arm64
         push: true
         tags: ghcr.io/amazeeio/opensearch:pr${{ github.event.pull_request.number }}-${{ needs.imagetag.outputs.version }}