diff --git a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
index f26dffb60110..135a74c5f261 100644
--- a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
+++ b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
@@ -149,6 +149,12 @@ jobs:
         with:
           path: px4-firmware
           fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Download pixhawk artifacts
         uses: actions/download-artifact@v4
         with:
@@ -195,6 +201,8 @@ jobs:
         with:
           push: true
           context: .
+          # build for x86 and arm64
+          platforms: linux/amd64,linux/arm64
           file: px4-firmware/Tools/px_uploader.Dockerfile
           tags: ${{ steps.containermeta.outputs.tags }}
           labels: ${{ steps.containermeta.outputs.labels }}