diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml
index ce50555b..d94399f3 100644
--- a/roles/baseline/defaults/main.yml
+++ b/roles/baseline/defaults/main.yml
@@ -135,7 +135,6 @@ CSI_DRIVER_NFS_CONFIG:
       mountPermissions: "0777"
     mountOptions:
       - "{{ 'vers=3' if (PROVIDER == 'gcp' and STORAGE_TYPE_BACKEND == 'netapp') else 'vers=4.1' }}"
-      - nolock
       - noatime
       - nodiratime
       - rsize=262144
diff --git a/roles/baseline/tasks/nfs-csi-provisioner.yaml b/roles/baseline/tasks/nfs-csi-provisioner.yaml
index 5b322f5e..cd3e8323 100644
--- a/roles/baseline/tasks/nfs-csi-provisioner.yaml
+++ b/roles/baseline/tasks/nfs-csi-provisioner.yaml
@@ -179,8 +179,7 @@
           volumeBindingMode: Immediate
           allowVolumeExpansion: true
           mountOptions:
-            - "{{ 'nfsvers=3' if (PROVIDER == 'gcp' and STORAGE_TYPE_BACKEND == 'netapp') else ('nfsvers=4.1' if (V4_CFG_RWX_FILESTORE_PATH != '/volumes' and '-export' not in V4_CFG_RWX_FILESTORE_PATH) else 'nfsvers=4.1') }}"
-            - nolock
+            - "{{ 'nfsvers=3' if (PROVIDER == 'gcp' and STORAGE_TYPE_BACKEND == 'netapp') else ('nfsvers=4.1' if (V4_CFG_RWX_FILESTORE_PATH != '/volumes' and '-export' not in V4_CFG_RWX_FILESTORE_PATH) else 'nolock') }}"
             - noatime
             - nodiratime
             - rsize=262144