diff --git a/doc/source/install-guide/configure.rst b/doc/source/install-guide/configure.rst
index b68b67c5cf..f6e2f19db0 100644
--- a/doc/source/install-guide/configure.rst
+++ b/doc/source/install-guide/configure.rst
@@ -1,6 +1,6 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Chapter 5. Deployment configuration
+Chapter 4. Deployment configuration
 -----------------------------------
 
 .. toctree:: 
@@ -25,7 +25,7 @@ Chapter 5. Deployment configuration
    configure-federation.rst
 
 
-**Figure 5.1. Installation work flow**
+**Figure 4.1. Installation work flow**
 
 .. image:: figures/workflow-configdeployment.png
 
diff --git a/doc/source/install-guide/deploymenthost.rst b/doc/source/install-guide/deploymenthost.rst
index 880f653e32..87444a971c 100644
--- a/doc/source/install-guide/deploymenthost.rst
+++ b/doc/source/install-guide/deploymenthost.rst
@@ -1,6 +1,6 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Chapter 3. Deployment host
+Chapter 2. Deployment host
 --------------------------
 
 .. toctree:: 
@@ -11,7 +11,7 @@ Chapter 3. Deployment host
    deploymenthost-sshkeys.rst
 
 
-**Figure 3.1. Installation work flow**
+**Figure 2.1. Installation work flow**
 
 .. image:: figures/workflow-deploymenthost.png
 
@@ -19,7 +19,7 @@ The OSA installation process recommends one deployment host. The
 deployment host contains Ansible and orchestrates the OSA installation
 on the target hosts. One of the target hosts, preferably one of the
 infrastructure variants, can be used as the deployment host. To use a
