diff --git a/ansible/bifrost.yml b/ansible/bifrost.yml
index a567ddfdcb..ad02f05398 100644
--- a/ansible/bifrost.yml
+++ b/ansible/bifrost.yml
@@ -1,6 +1,6 @@
 ---
 - name: Apply role bifrost
-  hosts: localhost
+  hosts: bifrost
   roles:
     - { role: bifrost,
         tags: bifrost}
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index 5b56eb53fc..821b5411e0 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -15,6 +15,9 @@ localhost       ansible_connection=local
 [monitoring]
 localhost       ansible_connection=local
 
+[deployment]
+localhost       ansible_connection=local
+
 # You can explicitly specify which hosts run each project by updating the
 # groups in the sections below. Common services are grouped together.
 [chrony-server:children]
@@ -178,6 +181,9 @@ control
 [placement:children]
 control
 
+[bifrost:children]
+deployment
+
 # Additional control implemented here. These groups allow you to control which
 # services run on which hosts at a per-service level.
 #
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 24914e57d8..603a1ebdc5 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -27,6 +27,9 @@ monitoring01
 [storage]
 storage01
 
+[deployment]
+localhost       ansible_connection=local
+
 [baremetal:children]
 control
 network
@@ -195,6 +198,9 @@ control
 [placement:children]
 control
 
+[bifrost:children]
+deployment
+
 # Additional control implemented here. These groups allow you to control which
 # services run on which hosts at a per-service level.
 #
diff --git a/doc/bifrost.rst b/doc/bifrost.rst
index 20c8fde0a3..a379de04af 100644
--- a/doc/bifrost.rst
+++ b/doc/bifrost.rst
@@ -82,6 +82,24 @@ Production
 
     kolla-build bifrost-deploy
 
+Prepare Kolla-Ansible Inventory
+===============================
+
+Kolla-ansible will deploy bifrost on the hosts in the ``bifrost`` Ansible
+group.  In the ``all-in-one`` and ``multinode`` inventory files, a ``bifrost``
+group is defined which contains all hosts in the ``deployment`` group.  This
+top level ``deployment`` group is intended to represent the host running the
+``bifrost_deploy`` container.  By default, this group contains ``localhost``.
+See `edit-inventory`_ for details on how to modify the Ansible inventory in a
+multinode deployment.
+
+Bifrost does not currently support running on multiple hosts so the ``bifrost``
+group should contain only a single host, however this is not enforced by
+kolla-ansible.  Bifrost manages a number of services that conflict with
+services deployed by kolla including OpenStack Ironic, MariaDB, RabbitMQ and
+(optionally) OpenStack Keystone.  These services should not be deployed on the
+host on which bifrost is deployed.
+
 Prepare bifrost configs
 =======================