diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
new file mode 100644
index 000000000..785b57ffc
--- /dev/null
+++ b/doc/source/configuration/index.rst
@@ -0,0 +1,10 @@
+===================
+Configuration Guide
+===================
+
+.. toctree::
+   :maxdepth: 2
+
+   kayobe
+   network
+   kolla-ansible
diff --git a/doc/source/configuration/kayobe.rst b/doc/source/configuration/kayobe.rst
index 5466fa1b8..148f576b5 100644
--- a/doc/source/configuration/kayobe.rst
+++ b/doc/source/configuration/kayobe.rst
@@ -1,6 +1,6 @@
-=============
-Configuration
-=============
+====================
+Kayobe Configuration
+====================
 
 This section covers configuration of Kayobe.  As an Ansible-based project,
 Kayobe is for the most part configured using YAML files.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 210101b14..aac175ceb 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -23,9 +23,7 @@ Documentation
    architecture
    installation
    usage
-   configuration/kayobe
-   configuration/network
-   configuration/kolla-ansible
+   configuration/index
    deployment
    upgrading
    administration