-deployment host as a target host, follow the steps in `Chapter 4,
+deployment host as a target host, follow the steps in `Chapter 3,
 *Target hosts* <targethosts.html>`_ on the deployment host. This
 guide assumes separate deployment and target hosts.
 
diff --git a/doc/source/install-guide/install-foundation.rst b/doc/source/install-guide/install-foundation.rst
index c857aa6c77..4033e4d015 100644
--- a/doc/source/install-guide/install-foundation.rst
+++ b/doc/source/install-guide/install-foundation.rst
@@ -1,6 +1,6 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Chapter 6. Foundation playbooks
+Chapter 5. Foundation playbooks
 -------------------------------
 
 .. toctree:: 
@@ -8,7 +8,7 @@ Chapter 6. Foundation playbooks
    install-foundation-run.rst
 
 
-**Figure 6.1. Installation work flow**
+**Figure 5.1. Installation work flow**
 
 .. image:: figures/workflow-foundationplaybooks.png
 
diff --git a/doc/source/install-guide/install-infrastructure.rst b/doc/source/install-guide/install-infrastructure.rst
index 1200ab2272..c40ac62f5c 100644
--- a/doc/source/install-guide/install-infrastructure.rst
+++ b/doc/source/install-guide/install-infrastructure.rst
@@ -1,6 +1,6 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Chapter 7. Infrastructure playbooks
+Chapter 6. Infrastructure playbooks
 -----------------------------------
 
 .. toctree:: 
@@ -9,7 +9,7 @@ Chapter 7. Infrastructure playbooks
    install-infrastructure-verify.rst
 
 
-**Figure 7.1. Installation workflow**
+**Figure 6.1. Installation workflow**
 
 .. image:: figures/workflow-infraplaybooks.png
 
diff --git a/doc/source/install-guide/install-openstack.rst b/doc/source/install-guide/install-openstack.rst
index ee513d7cf1..668e2bf058 100644
--- a/doc/source/install-guide/install-openstack.rst
+++ b/doc/source/install-guide/install-openstack.rst
@@ -1,6 +1,6 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Chapter 8. OpenStack playbooks
+Chapter 7. OpenStack playbooks
 ------------------------------
 
 .. toctree::
@@ -10,7 +10,7 @@ Chapter 8. OpenStack playbooks
    install-openstack-verify.rst
 
 
-**Figure 8.1. Installation work flow**
+**Figure 7.1. Installation work flow**
 
 .. image:: figures/workflow-openstackplaybooks.png
 
diff --git a/doc/source/install-guide/ops-addcomputehost.rst b/doc/source/install-guide/ops-addcomputehost.rst
index 2dab08573c..b78c06e8ac 100644
--- a/doc/source/install-guide/ops-addcomputehost.rst
+++ b/doc/source/install-guide/ops-addcomputehost.rst
@@ -6,8 +6,8 @@ Adding a compute host
 Use the following procedure to add a compute host to an operational
 cluster.
 
-#. Configure the host as a target host. See `Chapter 4, *Target
-   hosts* <ch-hosts-target.html>`_ for more information.
+#. Configure the host as a target host. See `Chapter 3, *Target
+   hosts* <targethosts.html>`_ for more information.
 
 #. Edit the ``/etc/openstack_deploy/openstack_user_config.yml`` file and
    add the host to the ``compute_hosts`` stanza.
diff --git a/doc/source/install-guide/ops.rst b/doc/source/install-guide/ops.rst
index 4ba4e80b76..facb6f5f10 100644
--- a/doc/source/install-guide/ops.rst
+++ b/doc/source/install-guide/ops.rst
@@ -1,6 +1,6 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Chapter 9. Operations
+Chapter 8. Operations
 ---------------------
 
 .. toctree:: 
diff --git a/doc/source/install-guide/overview-hostlayout.rst b/doc/source/install-guide/overview-hostlayout.rst
index 1ba2c1865b..c0ec60112f 100644
--- a/doc/source/install-guide/overview-hostlayout.rst
+++ b/doc/source/install-guide/overview-hostlayout.rst
@@ -76,7 +76,7 @@ Compute target hosts contain the following services:
 -  Block Storage volumes
 
 
-**Figure 2.1. Host Layout Overview**
+**Figure 1.1. Host Layout Overview**
 
 .. image:: figures/environment-overview.png
 
diff --git a/doc/source/install-guide/overview-hostnetworking.rst b/doc/source/install-guide/overview-hostnetworking.rst
index 201a0bf7bd..26921c21ec 100644
--- a/doc/source/install-guide/overview-hostnetworking.rst
+++ b/doc/source/install-guide/overview-hostnetworking.rst
@@ -28,12 +28,12 @@ random names for ``veth`` pairs.
 
 The relationship between physical interfaces, logical interfaces,
 bridges, and virtual interfaces within containers is shown in
-`Figure 2.2, "Network
+`Figure 1.2, "Network
 components" <overview-hostnetworking.html#fig_overview_networkcomponents>`_.
 
  
 
-**Figure 2.2. Network components**
+**Figure 1.2. Network components**
 
 .. image:: figures/networkcomponents.png
 
@@ -92,19 +92,19 @@ Target hosts can contain the following network bridges:
       container. Does not contain an IP address because it only handles
       layer 2 connectivity.
 
-`Figure 2.3, "Container network
+`Figure 1.3, "Container network
 architecture" <overview-hostnetworking.html#fig_overview_networkarch-container>`_
 provides a visual representation of network components for services in
 containers.
 
  
 
-**Figure 2.3. Container network architecture**
+**Figure 1.3. Container network architecture**
 
 .. image:: figures/networkarch-container-external.png
 
 By default, OSA installs the Compute service in a bare metal
-environment rather than within a container. `Figure 2.4, "Bare/Metal
+environment rather than within a container. `Figure 1.4, "Bare/Metal
 network
 architecture" <overview-hostnetworking.html#fig_overview_networkarch-bare>`_
 provides a visual representation of the unique layout of network
@@ -112,7 +112,7 @@ components on a Compute host.
 
  
 
-**Figure 2.4. Bare/Metal network architecture**
+**Figure 1.4. Bare/Metal network architecture**
 
 .. image:: figures/networkarch-bare-external.png
 
diff --git a/doc/source/install-guide/overview-neutron.rst b/doc/source/install-guide/overview-neutron.rst
index f9d2091908..1ec1e289f7 100644
--- a/doc/source/install-guide/overview-neutron.rst
+++ b/doc/source/install-guide/overview-neutron.rst
@@ -5,25 +5,25 @@ OpenStack Networking
 
 OpenStack Networking (neutron) is configured to use a DHCP agent, L3
 Agent and Linux Bridge agent within a networking agents container.
