diff --git a/doc/controllers_index.rst b/doc/controllers_index.rst
index 78abe5d21f..683f23c202 100644
--- a/doc/controllers_index.rst
+++ b/doc/controllers_index.rst
@@ -16,9 +16,9 @@ Guidelines and Best Practices
 
 .. toctree::
    :titlesonly:
-   :glob:
 
-   *
+   mobile_robot_kinematics.rst
+   writing_new_controller.rst
 
 
 Controllers for Wheeled Mobile Robots
diff --git a/doc/migration.rst b/doc/migration.rst
index 2114436098..4c0e4608d6 100644
--- a/doc/migration.rst
+++ b/doc/migration.rst
@@ -1,6 +1,6 @@
-:github_url: https://github.com/ros-controls/ros2_controllers/blob/{REPOS_FILE_BRANCH}/doc/migration/Jazzy.rst
+:github_url: https://github.com/ros-controls/ros2_controllers/blob/{REPOS_FILE_BRANCH}/doc/migration.rst
 
-Iron to Jazzy
+Migration Guides: Iron to Jazzy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 This list summarizes important changes between Iron (previous) and Jazzy (current) releases, where changes to user code might be necessary.
 
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index 4793fd957d..b55db861b3 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -1,6 +1,6 @@
-:github_url: https://github.com/ros-controls/ros2_controllers/blob/{REPOS_FILE_BRANCH}/doc/release_notes/Jazzy.rst
+:github_url: https://github.com/ros-controls/ros2_controllers/blob/{REPOS_FILE_BRANCH}/doc/release_notes.rst
 
-Iron to Jazzy
+Release Notes: Iron to Jazzy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 This list summarizes the changes between Iron (previous) and Jazzy (current) releases.