diff --git a/rtabmap_demos/package.xml b/rtabmap_demos/package.xml
index a878ec69..18865042 100644
--- a/rtabmap_demos/package.xml
+++ b/rtabmap_demos/package.xml
@@ -17,7 +17,7 @@
   <exec_depend>rtabmap_util</exec_depend>
   <exec_depend>rtabmap_rviz_plugins</exec_depend>
   <exec_depend>rtabmap_viz</exec_depend>
-  <exec_depend>nav2_bringup</exec_depend>
+<!--  <exec_depend>nav2_bringup</exec_depend> # Uncommment when available in jazzy -->
   
   <export>
     <build_type>ament_cmake</build_type>
diff --git a/rtabmap_examples/package.xml b/rtabmap_examples/package.xml
index 1554dea5..0dba0037 100644
--- a/rtabmap_examples/package.xml
+++ b/rtabmap_examples/package.xml
@@ -21,7 +21,7 @@
   <exec_depend>rtabmap_viz</exec_depend>
   <exec_depend>imu_filter_madgwick</exec_depend>
   <exec_depend>tf2_ros</exec_depend>
-  <exec_depend>realsense2_camera</exec_depend>
+<!--  <exec_depend>realsense2_camera</exec_depend> # Uncommment when available in jazzy -->
   <exec_depend>velodyne</exec_depend>
   
   <export>
diff --git a/rtabmap_slam/package.xml b/rtabmap_slam/package.xml
index a9a07244..4195a7c3 100644
--- a/rtabmap_slam/package.xml
+++ b/rtabmap_slam/package.xml
@@ -15,7 +15,7 @@
   <depend>cv_bridge</depend>
   <depend>geometry_msgs</depend>
   <depend>nav_msgs</depend>
-  <depend>nav2_msgs</depend>
+<!--  <depend>nav2_msgs</depend> # Uncommment when available in jazzy -->
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
   <depend>sensor_msgs</depend>
diff --git a/rtabmap_util/package.xml b/rtabmap_util/package.xml
index 1ffb918d..0c386d72 100644
--- a/rtabmap_util/package.xml
+++ b/rtabmap_util/package.xml
@@ -30,7 +30,7 @@
   <depend>message_filters</depend>
   <depend>rtabmap_msgs</depend>
   <depend>rtabmap_conversions</depend>
-  <depend>grid_map_ros</depend>
+<!--  <depend>grid_map_ros</depend> # Uncommment when available in jazzy -->
 
   <export>
 	<build_type>ament_cmake</build_type>