diff --git a/playbooks/common-tasks/dynamic-grouping.yml b/playbooks/common-tasks/dynamic-grouping.yml
index 6bedfbbf4f..8580ca8119 100644
--- a/playbooks/common-tasks/dynamic-grouping.yml
+++ b/playbooks/common-tasks/dynamic-grouping.yml
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Add {{ inventory_hostname }} to dynamic inventory group
+- name: Add hosts to dynamic inventory group
   add_host:
     group: "{{ dest_group }}"
     name: "{{ item }}"
   with_items: "{{ groups[src_group] }}"
   when:
-    - "src_group in groups"
+    - "group_when | default(True)"
   tags:
     - common-grouping
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index 71e9ae73d5..9e241735e0 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -23,8 +23,8 @@
       vars:
         src_group: "nova_compute"
         dest_group: "neutron_l3_agent, neutron_metadata_agent"
-      when:
-        - "neutron_plugin_type == 'ml2.ovs.dvr'"
+        group_when:
+          - "neutron_plugin_type == 'ml2.ovs.dvr'"