diff --git a/doc/source/install-guide/configure-hostlist.rst b/doc/source/install-guide/configure-hostlist.rst
index 461018866a..7286f21cee 100644
--- a/doc/source/install-guide/configure-hostlist.rst
+++ b/doc/source/install-guide/configure-hostlist.rst
@@ -18,11 +18,11 @@ suitable short hostname for a compute host might be:
 ``123456-Compute001``.
 
 #. Configure a list containing at least three infrastructure target
-   hosts in the ``infra_hosts`` section:
+   hosts in the ``shared-infra_hosts`` section:
 
    .. code-block:: yaml
 
-      infra_hosts:
+      shared-infra_hosts:
         603975-infra01:
           ip: INFRA01_IP_ADDRESS
         603989-infra02:
@@ -37,7 +37,7 @@ suitable short hostname for a compute host might be:
 
    .. code-block:: yaml
 
-      infra_hosts:
+      shared-infra_hosts:
         603975-infra01:
           ip: 10.240.0.80
         603989-infra02:
@@ -45,6 +45,36 @@ suitable short hostname for a compute host might be:
         627116-infra03:
           ip: 10.240.0.184
 
+#. Configure a list containing at least two infrastructure target
+   hosts in the ``os-infra_hosts`` section (you can reuse
+   previous hosts as long as their name and ip is consistent):
+
+   .. code-block:: yaml
+
+      os-infra_hosts:
+        603975-infra01:
+          ip: INFRA01_IP_ADDRESS
+        603989-infra02:
+          ip: INFRA02_IP_ADDRESS
+        627116-infra03:
+          ip: INFRA03_IP_ADDRESS
+        628771-infra04: ...
+
+   Replace ``*_IP_ADDRESS`` with the IP address of the ``br-mgmt``
+   container management bridge on each infrastructure target host. Use
+   the same net block as bond0 on the nodes, for example:
+
+   .. code-block:: yaml
+
+      os-infra_hosts:
+        603975-infra01:
+          ip: 10.240.0.80
+        603989-infra02:
+          ip: 10.240.0.81
+        627116-infra03:
+          ip: 10.240.0.184
+
+
 #. Configure a list containing at least one network target host in the
    ``network_hosts`` section:
 
diff --git a/etc/README.rst b/etc/README.rst
index eca7cfd5b9..056ee6a809 100644
--- a/etc/README.rst
+++ b/etc/README.rst
@@ -81,8 +81,9 @@ Predefined host groups
 
 The user configuration file has 4 defined groups which have mapping found within the ``openstack_environment.yml`` file. 
 
-The predefined groups are: 
-  * infra_hosts: 
+The predefined groups are:
+  * os-infra_hosts:
+  * shared-infra_hosts:
   * compute_hosts:
   * storage_hosts:
   * log_hosts:
@@ -94,7 +95,7 @@ When specifying hosts inside of any of the known groups the syntax is as follows
 
 .. code-block:: yaml
 
-    infra_hosts:
+    shared-infra_hosts:
       infra_host1:
         ip: 10.0.0.1
 
@@ -114,7 +115,7 @@ Here is an example of turning debug mode on all containers on infra1
 
 .. code-block:: yaml
 
-	infra_hosts:
+	shared-infra_hosts:
 	  infra1:
 	    ip: 10.0.0.10
 	    container_vars: