diff --git a/etc/openstack_deploy/env.d/neutron.yml b/etc/openstack_deploy/env.d/neutron.yml
index cd2df75f71..3ffc0abc08 100644
--- a/etc/openstack_deploy/env.d/neutron.yml
+++ b/etc/openstack_deploy/env.d/neutron.yml
@@ -23,6 +23,9 @@ component_skel:
   neutron_linuxbridge_agent:
     belongs_to:
       - neutron_all
+  neutron_openvswitch_agent:
+    belongs_to:
+      - neutron_all
   neutron_metering_agent:
     belongs_to:
       - neutron_all
@@ -49,6 +52,7 @@ container_skel:
       - neutron_metadata_agent
       - neutron_metering_agent
       - neutron_linuxbridge_agent
+      - neutron_openvswitch_agent
       - neutron_l3_agent
       - neutron_dhcp_agent
       - neutron_lbaas_agent
diff --git a/etc/openstack_deploy/env.d/nova.yml b/etc/openstack_deploy/env.d/nova.yml
index bebc6ccfc4..2ec535be9b 100644
--- a/etc/openstack_deploy/env.d/nova.yml
+++ b/etc/openstack_deploy/env.d/nova.yml
@@ -67,6 +67,7 @@ container_skel:
       - compute_containers
     contains:
       - neutron_linuxbridge_agent
+      - neutron_openvswitch_agent
       - nova_compute
     properties:
       is_metal: true
diff --git a/releasenotes/notes/neutron-openvswitch-agent-group-a63da4af11202790.yaml b/releasenotes/notes/neutron-openvswitch-agent-group-a63da4af11202790.yaml
new file mode 100644
index 0000000000..54369dea56
--- /dev/null
+++ b/releasenotes/notes/neutron-openvswitch-agent-group-a63da4af11202790.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - The new host group ``neutron_openvswitch_agent`` has been added to the ``env.d/neutron.yml``
+    and ``env.d/nova.yml`` environment configuration files in order to support the implementation
+    of Open vSwitch. Deployers must ensure that their environment configuration files are updated
+    to include the above group name. Please see the example implementations in
+    `env.d/neutron.yml <https://github.com/openstack/openstack-ansible/blob/stable/newton/etc/openstack_deploy/env.d/neutron.yml>`_
+    and
+    `env.d/nova.yml <https://github.com/openstack/openstack-ansible/blob/stable/newton/etc/openstack_deploy/env.d/nova.yml>`_.
diff --git a/tests/test_inventory.py b/tests/test_inventory.py
index 95ed5a5c6c..68b1706117 100644
--- a/tests/test_inventory.py
+++ b/tests/test_inventory.py
@@ -147,6 +147,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'neutron_linuxbridge_agent',
         'neutron_metadata_agent',
         'neutron_metering_agent',
+        'neutron_openvswitch_agent',
         'neutron_server',
         'neutron_server_container',
         'nova_all',