diff --git a/build/save-migration-images.sh b/build/save-migration-images.sh
index d3bbff401..7824cf0ef 100755
--- a/build/save-migration-images.sh
+++ b/build/save-migration-images.sh
@@ -14,7 +14,10 @@ else
     DOCKER_PLATFORM="linux/$ARCH"
 fi
 
-IMAGES=("start9/compat:latest" "start9/utils:latest" "tonistiigi/binfmt:latest")
+IMAGES=("tonistiigi/binfmt:latest")
+if [ "$ARCH" != "riscv64" ]; then
+    IMAGES=("start9/compat:latest" "start9/utils:latest" "${IMAGES[@]}")
+fi
 
 mkdir -p "$DESTDIR"