diff --git a/.github/workflows/colcon.yaml b/.github/workflows/colcon.yaml
index e753651d..52f098e1 100644
--- a/.github/workflows/colcon.yaml
+++ b/.github/workflows/colcon.yaml
@@ -10,13 +10,14 @@ on:
     - '*'
 jobs:
   build-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {rosdistro: 'rolling', container: 'ros:rolling'}
-    container: ${{ matrix.config.container }}
+          - {rosdistro: 'rolling', container: 'rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-desktop-latest'}
+    container: 
+      image: ${{ matrix.config.container }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -32,7 +33,7 @@ jobs:
         apt update
         rosdep update
         source /opt/ros/${{matrix.config.rosdistro}}/setup.bash
-        rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox turtlebot3_gazebo gazebo_ros_pkgs octomap_server"
+        rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox"
       shell: bash
     - name: Colcon Build (Release)
       run: |
diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos
index 23d88992..168c7f12 100644
--- a/tools/ros2_dependencies.repos
+++ b/tools/ros2_dependencies.repos
@@ -1,6 +1,5 @@
 repositories:
   ros-planning/navigation2:
     type: git
-    # 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
+    url: https://github.com/ros-navigation/navigation2.git
+    version: main