diff --git a/ansible/cluster.yml b/ansible/cluster.yml
index 3197a1198d31246aa41952b3affce773a049a6db..609d2faa39752b97aefdf0d0189ca3faecdd7635 100644
--- a/ansible/cluster.yml
+++ b/ansible/cluster.yml
@@ -4,7 +4,7 @@
   become: true
   roles:
     - { name: 'cheaha.node', tags: 'cheaha.node' }
-    - { name: 'nfs_mounts', tags: 'nfs_mounts' }
+    - { name: 'nfs_mounts', tags: 'nfs_mounts', when: enable_nfs_mounts }
     - { name: 'ldap_config', tags: 'ldap_config' }
     - { name: 'slurm_client', tags: 'slurm_client', when: enable_slurm_client }
     - { name: 'ssh_host_keys', tags: 'ssh_host_keys' }
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index a1356bb460bb7012a2c3529740202923f3f1bebc..78a9c64dd1c32f71b814c84c574a1a6f2e7532df 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -28,6 +28,7 @@
   ldap_uri: "ldap://ldapserver"
 
 # nfs_mounts related
+  enable_nfs_mounts: true
   use_autofs: false
   mount_points:
     - { "src": "master:/gpfs4", "path": "/gpfs4", "opts": "ro,sync,hard", "mode": "0755" }