diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos
index c400ed42..23d88992 100644
--- a/tools/ros2_dependencies.repos
+++ b/tools/ros2_dependencies.repos
@@ -1,5 +1,6 @@
 repositories:
   ros-planning/navigation2:
     type: git
-    url: https://github.com/wep21/navigation2.git
-    version: rolling
+    # back to upstream main after https://github.com/ros-navigation/navigation2/pull/4298 is merged 
+    url: https://github.com/tonynajjar/navigation2.git
+    version: fix-devcontainer