diff --git a/moveit2.repos b/moveit2.repos
index 866f7ccdc7..aec6f2851e 100644
--- a/moveit2.repos
+++ b/moveit2.repos
@@ -1,10 +1,14 @@
 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
   moveit_msgs:
     type: git
-    url: https://github.com/ros-planning/moveit_msgs.git
+    url: https://github.com/moveit/moveit_msgs.git
     version: ros2
   moveit_resources:
     type: git
-    url: https://github.com/ros-planning/moveit_resources.git
+    url: https://github.com/moveit/moveit_resources.git
     version: ros2