diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 12d050af..81632e96 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -86,9 +86,23 @@ jobs:
         with:
           submodules: true # for shunit2
 
+      - name: Set up QEMU
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+          #docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
+      - name: Set up Docker Buildx
+        run: |
+          #sudo apt-get update
+          #sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+          sudo apt-get install -y docker-buildx
+          docker buildx create --use
+
       - name: Build image
         run: |
-          docker build . \
+          docker buildx build . \
+            --platform linux/amd64,linux/arm64 \
             --pull=true \
             --file="${{ inputs.containerfile }}" \
             --tag="${{ inputs.image }}:${{ inputs.tag }}" \