diff --git a/source/community/release_notes/teak/credentials.rst b/source/community/release_notes/teak/credentials.rst
index 0dd21e61f..ca834476c 100644
--- a/source/community/release_notes/teak/credentials.rst
+++ b/source/community/release_notes/teak/credentials.rst
@@ -42,7 +42,7 @@ See :ref:`Setting Up Badges` and :ref:`Accredible Badging Configuration <Accredi
 Accredible accounts.
 
 Site operators will need to integrate the badging service with their Open edX
-instance. Site operators should refer to :doc:`credentials:badges/quickstart`
+instance. Site operators should refer to :ref:`credentials:badges-quickstart`
 for details on how to get started.
 
 
diff --git a/source/educators/navigation/advanced_features.rst b/source/educators/navigation/advanced_features.rst
index cf0e1a5b6..fe9bd17a8 100644
--- a/source/educators/navigation/advanced_features.rst
+++ b/source/educators/navigation/advanced_features.rst
@@ -99,24 +99,6 @@ Offering Badges
    ../concepts/advanced_features/about_badges.rst
    ../how-tos/advanced_features/setting_up_badges.rst
 
-Course Tags and Taxonomies
-*******************************************************
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   ../how-tos/content-tagging-how-tos/build_taxonomy_using_template.rst
-   ../how-tos/content-tagging-how-tos/import_export_a_taxonomy.rst
-   ../how-tos/content-tagging-how-tos/Create_flat_taxonomy_by_uploading_CSV.rst
-   ../how-tos/content-tagging-how-tos/update_reimport_taxonomy.rst
-   ../how-tos/content-tagging-how-tos/manage_taxonomy_tags.rst
-   ../concepts/advanced_features/why_taxonomy_tag_id.rst
-   ../how-tos/content-tagging-how-tos/manage_permissions_taxonomy.rst
-   ../how-tos/content-tagging-how-tos/add_delete_course_tags.rst
-   ../how-tos/content-tagging-how-tos/add_delete_tags_course_content.rst
-   ../how-tos/content-tagging-how-tos/export_tag_data_from_course.rst
-
 Annotations
 *******************************************************
 
diff --git a/source/educators/navigation/content_creation_management.rst b/source/educators/navigation/content_creation_management.rst
index bd07500cc..6f0c847f3 100644
--- a/source/educators/navigation/content_creation_management.rst
+++ b/source/educators/navigation/content_creation_management.rst
@@ -63,6 +63,24 @@ Work with Content Libraries
    ../how-tos/course_development/override_library_text_component.rst
    ../how-tos/course_development/override_library_text_component_in_structural_block.rst
 
+Course Tags and Taxonomies
+*******************************************************
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   ../how-tos/content-tagging-how-tos/build_taxonomy_using_template.rst
+   ../how-tos/content-tagging-how-tos/import_export_a_taxonomy.rst
+   ../how-tos/content-tagging-how-tos/Create_flat_taxonomy_by_uploading_CSV.rst
+   ../how-tos/content-tagging-how-tos/update_reimport_taxonomy.rst
+   ../how-tos/content-tagging-how-tos/manage_taxonomy_tags.rst
+   ../concepts/advanced_features/why_taxonomy_tag_id.rst
+   ../how-tos/content-tagging-how-tos/manage_permissions_taxonomy.rst
+   ../how-tos/content-tagging-how-tos/add_delete_course_tags.rst
+   ../how-tos/content-tagging-how-tos/add_delete_tags_course_content.rst
+   ../how-tos/content-tagging-how-tos/export_tag_data_from_course.rst
+
 .. _Add Text Components:
 
 Manage Text Components
@@ -136,7 +154,7 @@ Add Mathjax
    ../references/course_development/exercise_tools/mathjax_studio.rst
 
 
-Add Tags
+Conditional Content
 *******************************************************
 
 .. toctree::
diff --git a/source/site_ops/how-tos/configuring_badges.rst b/source/site_ops/how-tos/configuring_badges.rst
index 09ac3ae67..b6bd20251 100644
--- a/source/site_ops/how-tos/configuring_badges.rst
+++ b/source/site_ops/how-tos/configuring_badges.rst
@@ -81,23 +81,23 @@ The feature has its configuration:
 - ``events`` - explicit event bus signals list (only events with PII user data in payload are applicable).
 - ``credly`` - Credly integration details.
 - ``accredible`` - Accredible integration details.
-- ``rules.ignored_keypaths`` - event payload paths to exclude from data rule options (see: :doc:`credentials:badges/configuration/index`).
+- ``rules.ignored_keypaths`` - event payload paths to exclude from data rule options (see: :ref:`credentials:badges-configuration`).
 
-For more details on configuring badges, see :doc:`credentials:badges/quickstart`.
+For more details on configuring badges, see :ref:`credentials:badges-quickstart`.
 
 
-See :doc:`credentials:badges/examples` for some example configurations.
+See :ref:`credentials:Configuration examples for Badging` for some example configurations.
 
 
 .. seealso::
 
     :ref:`Enable Badges`
 
-    :doc:`credentials:badges/quickstart`
+    :ref:`credentials:badges-quickstart`
 
-    :doc:`credentials:badges/examples`
+    :ref:`credentials:Configuration examples for Badging`
 
-    :doc:`credentials:badges/configuration/index`
+    :ref:`credentials:badges-configuration`
 
 
 **Maintenance chart**
diff --git a/source/site_ops/how-tos/enable_badges.rst b/source/site_ops/how-tos/enable_badges.rst
index be8a21e6d..956e2b37b 100644
--- a/source/site_ops/how-tos/enable_badges.rst
+++ b/source/site_ops/how-tos/enable_badges.rst
@@ -44,9 +44,9 @@ Badges feature is optional and it is disabled by default. So, it must be enabled
 Configure integration
 *********************************
 
-See :doc:`credentials:badges/quickstart` for more details on configuring the Credly and Accredible integrations.
+See :ref:`credentials:badges-quickstart` for more details on configuring the Credly and Accredible integrations.
 
-See :doc:`credentials:badges/examples` for some example configurations.
+See :ref:`credentials:Configuration examples for Badging` for some example configurations.
 
 .. seealso::
 
@@ -54,11 +54,11 @@ See :doc:`credentials:badges/examples` for some example configurations.
 
     :ref:`Configuring Badges`
 
-    :doc:`credentials:badges/quickstart`
+    :ref:`credentials:badges-quickstart`
 
-    :doc:`credentials:badges/examples`
+    :ref:`credentials:Configuration examples for Badging`
 
-    :doc:`credentials:badges/configuration/index`
+    :ref:`credentials:badges-configuration`
 
 
 **Maintenance chart**
diff --git a/source/site_ops/references/badges_configuration_examples.rst b/source/site_ops/references/badges_configuration_examples.rst
index 3bc4f5ab7..3785d3116 100644
--- a/source/site_ops/references/badges_configuration_examples.rst
+++ b/source/site_ops/references/badges_configuration_examples.rst
@@ -5,7 +5,7 @@ Badges Configuration examples
 
 .. tags:: site operator, reference
 
-See :doc:`credentials:badges/examples` for some example configurations.
+See :ref:`credentials:Configuration examples for Badging` for some example configurations.
 
 .. seealso::
 
@@ -15,9 +15,9 @@ See :doc:`credentials:badges/examples` for some example configurations.
 
     :ref:`Configuring Badges`
 
-    :doc:`credentials:badges/quickstart`
+    :ref:`credentials:badges-quickstart`
 
-    :doc:`credentials:badges/examples`
+    :ref:`credentials:Configuration examples for Badging`
 
 **Maintenance chart**