diff --git a/nfs-server/templates/deployment.yaml b/nfs-server/templates/deployment.yaml
index e5458c8cd63d6747fcf62823dd8b8da2a074f6c1..c03ea2f9b5d33cf6115e03b6bd6842560d45ebdd 100644
--- a/nfs-server/templates/deployment.yaml
+++ b/nfs-server/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "nfs-server.name" . }}
+  name: {{ include "nfs-server.fullname" . }}
   labels:
     {{- include "nfs-server.labels" . | nindent 4 }}
 spec:
diff --git a/nfs-server/templates/storageClass.yaml b/nfs-server/templates/storageClass.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..56cffea958d1cdc7d131a61c770a7f8d5a9cb2a3
--- /dev/null
+++ b/nfs-server/templates/storageClass.yaml
@@ -0,0 +1,25 @@
+{{- range .Values.storageClasses }}
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ .name }}
+  labels:
+    {{- include "nfs-server.labels" $ | nindent 4 }}
+  {{- with .annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+provisioner: nfs.csi.k8s.io
+{{- with .parameters }}
+parameters:
+{{ toYaml . | indent 2 }}
+{{- end }}
+reclaimPolicy: {{ .reclaimPolicy }}
+volumeBindingMode: {{ .volumeBindingMode }}
+allowVolumeExpansion: {{ .allowVolumeExpansion | default false }}
+{{- with .mountOptions }}
+mountOptions:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/nfs-server/values.yaml b/nfs-server/values.yaml
index d17716278f2661d34e3b64a99c167dab6db5e051..cdddff46be4f51aa16ee38e5d55dc5377c600215 100644
--- a/nfs-server/values.yaml
+++ b/nfs-server/values.yaml
@@ -41,9 +41,8 @@ podLabels: {}
 podSecurityContext: {}
   # fsGroup: 2000
 
-securityContext: {
+securityContext:
   privileged: true
-}
   # capabilities:
   #   drop:
   #   - ALL
@@ -123,21 +122,25 @@ env:
     PERMITTED: '*'
   secret: {}
 
+storageClasses: []
+# - name: nfs-csi-dynamic
+#   volumeBindingMode: Immediate
+#   annotations:
+#     helm.sh/resource-policy: keep
+#   parameters:
+#     server: nfs-server.nfs-server.svc.cluster.local
+#     share: /
+#     subDir: ""
+#   reclaimPolicy: Delete
+#   volumeBindingMode: Immediate
+#   mountOptions:
+#   - nfsvers=4
+# - name: nfs-csi-static
+#   annotations:
+#     helm.sh/resource-policy: keep
+#   reclaimPolicy: Retain
+#   volumeBindingMode: Immediate
+
 csi-driver-nfs:
-  # For static provisioning, create the pv's manually
   storageClass:
-    create: true
-    name: nfs-csi
-
-    annotations:
-      helm.sh/resource-policy: keep
-
-    parameters:
-      server: nfs-server.nfs-server.svc.cluster.local
-      share: /
-      subDir: ""
-
-    reclaimPolicy: Delete
-    volumeBindingMode: Immediate
-    mountOptions:
-    - nfsvers=4
+    create: false