diff --git a/_toc.yml b/_toc.yml
index e49a4e14..4a4f1af2 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -56,6 +56,12 @@ chapters:
       - file: admin-guide/operations
       - file: admin-guide/third-party
       - file: admin-guide/troubleshooting
+        sections:
+          - file: admin-guide/troubleshooting/methods-and-tools
+          - file: admin-guide/troubleshooting/deployment
+          - file: admin-guide/troubleshooting/login
+          - file: admin-guide/troubleshooting/package_management
+          - file: admin-guide/troubleshooting/boot
       - file: admin-guide/more
 
   - file: infrastructure-guide/index
diff --git a/admin-guide/troubleshooting.md b/admin-guide/troubleshooting.md
new file mode 100644
index 00000000..a66910d0
--- /dev/null
+++ b/admin-guide/troubleshooting.md
@@ -0,0 +1,7 @@
+# Troubleshooting
+
+Contents:
+
+```{tableofcontents}
+```
+
diff --git a/admin-guide/troubleshooting.rst b/admin-guide/troubleshooting.rst
deleted file mode 100644
index c18d5488..00000000
--- a/admin-guide/troubleshooting.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Troubleshooting
-===============
-
-.. toctree::
-   :maxdepth: 2
-
-   troubleshooting/methods-and-tools
-   troubleshooting/deployment
-   troubleshooting/login
-   troubleshooting/package_management
-   troubleshooting/boot