diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml
index e0a24a31cd..3d99dd7ef9 100644
--- a/roles/nfs/client/tasks/main.yml
+++ b/roles/nfs/client/tasks/main.yml
@@ -108,7 +108,7 @@
         passno=0
         dump=0
         state=mounted
-  when: env == 'staging' and 'koji' in mnt_dir and '.s390.' not in inventory_hostname
+  when: env == 'staging' and 'koji' in mnt_dir and '.s390.' not in inventory_hostname and not inventory_hostname.startswith('koji')
   tags:
   - nfs/client
 
@@ -121,6 +121,6 @@
         passno=0
         dump=0
         state=mounted
-  when: env == 'staging' and 'koji' in mnt_dir
+  when: env == 'staging' and 'koji' in mnt_dir and '.s390.' not in inventory_hostname
   tags:
   - nfs/client