diff --git a/.github/workflows/delivery.yml b/.github/workflows/delivery.yml
index bcb5911d..8ee315ff 100644
--- a/.github/workflows/delivery.yml
+++ b/.github/workflows/delivery.yml
@@ -63,7 +63,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: prepare
     steps:
-      - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -73,31 +74,40 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        run: docker build -t ghcr.io/${{ github.repository_owner }}/irma:${{ github.sha }} .
-
-      - name: Tag Docker image (edge)
-        if: needs.prepare.outputs.is-head-master == 'true'
-        run: docker tag ghcr.io/${{ github.repository_owner }}/irma:${{ github.sha }} ghcr.io/${{ github.repository_owner }}/irma:edge
-
-      - name: Tag Docker image (version)
-        if: github.event_name == 'release'
-        run: docker tag ghcr.io/${{ github.repository_owner }}/irma:${{ github.sha }} ghcr.io/${{ github.repository_owner }}/irma:${{ github.event.release.tag_name }}
-
-      - name: Tag Docker image (latest)
-        if: needs.prepare.outputs.is-latest-release == 'true'
-        run: docker tag ghcr.io/${{ github.repository_owner }}/irma:${{ github.sha }} ghcr.io/${{ github.repository_owner }}/irma:latest
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          tags: ghcr.io/${{ github.repository_owner }}/irma:${{ github.sha }}
 
       - name: Push Docker image (edge)
         if: needs.prepare.outputs.is-head-master == 'true'
-        run: docker push ghcr.io/${{ github.repository_owner }}/irma:edge
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/irma:${{ github.sha }}
+            ghcr.io/${{ github.repository_owner }}/irma:edge
 
       - name: Push Docker image (version)
         if: github.event_name == 'release'
-        run: docker push ghcr.io/${{ github.repository_owner }}/irma:${{ github.event.release.tag_name }}
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/irma:${{ github.sha }}
+            ghcr.io/${{ github.repository_owner }}/irma:${{ github.event.release.tag_name }}
 
-      - name: Tag Docker image (latest)
+      - name: Push Docker image (latest)
         if: needs.prepare.outputs.is-latest-release == 'true'
-        run: docker push ghcr.io/${{ github.repository_owner }}/irma:latest
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/irma:${{ github.sha }}
+            ghcr.io/${{ github.repository_owner }}/irma:latest
 
   build-release-artifact:
     needs: prepare