diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7bfa18e0..8eb6f66b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -84,6 +84,7 @@ jobs:
             autoware_lane_departure_checker
             autoware_localization_msgs
             autoware_map_based_prediction
+            autoware_map_msgs
             autoware_mission_details_overlay_rviz_plugin
             autoware_mission_planner
             autoware_motion_utils
@@ -170,14 +171,12 @@ jobs:
             interpolation
             kalman_filter
             kinematic_evaluator
-            lanelet2_extension_python
             lanelet2_map_preprocessor
             learning_based_vehicle_model
             lidar_apollo_instance_segmentation
             lidar_apollo_segmentation_tvm
             lidar_apollo_segmentation_tvm_nodes
             lidar_centerpoint
-            lidar_centerpoint_tvm
             lidar_transfusion
             livox_tag_filter
             localization_error_monitor
diff --git a/iron.repos b/iron.repos
index 8b32ac4e..a3dec55b 100644
--- a/iron.repos
+++ b/iron.repos
@@ -4,17 +4,17 @@ repositories:
     type: git
     url: https://github.com/autowarefoundation/autoware.universe.git
     version: main
-  autoware_adapi_msgs:
+  autoware_cmake:
     type: git
-    url: https://github.com/autowarefoundation/autoware_adapi_msgs
+    url: https://github.com/autowarefoundation/autoware_cmake.git
     version: main
-  autoware_auto_msgs:
+  autoware_lanelet2_extension:
     type: git
-    url: https://github.com/tier4/autoware_auto_msgs.git
-    version: tier4/main
-  autoware_common:
+    url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
+    version: main
+  autoware_utils:
     type: git
-    url: https://github.com/autowarefoundation/autoware_common.git
+    url: https://github.com/autowarefoundation/autoware_utils.git
     version: main
   autoware_internal_msgs:
     type: git
@@ -37,7 +37,3 @@ repositories:
     type: git
     url: https://github.com/ros2/rmw_zenoh
     version: rolling
-  tier4_autoware_msgs:
-    type: git
-    url: https://github.com/tier4/tier4_autoware_msgs.git
-    version: tier4/universe
diff --git a/jazzy.repos b/jazzy.repos
index 59e4bb63..5b5c11c0 100644
--- a/jazzy.repos
+++ b/jazzy.repos
@@ -19,9 +19,8 @@ repositories:
     version: fix/missing-git-dep
   off_highway_sensor_drivers:
     type: git
-    # Until: https://github.com/bosch-engineering/off_highway_sensor_drivers/pull/9
-    url: https://github.com/nobleo/off_highway_sensor_drivers.git
-    version: fix/missing-dependencies
+    url: https://github.com/bosch-engineering/off_highway_sensor_drivers.git
+    version: humble-devel
   rmw_zenoh:
     type: git
     url: https://github.com/ros2/rmw_zenoh