diff --git a/moveit2.repos b/moveit2.repos
index aec6f2851e..7d4b08d263 100644
--- a/moveit2.repos
+++ b/moveit2.repos
@@ -2,8 +2,8 @@ repositories:
   # Keep moveit_* repos here because they are released with moveit
   geometric_shapes:
     type: git
-    url: https://github.com/moveit/geometric_shapes.git
-    version: ros2
+    url: https://github.com/henningkayser/geometric_shapes.git
+    version: fix_octomap_version
   moveit_msgs:
     type: git
     url: https://github.com/moveit/moveit_msgs.git