diff --git a/.changeset/curvy-roses-suffer.md b/.changeset/curvy-roses-suffer.md
new file mode 100644
index 000000000..303057a6a
--- /dev/null
+++ b/.changeset/curvy-roses-suffer.md
@@ -0,0 +1,7 @@
+---
+'@powersync/diagnostics-app': patch
+---
+
+Include arm64 builds in Docker image.
+
+Closes https://github.com/powersync-ja/powersync-js/issues/780.
diff --git a/.github/workflows/diagnostics-image-build.yaml b/.github/workflows/diagnostics-image-build.yaml
index 0b31dc9ae..5110661e9 100644
--- a/.github/workflows/diagnostics-image-build.yaml
+++ b/.github/workflows/diagnostics-image-build.yaml
@@ -14,13 +14,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Build Image
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64
+          platforms: linux/arm64,linux/amd64
           cache-from: type=registry,ref=${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest
           context: .
           file: ./tools/diagnostics-app/Dockerfile
diff --git a/.github/workflows/diagnostics-image-release.yaml b/.github/workflows/diagnostics-image-release.yaml
index 4e8a85a88..ade98cab9 100644
--- a/.github/workflows/diagnostics-image-release.yaml
+++ b/.github/workflows/diagnostics-image-release.yaml
@@ -19,6 +19,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -36,7 +38,7 @@ jobs:
       - name: Build Image and Push
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64
+          platforms: linux/arm64,linux/amd64
           cache-from: type=registry,ref=${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest
           context: .
           tags: ${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest,${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:${{steps.get_version.outputs.IMAGE_VERSION}}