diff --git a/doc/advanced-configuration.rst b/doc/advanced-configuration.rst
new file mode 100644
index 0000000000..fda524ce85
--- /dev/null
+++ b/doc/advanced-configuration.rst
@@ -0,0 +1,10 @@
+Advanced Configuration
+======================
+
+Deployment Configuration
+------------------------
+TODO(all) fill this section out
+
+OpenStack Service Configuration in Kolla
+----------------------------------------
+TODO(all) fill this section out
diff --git a/doc/customize-deployment.rst b/doc/deployment-philosophy.rst
similarity index 100%
rename from doc/customize-deployment.rst
rename to doc/deployment-philosophy.rst
diff --git a/doc/devenv-heat.rst b/doc/heat-dev-env.rst
similarity index 100%
rename from doc/devenv-heat.rst
rename to doc/heat-dev-env.rst
diff --git a/doc/index.rst b/doc/index.rst
index 1a14ba4c19..41eef16ebf 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -23,19 +23,19 @@ customization. This permits operators with little experience to deploy
 OpenStack quickly and as experience grows modify the OpenStack configuration to
 suit the operator's exact requirements.
 
-Deployment Information
-======================
-
 .. toctree::
    :maxdepth: 1
 
-   dev-quickstart
+   deployment-philosophy
+   quckstart
    ansible-deployment
-   devenv-vagrant
-   devenv-heat
-   image-building
    deploy-all-in-one-node
-   customize-deployment
+   heat-dev-env
+   vagrant-dev-env
+   image-building
+   advanced-configuration
+   operating-kolla
+
 
 Services in Kolla
 =================
diff --git a/doc/operating-kolla.rst b/doc/operating-kolla.rst
new file mode 100644
index 0000000000..fda01e7683
--- /dev/null
+++ b/doc/operating-kolla.rst
@@ -0,0 +1,22 @@
+Operating Kolla
+===============
+
+Upgrading
+---------
+TODO(all) fill this section out
+
+Diagnostics
+-----------
+TODO(all) fill this section out
+
+Failure Recovery
+----------------
+TODO(all) fill this section out
+
+Reconfiguration of an existing environment
+------------------------------------------
+TODO(all) fill this section out
+
+Tips and Tricks
+---------------
+TODO(all) fill this section out
diff --git a/doc/dev-quickstart.rst b/doc/quickstart.rst
similarity index 100%
rename from doc/dev-quickstart.rst
rename to doc/quickstart.rst
diff --git a/doc/devenv-vagrant.rst b/doc/vagrant-dev-env.rst
similarity index 100%
rename from doc/devenv-vagrant.rst
rename to doc/vagrant-dev-env.rst