diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index b7f888250..75d42c511 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -23,6 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
@@ -34,6 +38,4 @@ jobs:
       - name: Publish base image
         run: docker push ghcr.io/emfcamp/website-base:latest
       - name: Build base-dev image
-        run: docker build -t ghcr.io/emfcamp/website-base-dev:latest -f ./docker/Dockerfile.base-dev .
-      - name: Publish base-dev image
-        run: docker push ghcr.io/emfcamp/website-base-dev:latest
+        run: docker buildx build -t ghcr.io/emfcamp/website-base-dev:latest -f ./docker/Dockerfile.base-dev --push --platform=linux/amd64,linux/arm64 .
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 232dc36c2..1deb52812 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -27,6 +27,10 @@ jobs:
     needs: test
     steps:
       - uses: actions/checkout@v1
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
@@ -34,10 +38,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build app image
-        run: docker build -t ghcr.io/emfcamp/website:latest -f ./Dockerfile.prod .
-      - name: Publish app image
-        run: docker push ghcr.io/emfcamp/website:latest
+        run: docker buildx build -t ghcr.io/emfcamp/website:latest -f ./Dockerfile.prod --push --platform=linux/amd64,linux/arm64  .
       - name: Build static image
-        run: docker build -t ghcr.io/emfcamp/website-static:latest -f ./docker/static/Dockerfile ./docker/static/
-      - name: Publish static image
-        run: docker push ghcr.io/emfcamp/website-static:latest
+        run: docker buildx build -t ghcr.io/emfcamp/website-static:latest -f ./docker/static/Dockerfile --push --platform=linux/amd64,linux/arm64 ./docker/static/