diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index e3d673fbb8..e53d54046b 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -22,7 +22,7 @@
   - hosts
   - fas_client
   - collectd/base
-  - { role: iscsi_client, when: datacenter == "phx2" }
+  - { role: iscsi_client, when: inventory_hostname.startswith(('bvirthost','buildvmhost')) }
   - sudo
   - { role: openvpn/client, when: datacenter != "phx2" }
   - virthost