diff --git a/playbooks/inventory/env.d/neutron.yml b/playbooks/inventory/env.d/neutron.yml
index 276713a602..969921f9f6 100644
--- a/playbooks/inventory/env.d/neutron.yml
+++ b/playbooks/inventory/env.d/neutron.yml
@@ -58,14 +58,17 @@ container_skel:
       - network_containers
     contains:
       - neutron_agent
+      - neutron_bgp_dragent
+      - neutron_dhcp_agent
+      - neutron_l3_agent
+      - neutron_lbaas_agent
+      - neutron_linuxbridge_agent
       - neutron_metadata_agent
       - neutron_metering_agent
-      - neutron_linuxbridge_agent
       - neutron_openvswitch_agent
-      - neutron_l3_agent
-      - neutron_dhcp_agent
-      - neutron_lbaas_agent
-      - neutron_bgp_dragent
+      - neutron_sriov_nic_agent
+    properties:
+      is_metal: true
   neutron_server_container:
     belongs_to:
       - network_containers
diff --git a/releasenotes/notes/neutron-agent-baremetal-c229e65c77e615fa.yaml b/releasenotes/notes/neutron-agent-baremetal-c229e65c77e615fa.yaml
new file mode 100644
index 0000000000..bd62b49f75
--- /dev/null
+++ b/releasenotes/notes/neutron-agent-baremetal-c229e65c77e615fa.yaml
@@ -0,0 +1,16 @@
+---
+features:
+    - Neutron connectivity agents will now be deployed on baremetal within the
+      "network_hosts" defined within the ``openstack_user_config.yml``.
+
+upgrade:
+    - When upgrading there is nothing a deployer **must** immediately do to
+      run neutron agent services on hosts within the ``network_hosts`` group.
+      Simply executing the playbooks will deploy the neutron servers on the
+      baremetal machines and will leave all existing agents containers alone.
+    - It is recommended for deployers to clean up the **neutron_agents**
+      container(s) after an upgrade is complete and the cluster has been
+      verified as stable. This can be done by simply disabling the neutron
+      agents running in the **neutron_agent** container(s), re-balancing the
+      agent services targeting the new baremetal agents, deleting the
+      container(s), and finally removing the container(s) from inventory.