diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile
index 827bae17d9..9ab40f6222 100644
--- a/.docker/ci/Dockerfile
+++ b/.docker/ci/Dockerfile
@@ -40,6 +40,8 @@ RUN \
     rosdep update && \
     DEBIAN_FRONTEND=noninteractive \
     rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
+    # HACK: Remove ROS' octomap to avoid conflicts with system's octomap
+    apt-get remove -y ros-${ROS_DISTRO}-octomap && \
     # Remove the source code from this container
     rm -rf src && \
     #
diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile
index bf2c845071..bb3d9f7a1b 100644
--- a/.docker/source/Dockerfile
+++ b/.docker/source/Dockerfile
@@ -29,6 +29,8 @@ RUN --mount=type=cache,target=/root/.ccache/ \
     rosdep update && \
     DEBIAN_FRONTEND=noninteractive \
     rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
+    # HACK: Remove ROS' octomap to avoid conflicts with system's octomap
+    apt-get remove -y ros-${ROS_DISTRO}-octomap && \
     rm -rf /var/lib/apt/lists/* && \
     # Build the workspace
     colcon build \
diff --git a/.docker/tutorial-source/Dockerfile b/.docker/tutorial-source/Dockerfile
index e4f875e91b..50fdee1304 100644
--- a/.docker/tutorial-source/Dockerfile
+++ b/.docker/tutorial-source/Dockerfile
@@ -30,6 +30,8 @@ RUN --mount=type=cache,target=/root/.ccache/,sharing=locked \
         rosdep update && \
         DEBIAN_FRONTEND=noninteractive \
         rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
+        # HACK: Remove ROS' octomap to avoid conflicts with system's octomap
+        apt-get remove -y ros-${ROS_DISTRO}-octomap && \
         rm -rf /var/lib/apt/lists/* && \
         # Build the workspace
         colcon build \
diff --git a/moveit2_rolling.repos b/moveit2_rolling.repos
index 4d39d584b4..8e94dc9d32 100644
--- a/moveit2_rolling.repos
+++ b/moveit2_rolling.repos
@@ -1,8 +1,4 @@
 repositories:
-  octomap:
-      type: git
-      url: https://github.com/octomap/octomap.git
-      version: devel
   geometric_shapes:
       type: git
       url: https://github.com/moveit/geometric_shapes.git