diff --git a/kubernetes/apps/storage/csi-driver-nfs/app/storage-classes/provisions.yaml b/kubernetes/apps/storage/csi-driver-nfs/app/storage-classes/provisions.yaml
index 38fae069..3ce4a268 100644
--- a/kubernetes/apps/storage/csi-driver-nfs/app/storage-classes/provisions.yaml
+++ b/kubernetes/apps/storage/csi-driver-nfs/app/storage-classes/provisions.yaml
@@ -18,4 +18,3 @@ mountOptions:
   - hard
   - noatime
   - nodiratime
-
diff --git a/kubernetes/templates/csi-driver-nfs/claims/cifs-appdata.yaml b/kubernetes/templates/csi-driver-nfs/claims/cifs-appdata.yaml
index 8149b71f..26e05f06 100644
--- a/kubernetes/templates/csi-driver-nfs/claims/cifs-appdata.yaml
+++ b/kubernetes/templates/csi-driver-nfs/claims/cifs-appdata.yaml
@@ -1,19 +1,46 @@
----
+# ---
 # yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/persistentvolumeclaim.json
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: &name cifs-appdata
+#   annotations:
+#     volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#     volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#   labels:
+#     csi-driver-nfs: "cifs-share"
+# spec:
+#   accessModes:
+#   - ReadWriteMany
+#   resources:
+#     requests:
+#       storage: 1Ti
+#   volumeName: pv-appdata
+#   storageClassName: nfs-provision-csi
+
+---
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: PersistentVolume
 metadata:
-  name: &name cifs-appdata
   annotations:
-    volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-    volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-  labels:
-    csi-driver-nfs: "cifs-share"
+    pv.kubernetes.io/provisioned-by: nfs.csi.k8s.io
+  name: cifs-appdata
 spec:
+  capacity:
+    storage: 1Ti
   accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 1Ti
-  volumeName: pv-appdata
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-provision-csi
+  mountOptions:
+    - nfsvers=4.1
+  csi:
+    driver: nfs.csi.k8s.io
+    # volumeHandle format: {nfs-server-address}#{sub-dir-name}#{share-name}
+    # make sure this value is unique for every share in the cluster
+    volumeHandle: 192.168.1.68/mnt/user/k3s#appdata#
+    volumeAttributes:
+      server: 192.168.1.68
+      share: /mnt/user/k3s
+      subDir: /appdata
+      mountPermissions: 0750
diff --git a/kubernetes/templates/csi-driver-nfs/claims/cifs-database.yaml b/kubernetes/templates/csi-driver-nfs/claims/cifs-database.yaml
index 0f901774..6879c7a6 100644
--- a/kubernetes/templates/csi-driver-nfs/claims/cifs-database.yaml
+++ b/kubernetes/templates/csi-driver-nfs/claims/cifs-database.yaml
@@ -1,18 +1,45 @@
----
+# ---
 # yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/persistentvolumeclaim.json
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: &name cifs-database
+#   annotations:
+#     volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#     volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#   labels:
+#     csi-driver-nfs: "cifs-share"
+# spec:
+#   accessModes:
+#   - ReadWriteMany
+#   resources:
+#     requests:
+#       storage: 1Ti
+#   storageClassName: nfs-provision-csi
+
+---
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: PersistentVolume
 metadata:
-  name: &name cifs-database
   annotations:
-    volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-    volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-  labels:
-    csi-driver-nfs: "cifs-share"
+    pv.kubernetes.io/provisioned-by: nfs.csi.k8s.io
+  name: cifs-database
 spec:
+  capacity:
+    storage: 1Ti
   accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 1Ti
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-provision-csi
+  mountOptions:
+    - nfsvers=4.1
+  csi:
+    driver: nfs.csi.k8s.io
+    # volumeHandle format: {nfs-server-address}#{sub-dir-name}#{share-name}
+    # make sure this value is unique for every share in the cluster
+    volumeHandle: 192.168.1.68/mnt/user/k3s#database#
+    volumeAttributes:
+      server: 192.168.1.68
+      share: /mnt/user/k3s
+      subDir: /database
+      mountPermissions: 0750
diff --git a/kubernetes/templates/csi-driver-nfs/claims/cifs-downloads.yaml b/kubernetes/templates/csi-driver-nfs/claims/cifs-downloads.yaml
index 36570182..0f43d8cb 100644
--- a/kubernetes/templates/csi-driver-nfs/claims/cifs-downloads.yaml
+++ b/kubernetes/templates/csi-driver-nfs/claims/cifs-downloads.yaml
@@ -1,19 +1,46 @@
----
+# ---
 # yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/persistentvolumeclaim.json
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: &name cifs-downloads
+#   annotations:
+#     volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#     volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#   labels:
+#     csi-driver-nfs: "cifs-share"
+# spec:
+#   accessModes:
+#   - ReadWriteMany
+#   resources:
+#     requests:
+#       storage: 1Ti
+#   volumeName: pv-downloads
+#   storageClassName: nfs-provision-csi
+
+---
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: PersistentVolume
 metadata:
