diff --git a/build.sh b/build.sh
index ccf6a7e..1481427 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=$(<VERSION)
+version=$(<VERSION) # Read version of Dockerfile from file VERSION
 
 # Set the platform flag if we're on ARM
 arch=$(uname -m)
diff --git a/rebuild.sh b/rebuild.sh
index 48f2d68..5b38617 100755
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -1,4 +1,14 @@
 #!/bin/bash
 
 version=$(<VERSION) # Read version of Dockerfile from file VERSION
-docker build "$@" -t "openworm/openworm:$version"  --no-cache .
+
+# Set the platform flag if we're on ARM
+arch=$(uname -m)
+if [[ "$arch" == "arm64" || "$arch" == "aarch64" ]]; then
+    platform_flag="--platform linux/amd64"
+else
+    platform_flag=""
+fi
+
+# Rebuild the Docker image
+docker build $platform_flag "$@" -t "openworm/openworm:$version"  --no-cache .