diff --git a/README.md b/README.md
index 53cc05c0e..80bf8b495 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ Run `ros2 --help` to see all available commands.
 
 Run `ros2 <command> --help` for more information on individual command usage.
 
-Run `ros2 <command> <verb> --help` for even more usage information on a specific command's verbs.   
+Run `ros2 <command> <verb> --help` for even more usage information on a specific command's verbs.
 
-Read [Introspection with command line tools](https://index.ros.org/doc/ros2/Tutorials/Introspection-with-command-line-tools/) on ROS Index for more information and an example.
+Read [Introspection with command line tools](https://docs.ros.org/en/rolling/Concepts/Basic/About-Command-Line-Tools.html) for more information and an example.
 
 ### Cheat Sheet
 
diff --git a/ros2doctor/ros2doctor/api/platform.py b/ros2doctor/ros2doctor/api/platform.py
index 5e673c58a..95be0ca72 100644
--- a/ros2doctor/ros2doctor/api/platform.py
+++ b/ros2doctor/ros2doctor/api/platform.py
@@ -76,13 +76,13 @@ def check(self):
             doctor_warn(
                 f'Distribution {distro_name} is not fully supported or tested. '
                 'To get more consistent features, download a stable version at '
-                'https://index.ros.org/doc/ros2/Installation/')
+                'https://docs.ros.org')
             result.add_warning()
         elif distro_info.get('distribution_status') == 'end-of-life':
             doctor_warn(
                 f'Distribution {distro_name} is no longer supported or deprecated. '
                 'To get the latest features, download the new versions at '
-                'https://index.ros.org/doc/ros2/Installation/')
+                'https://docs.ros.org')
             result.add_warning()
         return result