diff --git a/doc/source/admin/identity-management.rst b/doc/source/admin/index.rst
similarity index 100%
rename from doc/source/admin/identity-management.rst
rename to doc/source/admin/index.rst
diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
new file mode 100644
index 0000000000..02afdecde7
--- /dev/null
+++ b/doc/source/configuration/index.rst
@@ -0,0 +1,13 @@
+==============================
+Keystone Configuration Options
+==============================
+
+This section provides a list of all possible options and
+sample files for keystone configuration.
+
+.. toctree::
+    :maxdepth: 2
+
+    config-options.rst
+    policy.rst
+    samples/index.rst
diff --git a/doc/source/configuration/policy.rst b/doc/source/configuration/policy.rst
index 38ed3ae6f7..5ca06b3b3a 100644
--- a/doc/source/configuration/policy.rst
+++ b/doc/source/configuration/policy.rst
@@ -2,6 +2,9 @@
 Policy configuration
 ====================
 
+Configuration
+~~~~~~~~~~~~~
+
 The following is an overview of all available policies in Keystone. For a sample
 configuration file, refer to :doc:`/sample_files/sample_policy`.
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index f41bb283be..f961bfbfd2 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -94,17 +94,15 @@ Administrator Guides
 .. toctree::
     :maxdepth: 2
 
-    admin/identity-management.rst
+    admin/index.rst
 
 Configuration Options
 ~~~~~~~~~~~~~~~~~~~~~
 
 .. toctree::
-    :maxdepth: 1
+    :maxdepth: 2
 
-    configuration/config-options.rst
-    configuration/policy.rst
-    configuration/samples/index.rst
+    configuration/index.rst
 
 API Documentation
 ~~~~~~~~~~~~~~~~~