diff --git a/doc/source/index.rst b/doc/source/index.rst
index fac982f17..19ccc1f6d 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -278,9 +278,9 @@ This history of placement microversions may be found in
    contributor/index
    install/index
    install/from-pypi
-   install/controller-install-obs
-   install/controller-install-rdo
-   install/controller-install-ubuntu
+   install/install-obs
+   install/install-rdo
+   install/install-ubuntu
    install/verify
    placement-api-microversion-history
    usage/index
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index a88c22bd5..40d806324 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -22,8 +22,9 @@ placement with the rest of an OpenStack cloud.
 .. toctree::
    :maxdepth: 1
 
-   controller-install-obs.rst
-   controller-install-rdo.rst
-   controller-install-ubuntu.rst
+   from-pypi.rst
+   install-obs.rst
+   install-rdo.rst
+   install-ubuntu.rst
 
 .. _HTTP API: https://developer.openstack.org/api-ref/placement/
diff --git a/doc/source/install/controller-install-obs.rst b/doc/source/install/install-obs.rst
similarity index 95%
rename from doc/source/install/controller-install-obs.rst
rename to doc/source/install/install-obs.rst
index 9c8270649..56ec2a210 100644
--- a/doc/source/install/controller-install-obs.rst
+++ b/doc/source/install/install-obs.rst
@@ -1,8 +1,8 @@
-Install and configure controller node for openSUSE and SUSE Linux Enterprise
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Install and configure Placement for openSUSE and SUSE Linux Enterprise
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-This section describes how to install and configure the placement service on
-the controller node.
+This section describes how to install and configure the placement service
+when using openSUSE or SUSE Linux Enterprise packages.
 
 Prerequisites
 -------------
@@ -44,7 +44,7 @@ Create Database
 Configure User and Endpoints
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. include:: endpoints.rst
+.. include:: shared/endpoints.rst
 
 Install and configure components
 --------------------------------
diff --git a/doc/source/install/controller-install-rdo.rst b/doc/source/install/install-rdo.rst
similarity index 94%
rename from doc/source/install/controller-install-rdo.rst
rename to doc/source/install/install-rdo.rst
index d5806b7e4..d71d8e65d 100644
--- a/doc/source/install/controller-install-rdo.rst
+++ b/doc/source/install/install-rdo.rst
@@ -1,8 +1,8 @@
-Install and configure controller node for Red Hat Enterprise Linux and CentOS
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Install and configure Placement for Red Hat Enterprise Linux and CentOS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-This section describes how to install and configure the placement service on
-the controller node.
+This section describes how to install and configure the placement service
+when using Red Hat Enterprise Linux or CentOS packages.
 
 Prerequisites
 -------------
@@ -44,7 +44,7 @@ Create Database
 Configure User and Endpoints
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. include:: endpoints.rst
+.. include:: shared/endpoints.rst
 
 Install and configure components
 --------------------------------
diff --git a/doc/source/install/controller-install-ubuntu.rst b/doc/source/install/install-ubuntu.rst
similarity index 94%
rename from doc/source/install/controller-install-ubuntu.rst
rename to doc/source/install/install-ubuntu.rst
index 6f46bff5b..15cf258e6 100644
--- a/doc/source/install/controller-install-ubuntu.rst
+++ b/doc/source/install/install-ubuntu.rst
@@ -1,8 +1,8 @@
-Install and configure controller node for Ubuntu
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Install and configure Placement for Ubuntu
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-This section describes how to install and configure the placement service on
-the controller node.
+This section describes how to install and configure the placement service
+when using Ubuntu packages.
 
 Prerequisites
 -------------
@@ -44,7 +44,7 @@ Create Database
 Configure User and Endpoints
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. include:: endpoints.rst
+.. include:: shared/endpoints.rst
 
 Install and configure components
 --------------------------------
diff --git a/doc/source/install/endpoints.rst b/doc/source/install/shared/endpoints.rst
similarity index 100%
rename from doc/source/install/endpoints.rst
rename to doc/source/install/shared/endpoints.rst