diff --git a/docker/humble/latest/Dockerfile b/docker/humble/latest/Dockerfile
index e4d6d3b2..67fe3c31 100644
--- a/docker/humble/latest/Dockerfile
+++ b/docker/humble/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM introlab3it/rtabmap:jammy-deps
+FROM introlab3it/rtabmap:jammy
 
 RUN source /ros_entrypoint.sh && \
     mkdir -p ros2_ws/src && \
@@ -12,8 +12,6 @@ RUN source /ros_entrypoint.sh && \
     rosdep init && \
     rosdep update && \
     apt-get update && \
-    apt-get upgrade -y && \
-    git clone https://github.com/introlab/rtabmap.git src/rtabmap && \
     rosdep install --from-paths src --ignore-src -r -y -t build_export -t test -t build -t buildtool_export -t buildtool && \
     apt-get clean && rm -rf /var/lib/apt/lists/ && \
     colcon build --event-handlers console_direct+ --install-base /opt/ros/humble --merge-install --cmake-args -DRTABMAP_SYNC_MULTI_RGBD=ON -DCMAKE_BUILD_TYPE=Release && \
diff --git a/docker/jazzy/latest/Dockerfile b/docker/jazzy/latest/Dockerfile
index bf26d4d5..3b60aaac 100644
--- a/docker/jazzy/latest/Dockerfile
+++ b/docker/jazzy/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM introlab3it/rtabmap:24.04
+FROM introlab3it/rtabmap:noble
 
 RUN source /ros_entrypoint.sh && \
     mkdir -p ros2_ws/src && \
diff --git a/docker/kilted/latest/Dockerfile b/docker/kilted/latest/Dockerfile
index a6c112e2..2a20a5ea 100644
--- a/docker/kilted/latest/Dockerfile
+++ b/docker/kilted/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM introlab3it/rtabmap:24.04
+FROM introlab3it/rtabmap:noble-kilted
 
 RUN source /ros_entrypoint.sh && \
     mkdir -p ros2_ws/src && \