diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da7e584..d819172 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,7 +72,12 @@ jobs:
 
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: 'arm64,amd64'
 
     - name: Cache Docker layers
       uses: actions/cache@v2
@@ -98,6 +103,7 @@ jobs:
         password: ${{ secrets.QUAY_TOKEN }}
 
     - name: Login to GitHub Container Registry
+      if: needs.prebuild.outputs.version != ''
       uses: docker/login-action@v1
       with:
         registry: ghcr.io
@@ -113,6 +119,7 @@ jobs:
           file: ./Dockerfile
           push: ${{ github.event_name != 'pull_request' && needs.prebuild.outputs.version != '' }}
           tags: ${{ steps.prep.outputs.tags }}
+          platforms: 'arm64,amd64'
 
   release:
     needs: [ prebuild, build ]