diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ef781724b..215b9b8fd 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -6,8 +6,14 @@ name: Docker
 # documentation.
 
 on:
+  # Allow manual runs from the Actions tab
+  workflow_dispatch:
+    inputs:
+      note:
+        description: Optional note for this run
+        required: false
   push:
-    branches: [ master ]
+    branches: [ master, main ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:
@@ -31,6 +37,15 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          # Ensure full history and tags are available if needed
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
@@ -59,3 +74,4 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
diff --git a/Dockerfile b/Dockerfile
index 11807d2bf..cf7178c42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18
+FROM --platform=$BUILDPLATFORM node:18
 
 RUN apt-get update && apt-get install -y graphicsmagick && apt-get clean