diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index 990d9677bf..5723f156dc 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -68,7 +68,7 @@
   - koji_builder
 
   - role: bkernel
-    when: "inventory_hostname.startswith(('bkernel', 'buildhw-x86-01.rdu3'))"
+    when: "'bkernel' in group_names"
 
   - { role: linux-system-roles.nbde_client, when: "inventory_hostname.startswith(('bkernel', 'buildhw'))" }
   - { role: serial-console, when: "inventory_hostname.startswith(('bkernel', 'buildhw-x86'))" }