diff --git a/playbooks/common-tasks/dynamic-grouping.yml b/playbooks/common-tasks/dynamic-grouping.yml
new file mode 100644
index 0000000000..7f6c43bb2a
--- /dev/null
+++ b/playbooks/common-tasks/dynamic-grouping.yml
@@ -0,0 +1,22 @@
+---
+# Copyright 2016, Logan Vig <logan2211@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Add {{ inventory_hostname }} to dynamic inventory group
+  add_host:
+    group: "{{ dest_group }}"
+    name: "{{ item }}"
+  with_items: "{{ groups[src_group] }}"
+  when:
+    - "{{ groups[src_group] is defined }}"
diff --git a/playbooks/inventory/env.d/nova.yml b/playbooks/inventory/env.d/nova.yml
index 704d471b19..ed1221013f 100644
--- a/playbooks/inventory/env.d/nova.yml
+++ b/playbooks/inventory/env.d/nova.yml
@@ -57,8 +57,6 @@ container_skel:
     contains:
       - neutron_linuxbridge_agent
       - neutron_openvswitch_agent
-      - neutron_l3_agent
-      - neutron_metadata_agent
       - nova_compute
     properties:
       is_metal: true
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index 145d92abee..f718e55a2a 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -13,6 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: Configure Neutron dynamic host groupings
+  hosts: localhost
+  gather_facts: no
+  tasks:
+    - include: common-tasks/dynamic-grouping.yml
+      vars:
+        src_group: "nova_compute"
+        dest_group: "neutron_l3_agent, neutron_metadata_agent"
+      when:
+        - "{{ neutron_plugin_type == 'ml2.ovs.dvr' }}"
+
 - name: Installation and setup of Neutron
   hosts: neutron_all
   gather_facts: "{{ gather_facts | default(True) }}"