diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index fb0124a..dfaa7c0 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -27,9 +27,18 @@ jobs:
       - name: Debug Git SHA
         run: echo "Git SHA ${{ steps.get_sha.outputs.sha }}"
 
+      # Set up QEMU for cross-platform builds
+      - name: Set up QEMU
+        # https://github.com/docker/setup-qemu-action
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/arm64,linux/amd64
+
       - name: Set up Docker Buildx
         # https://github.com/docker/setup-buildx-action
         uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container # Use a container driver for Buildx (default)
 
       - name: Log in to Docker Hub
         # https://github.com/docker/login-action
@@ -39,7 +48,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        # https://github.com/docker/build-push-action 
+        # https://github.com/docker/build-push-action
         uses: docker/build-push-action@v6
         with:
           context: ./docker # Build context