-`Figure 2.5, "Networking agents
+`Figure 1.5, "Networking agents
 containers" <overview-neutron.html#fig_overview_neutron-agents>`_
 shows the interaction of these agents, network components, and
 connection to a physical network.
 
  
 
-**Figure 2.5. Networking agents containers**
+**Figure 1.5. Networking agents containers**
 
 .. image:: figures/networking-neutronagents.png
 
-The Compute service uses the KVM hypervisor. `Figure 2.6, "Compute
+The Compute service uses the KVM hypervisor. `Figure 1.6, "Compute
 hosts" <overview-neutron.html#fig_overview_neutron-compute>`_ shows
 the interaction of instances, Linux Bridge agent, network components,
 and connection to a physical network.
 
  
 
-**Figure 2.6. Compute hosts**
+**Figure 1.6. Compute hosts**
 
 .. image:: figures/networking-compute.png
 
diff --git a/doc/source/install-guide/overview-workflow.rst b/doc/source/install-guide/overview-workflow.rst
index c8193a70f0..fa885b5c64 100644
--- a/doc/source/install-guide/overview-workflow.rst
+++ b/doc/source/install-guide/overview-workflow.rst
@@ -6,7 +6,7 @@ Installation workflow
 This diagram shows the general workflow associated with OSA
 installation.
 
-**Figure 2.7. Installation workflow**
+**Figure 1.7. Installation workflow**
 
 .. image:: figures/workflow-overview.png
 
diff --git a/doc/source/install-guide/overview.rst b/doc/source/install-guide/overview.rst
index 090ca8e34c..a27318bcdd 100644
--- a/doc/source/install-guide/overview.rst
+++ b/doc/source/install-guide/overview.rst
@@ -1,6 +1,6 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Chapter 2. Overview
+Chapter 1. Overview
 -------------------
 
 .. toctree:: 
diff --git a/doc/source/install-guide/targethosts-networkexample.rst b/doc/source/install-guide/targethosts-networkexample.rst
index a313e4aa61..e60d4c8482 100644
--- a/doc/source/install-guide/targethosts-networkexample.rst
+++ b/doc/source/install-guide/targethosts-networkexample.rst
@@ -4,10 +4,10 @@ Configuring the network on a target host
 ----------------------------------------
 
 This example uses the following parameters to configure networking on a
-single target host. See `Figure 4.2, "Target hosts for infrastructure,
+single target host. See `Figure 3.2, "Target hosts for infrastructure,
 networking, and storage
 services" <targethosts-networkexample.html#fig_hosts-target-network-containerexample>`_
-and `Figure 4.3, "Target hosts for Compute
+and `Figure 3.3, "Target hosts for Compute
 service" <targethosts-networkexample.html#fig_hosts-target-network-bareexample>`_
 for a visual representation of these parameters in the architecture.
 
@@ -47,12 +47,12 @@ for a visual representation of these parameters in the architecture.
 
  
 
-**Figure 4.2. Target hosts for infrastructure, networking, and storage
+**Figure 3.2. Target hosts for infrastructure, networking, and storage
 services**
 
 .. image:: figures/networkarch-container-external-example.png
 
-**Figure 4.3. Target hosts for Compute service**
+**Figure 3.3. Target hosts for Compute service**
 
 .. image:: figures/networkarch-bare-external-example.png
 
diff --git a/doc/source/install-guide/targethosts.rst b/doc/source/install-guide/targethosts.rst
index be24c77c23..bedd4d8fa4 100644
--- a/doc/source/install-guide/targethosts.rst
+++ b/doc/source/install-guide/targethosts.rst
@@ -1,6 +1,6 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Chapter 4. Target hosts
+Chapter 3. Target hosts
 -----------------------
 
 .. toctree:: 
@@ -14,7 +14,7 @@ Chapter 4. Target hosts
    targethosts-networkexample.rst
 
 
-**Figure 4.1. Installation workflow**
+**Figure 3.1. Installation workflow**
 
 .. image:: figures/workflow-targethosts.png