diff --git a/moveit2/Dockerfile b/moveit2/Dockerfile
index 7014a03..58c272e 100644
--- a/moveit2/Dockerfile
+++ b/moveit2/Dockerfile
@@ -20,7 +20,7 @@
 #   VERSION         - The version of Space ROS (default: "preview")
 #   SPACE_ROS_IMAGE - The base Space ROS image to build on
 
-ARG SPACE_ROS_IMAGE=osrf/space-ros:latest
+ARG SPACE_ROS_IMAGE=osrf/space-ros:humble-2024.10.0
 
 FROM ${SPACE_ROS_IMAGE}
 
diff --git a/moveit2/build.sh b/moveit2/build.sh
index 78af98f..23345e4 100755
--- a/moveit2/build.sh
+++ b/moveit2/build.sh
@@ -17,7 +17,7 @@ echo ""
 docker build -t $ORG/$IMAGE:$TAG \
     --build-arg VCS_REF="$VCS_REF" \
     --build-arg VERSION="$VERSION" \
-    --build-arg SPACE_ROS_IMAGE="${SPACE_ROS_IMAGE:-osrf/space-ros:latest}" \
+    --build-arg SPACE_ROS_IMAGE="${SPACE_ROS_IMAGE:-osrf/space-ros:humble-2024.10.0}" \
     .
 
 echo ""
diff --git a/navigation2/Dockerfile b/navigation2/Dockerfile
index 6c6f2d7..15b9a69 100644
--- a/navigation2/Dockerfile
+++ b/navigation2/Dockerfile
@@ -20,7 +20,7 @@
 #   VERSION         - The version of Space ROS (default: "preview")
 #   SPACE_ROS_IMAGE - The base Space ROS image to build on
 
-ARG SPACE_ROS_IMAGE=osrf/space-ros:latest
+ARG SPACE_ROS_IMAGE=osrf/space-ros:humble-2024.10.0
 
 FROM ${SPACE_ROS_IMAGE}
 
diff --git a/navigation2/build.sh b/navigation2/build.sh
index 36b0a73..161226f 100755
--- a/navigation2/build.sh
+++ b/navigation2/build.sh
@@ -17,7 +17,7 @@ echo ""
 docker build -t $ORG/$IMAGE:$TAG \
     --build-arg VCS_REF="$VCS_REF" \
     --build-arg VERSION="$VERSION" \
-    --build-arg SPACE_ROS_IMAGE="${SPACE_ROS_IMAGE:-osrf/space-ros:latest}" \
+    --build-arg SPACE_ROS_IMAGE="${SPACE_ROS_IMAGE:-osrf/space-ros:humble-2024.10.0}" \
     .
 
 echo ""