diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index f093034627..694b3d7237 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -24,16 +24,19 @@
   - hosts
   - apache
   - { role: nfs/client,
-      when: ( ansible_architecture == 'x86_64' or ansible_architecture == 'ppc64le' or ansible_architecture == 'ppc64' ) and not inventory_hostname.startswith('buildvm-ppc64'),
+      when: ( "'buildvm' in group_names" or "'buildppcle' in group_names" or "'buildppc' in group_names" ),
       mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
   - { role: nfs/client,
-      when: inventory_hostname.startswith('aarch64') ,
+      when: "'buildaarch64' in group_names" ,
       mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_arm/data' }
   - { role: nfs/client,
-      when: inventory_hostname.startswith('buildvm-ppc64') ,
+      when: ( "'buildvm-ppc64' in group_names" or "'buildvm-ppc64le' in group_names") ,
       mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_ppc/data' }
   - { role: nfs/client,
-      when: datacenter == 'staging', mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
+      when: "'buildvm-s390' in group_names" ,
+      mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_s390/data' }
+  - { role: nfs/client,
+      when: "'buildvm-stg' in group_names", mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
   - { role: fas_client, when: not inventory_hostname.startswith('bkernel') }
   - { role: sudo, when: not inventory_hostname.startswith('bkernel') }
   - koji_builder