diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 6ccad540d..436fe7eec 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -19,10 +19,37 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'ryanoasis' }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Build image
-        run: docker build -t nerdfonts/patcher .
-      - name: Push image
-        run: |
-          docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PAT }}
-          docker push nerdfonts/patcher
+      - name: Checkout
+        uses: actions/checkout@v3
+
+        # Docker Meta provides automatic, standard tagging
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          images: nerdfonts/patcher
+
+        # QEMU allows us to build container images for multiple architectures (amd64, ARM etc...)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+        # Docker Buildx provides Buildkit support
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PAT }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags:  ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}