diff --git a/.github/workflows/ghcr-push.yml b/.github/workflows/ghcr-push.yml
index f48e16c..71b21d6 100644
--- a/.github/workflows/ghcr-push.yml
+++ b/.github/workflows/ghcr-push.yml
@@ -20,15 +20,24 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       name: Checkout
-
-    - name: Build
-      run: |
-        docker build -f clang-format-16.dockerfile -t ghcr.io/cwpearson/clang-format-16:latest .
-
-    - name: Publish to GHCR
+    -
+      # Add support for more platforms with QEMU (optional)
+      # https://github.com/docker/setup-qemu-action
+      name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Log in to GHCR
       run: |
         echo '${{secrets.GHCR_TOKEN}}' | docker login ghcr.io -u cwpearson --password-stdin
-        docker push ghcr.io/cwpearson/clang-format-16:latest
+    - name: Build and Push
+      uses: docker/build-push-action@v2
+      with:
+        file: clang-format-16.dockerfile
+        push: true
+        platforms: linux/amd64,linux/arm64,linux/ppc64le
+        tags: |
+          ghcr.io/${{ github.repository_owner }}/clang-format-16:latest
   build-8:
     name: Build + Publish 8
     runs-on: ubuntu-latest