-  name: &name cifs-downloads
   annotations:
-    volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-    volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-  labels:
-    csi-driver-nfs: "cifs-share"
+    pv.kubernetes.io/provisioned-by: nfs.csi.k8s.io
+  name: cifs-downloads
 spec:
+  capacity:
+    storage: 1Ti
   accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 1Ti
-  volumeName: pv-downloads
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-provision-csi
+  mountOptions:
+    - nfsvers=4.1
+  csi:
+    driver: nfs.csi.k8s.io
+    # volumeHandle format: {nfs-server-address}#{sub-dir-name}#{share-name}
+    # make sure this value is unique for every share in the cluster
+    volumeHandle: 192.168.1.68/mnt/user/k3s#downloads#
+    volumeAttributes:
+      server: 192.168.1.68
+      share: /mnt/user/k3s
+      subDir: /downloads
+      mountPermissions: 0750
diff --git a/kubernetes/templates/csi-driver-nfs/claims/cifs-movies.yaml b/kubernetes/templates/csi-driver-nfs/claims/cifs-movies.yaml
index b07af4b3..3ec05043 100644
--- a/kubernetes/templates/csi-driver-nfs/claims/cifs-movies.yaml
+++ b/kubernetes/templates/csi-driver-nfs/claims/cifs-movies.yaml
@@ -1,19 +1,46 @@
----
+# ---
 # yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/persistentvolumeclaim.json
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: &name cifs-movies
+#   annotations:
+#     volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#     volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#   labels:
+#     csi-driver-nfs: "cifs-share"
+# spec:
+#   accessModes:
+#   - ReadWriteMany
+#   resources:
+#     requests:
+#       storage: 1Ti
+#   volumeName: pv-movies
+#   storageClassName: nfs-provision-csi
+
+---
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: PersistentVolume
 metadata:
-  name: &name cifs-movies
   annotations:
-    volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-    volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-  labels:
-    csi-driver-nfs: "cifs-share"
+    pv.kubernetes.io/provisioned-by: nfs.csi.k8s.io
+  name: cifs-movies
 spec:
+  capacity:
+    storage: 1Ti
   accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 1Ti
-  volumeName: pv-movies
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-provision-csi
+  mountOptions:
+    - nfsvers=4.1
+  csi:
+    driver: nfs.csi.k8s.io
+    # volumeHandle format: {nfs-server-address}#{sub-dir-name}#{share-name}
+    # make sure this value is unique for every share in the cluster
+    volumeHandle: 192.168.1.68/mnt/user/k3s#movies#
+    volumeAttributes:
+      server: 192.168.1.68
+      share: /mnt/user/k3s
+      subDir: /movies
+      mountPermissions: 0750
diff --git a/kubernetes/templates/csi-driver-nfs/claims/cifs-tv.yaml b/kubernetes/templates/csi-driver-nfs/claims/cifs-tv.yaml
index ed829834..df4af4d8 100644
--- a/kubernetes/templates/csi-driver-nfs/claims/cifs-tv.yaml
+++ b/kubernetes/templates/csi-driver-nfs/claims/cifs-tv.yaml
@@ -1,19 +1,46 @@
----
+# ---
 # yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/persistentvolumeclaim.json
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: &name cifs-tv
+#   annotations:
+#     volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#     volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
+#   labels:
+#     csi-driver-nfs: "cifs-share"
+# spec:
+#   accessModes:
+#   - ReadWriteMany
+#   resources:
+#     requests:
+#       storage: 1Ti
+#   volumeName: pv-tv
+#   storageClassName: nfs-provision-csi
+
+---
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: PersistentVolume
 metadata:
-  name: &name cifs-tv
   annotations:
-    volume.beta.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-    volume.kubernetes.io/storage-provisioner: nfs.csi.k8s.io
-  labels:
-    csi-driver-nfs: "cifs-share"
+    pv.kubernetes.io/provisioned-by: nfs.csi.k8s.io
+  name: cifs-tv
 spec:
+  capacity:
+    storage: 1Ti
   accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 1Ti
-  volumeName: pv-tv
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-provision-csi
+  mountOptions:
+    - nfsvers=4.1
+  csi:
+    driver: nfs.csi.k8s.io
+    # volumeHandle format: {nfs-server-address}#{sub-dir-name}#{share-name}
+    # make sure this value is unique for every share in the cluster
+    volumeHandle: 192.168.1.68/mnt/user/k3s#tv#
+    volumeAttributes:
+      server: 192.168.1.68
+      share: /mnt/user/k3s
+      subDir: /tv
+      mountPermissions: 0750