diff --git a/build/scripts/docker-publish-multiarch.sh b/build/scripts/docker-publish-multiarch.sh
index 530808340..a1ebc007c 100755
--- a/build/scripts/docker-publish-multiarch.sh
+++ b/build/scripts/docker-publish-multiarch.sh
@@ -68,6 +68,14 @@ case "$MODE" in
     IMAGE_PREFIX=""
     EXTRA_BUILD_FLAGS="--provenance=false --sbom=false"
     TAG_LATEST=true
+
+    # Ensure a multi-platform builder exists
+    if ! docker buildx inspect multiarch >/dev/null 2>&1; then
+      echo "Creating multi-platform buildx builder..."
+      docker buildx create --name multiarch --use --bootstrap
+    else
+      docker buildx use multiarch
+    fi
     ;;
   *)
     echo "Unknown mode: $MODE (expected 'registry' or 'ecr')" >&2