diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index c0b71fcd3be846f3c87fdd369c49072049f782db..c3cb579071cdc214c1c0d311f35d7258ee9126c8 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -22,6 +22,7 @@
   ldap_uri: "ldap://ldapserver"
 
 # nfs_mounts related
+  use_autofs: false
   mount_points:
     - /gpfs4
     - /gpfs5
diff --git a/ansible/roles/nfs_mounts/tasks/main.yml b/ansible/roles/nfs_mounts/tasks/main.yml
index d99aefe322288605e502212f0244a4089131a4d6..507f4c6e0c6700830aeb7b96479ff400570bddfe 100644
--- a/ansible/roles/nfs_mounts/tasks/main.yml
+++ b/ansible/roles/nfs_mounts/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: nfs_mounts using fstab
   include_tasks: fstab.yml
-  when: "'proxy' in group_names"
+  when: not use_autofs
 
 - name: nfs_mounts using autofs
   include_tasks: autofs.yml
-  when: "'proxy' not in group_names"
+  when: use_autofs