diff --git a/doc/source/user/advanced-configuration.rst b/doc/source/admin/advanced-configuration.rst
similarity index 100%
rename from doc/source/user/advanced-configuration.rst
rename to doc/source/admin/advanced-configuration.rst
diff --git a/doc/source/user/deployment-philosophy.rst b/doc/source/admin/deployment-philosophy.rst
similarity index 100%
rename from doc/source/user/deployment-philosophy.rst
rename to doc/source/admin/deployment-philosophy.rst
diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..285c029d61b6ca62867336ceec82189cd404b2a5
--- /dev/null
+++ b/doc/source/admin/index.rst
@@ -0,0 +1,9 @@
+Admin Guides
+============
+
+.. toctree::
+   :maxdepth: 1
+
+   advanced-configuration
+   production-architecture-guide
+   deployment-philosophy
diff --git a/doc/source/user/production-architecture-guide.rst b/doc/source/admin/production-architecture-guide.rst
similarity index 100%
rename from doc/source/user/production-architecture-guide.rst
rename to doc/source/admin/production-architecture-guide.rst
diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index c2d7d4d9739be986e9c1ca5eb70b925f98c55ae7..b9fc723565ffb6e6dd1da2ddb802f308489e0c1d 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -5,6 +5,7 @@ Developer Docs
    :maxdepth: 1
 
    CONTRIBUTING
+   kolla-for-openstack-development
    vagrant-dev-env
    running-tests
    bug-triage
diff --git a/doc/source/user/kolla-for-openstack-development.rst b/doc/source/contributor/kolla-for-openstack-development.rst
similarity index 100%
rename from doc/source/user/kolla-for-openstack-development.rst
rename to doc/source/contributor/kolla-for-openstack-development.rst
diff --git a/doc/source/index.rst b/doc/source/index.rst
index c7c33fa52eb31930d25e96784ef03f6f73922405..b4b8f673e8ccfbdf5f7b79d57cc6bb9e5c4d2065 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -33,6 +33,13 @@ For information on building container images for use with Kolla-Ansible, please
 refer to the `Kolla image documentation
 <https://docs.openstack.org/kolla/latest/>`_.
 
+Admin Guides
+============
+
+.. toctree::
+   :maxdepth: 2
+
+   admin/index
 
 User Guides
 ===========
diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index 786a54610ab2c9e4cb88fdc95577fc4ad0d5dbc5..008d4e197643635fe8887d0f45bc5fa61866163f 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -4,13 +4,9 @@ User Guides
 .. toctree::
    :maxdepth: 1
 
-   deployment-philosophy
-   production-architecture-guide
    quickstart
    multinode
    multi-regions
-   advanced-configuration
    operating-kolla
    security
-   kolla-for-openstack-development
    troubleshooting