diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index dccb91b502..3bf8b0bcb6 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -42,11 +42,10 @@
   - { role: openvpn/client, when: vpn|bool }
   - ipa/client
   - collectd/base
-  - { role: iscsi_client, when: "inventory_hostname.startswith(('bvirthost', 'buildvmhost-0'))" }
   - { role: iscsi_client, when: "inventory_hostname.startswith(('bvmhost-x86-06', 'bvmhost-x86-07')) and datacenter == 'iad2'" }
   - sudo
   - virthost
-  - { role: linux-system-roles.nbde_client, when: datacenter == 'iad2' and nbde == 'true' }
+  - { role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: datacenter == 'iad2' and nbde|bool }
   - { role: serial-console, when: datacenter == 'iad2' and not inventory_hostname.startswith('buildvmhost-s390x') }
 
   tasks: