diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst
index ec5905392..b50a9808e 100644
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -10,7 +10,6 @@ Deploying Murano
 
    deploy_murano
    prepare_lab
-   configuration
    murano_policies
    manage_packages
    manage_images
@@ -18,7 +17,6 @@ Deploying Murano
    murano_repository
    murano_agent
    policy_enf
-   configure_cloud_foundry_service_broker
    using_glare.rst
    admin_troubleshooting
    appdev-guide/developer_index
diff --git a/doc/source/admin/configuration.rst b/doc/source/configuration/configuration.rst
similarity index 100%
rename from doc/source/admin/configuration.rst
rename to doc/source/configuration/configuration.rst
diff --git a/doc/source/admin/configure_cloud_foundry_service_broker.rst b/doc/source/configuration/configure_cloud_foundry_service_broker.rst
similarity index 100%
rename from doc/source/admin/configure_cloud_foundry_service_broker.rst
rename to doc/source/configuration/configure_cloud_foundry_service_broker.rst
diff --git a/doc/source/admin/figures/add-interface.png b/doc/source/configuration/figures/add-interface.png
similarity index 100%
rename from doc/source/admin/figures/add-interface.png
rename to doc/source/configuration/figures/add-interface.png
diff --git a/doc/source/admin/figures/network-topology-1.png b/doc/source/configuration/figures/network-topology-1.png
similarity index 100%
rename from doc/source/admin/figures/network-topology-1.png
rename to doc/source/configuration/figures/network-topology-1.png
diff --git a/doc/source/admin/figures/network-topology-2.png b/doc/source/configuration/figures/network-topology-2.png
similarity index 100%
rename from doc/source/admin/figures/network-topology-2.png
rename to doc/source/configuration/figures/network-topology-2.png
diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
new file mode 100644
index 000000000..a425fc237
--- /dev/null
+++ b/doc/source/configuration/index.rst
@@ -0,0 +1,5 @@
+.. toctree::
+   :maxdepth: 1
+
+   configuration
+   configure_cloud_foundry_service_broker
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 4f3d2dd97..aaed776cc 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -59,6 +59,14 @@ Installation
 
   install/index
 
+Configuration
+~~~~~~~~~~~~~
+
+.. toctree::
+  :maxdepth: 2
+
+  configuration/index
+
 Administrator Documentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~