diff --git a/storage-class.yaml b/storage-class.yaml
index ec36760..261250f 100644
--- a/storage-class.yaml
+++ b/storage-class.yaml
@@ -4,6 +4,7 @@ metadata:
   name: nfs-csi
 provisioner: nfs.csi.k8s.io
 parameters:
+  subDir: ${pvc.metadata.namespace}-${pvc.metadata.name}
   mountPermissions: "0755"
   onDelete: Retain
   server: 192.168.0.105
diff --git a/values.yaml b/values.yaml
index d0deb2c..bc55e38 100644
--- a/values.yaml
+++ b/values.yaml
@@ -180,17 +180,14 @@ storageClass:
   #annotations:
   #  storageclass.kubernetes.io/is-default-class: "true"
   parameters:
-    server: 192.168.0.105
-    share: /
-    subDir:
+    subDir: ${pvc.metadata.namespace}-${pvc.metadata.name}
     mountPermissions: "0755"
-    #     csi.storage.k8s.io/provisioner-secret is only needed for providing mountOptions in DeleteVolume
-    #csi.storage.k8s.io/provisioner-secret-name: "mount-options"
-    #csi.storage.k8s.io/provisioner-secret-namespace: "default"
+    onDelete: Retain
+    server: 192.168.0.105
+    share: /nfs/NFS/ocp
   reclaimPolicy: Retain
+  allowVolumeExpansion: true
   volumeBindingMode: Immediate
-  mountOptions:
-    - nfsvers=4.1
 ## StorageClass resources for creating multiple storage classes:
 ## If you want multiple storage classes with different configurations, use this instead of storageClass above
 # storageClasses: