diff --git a/kubernetes/apps/downloads/cifs-pvcs/kustomization.yaml b/kubernetes/apps/downloads/cifs-pvcs/kustomization.yaml
index d32b67bd..777b0930 100644
--- a/kubernetes/apps/downloads/cifs-pvcs/kustomization.yaml
+++ b/kubernetes/apps/downloads/cifs-pvcs/kustomization.yaml
@@ -3,11 +3,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../../templates/csi-driver-smb/claims/cifs-appdata.yaml
-  # - ../../../templates/csi-driver-smb/claims/cifs-books.yaml
-  - ../../../templates/csi-driver-smb/claims/cifs-downloads.yaml
-  # - ../../../templates/csi-driver-smb/claims/cifs-games.yaml
-  # - ../../../templates/csi-driver-smb/claims/cifs-misc.yaml
-  - ../../../templates/csi-driver-smb/claims/cifs-movies.yaml
-  # - ../../../templates/csi-driver-smb/claims/cifs-music.yaml
-  - ../../../templates/csi-driver-smb/claims/cifs-tv.yaml
+  - ../../../templates/csi-driver-nfs/claims/cifs-appdata.yaml
+  # - ../../../templates/csi-driver-nfs/claims/cifs-books.yaml
+  - ../../../templates/csi-driver-nfs/claims/cifs-downloads.yaml
+  # - ../../../templates/csi-driver-nfs/claims/cifs-games.yaml
+  # - ../../../templates/csi-driver-nfs/claims/cifs-misc.yaml
+  - ../../../templates/csi-driver-nfs/claims/cifs-movies.yaml
+  # - ../../../templates/csi-driver-nfs/claims/cifs-music.yaml
+  - ../../../templates/csi-driver-nfs/claims/cifs-tv.yaml
diff --git a/kubernetes/apps/storage/csi-driver-smb/app/externalsecret.yaml b/kubernetes/apps/storage/csi-driver-smb/app/externalsecret.yaml
deleted file mode 100644
index 58d7ab72..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/app/externalsecret.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/external-secrets.io/externalsecret_v1beta1.json
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: &name csi-driver-smb
-  namespace: storage
-spec:
-  target:
-    name: *name
-    deletionPolicy: Delete
-    template:
-      type: Opaque
-      data:
-        username: |-
-          {{ .username }}
-        password: |-
-          {{ .password }}
-        mountOptions: "dir_mode=0775,file_mode=0664,uid=0,gid=0,noperm,mfsymlinks,noserverino,multichannel,max_channels=4"
-  data:
-    - secretKey: username
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: &secretKey 37cdb723-94d5-4a46-8a52-76b4f034137f
-        property: username
-    - secretKey: password
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: *secretKey
-        property: password
diff --git a/kubernetes/apps/storage/csi-driver-smb/app/helmrelease.yaml b/kubernetes/apps/storage/csi-driver-smb/app/helmrelease.yaml
deleted file mode 100644
index 6597b6db..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/app/helmrelease.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: csi-driver-smb
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: csi-driver-smb
-      version: v1.16.0
-      sourceRef:
-        kind: HelmRepository
-        name: csi-driver-smb
-        namespace: flux-system
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      retries: 3
-  uninstall:
-    keepHistory: false
-  values:
-    node:
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
diff --git a/kubernetes/apps/storage/csi-driver-smb/app/kustomization.yaml b/kubernetes/apps/storage/csi-driver-smb/app/kustomization.yaml
deleted file mode 100644
index 4eed917b..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/app/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./externalsecret.yaml
-  - ./helmrelease.yaml
diff --git a/kubernetes/apps/storage/csi-driver-smb/ks.yaml b/kubernetes/apps/storage/csi-driver-smb/ks.yaml
deleted file mode 100644
index f3512758..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/ks.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app csi-driver-smb
-  namespace: flux-system
-spec:
-  targetNamespace: storage
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  dependsOn:
-    - name: external-secrets
-  path: ./kubernetes/apps/storage/csi-driver-smb/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app csi-driver-smb-storage-classes
-  namespace: flux-system
-spec:
-  targetNamespace: storage
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  dependsOn:
-    - name: csi-driver-smb
-  path: ./kubernetes/apps/storage/csi-driver-smb/storage-classes
-  prune: true
-  force: true
-  sourceRef:
-    kind: GitRepository
-    name: home-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
-  patches:
-    - target:
-        kind: StorageClass
-      patch: |
-        - op: add
-          path: /volumeBindingMode
-          value: Immediate
-        - op: add
-          path: /allowVolumeExpansion
-          value: true
-        - op: add
-          path: /reclaimPolicy
-          value: Delete
-        - op: add
-          path: /parameters/onDelete
-          value: retain
-        - op: add
-          path: /parameters/csi.storage.k8s.io~1node-stage-secret-name
-          value: csi-driver-smb
-        - op: add
-          path: /parameters/csi.storage.k8s.io~1node-stage-secret-namespace
-          value: storage
-        - op: add
-          path: /mountOptions
-          value:
-            - "dir_mode=0775"
-            - "file_mode=0664"
-            - "uid=0"
-            - "gid=100"
-            - noperm
-            - mfsymlinks
-            - noserverino
-#            - multichannel
-#            - max_channels=4
diff --git a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-appdata.yaml b/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-appdata.yaml
deleted file mode 100644
index 2df8d949..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-appdata.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/storageclass.json
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: "cifs-appdata"
-provisioner: smb.csi.k8s.io
-parameters:
-  source: "//${SECRET_UNRAID_HOSTNAME}/k3s/appdata"
-
diff --git a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-database.yaml b/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-database.yaml
deleted file mode 100644
index 13fb9eb7..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-database.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/storageclass.json
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: "cifs-database"
-provisioner: smb.csi.k8s.io
-parameters:
-  source: "//${SECRET_UNRAID_HOSTNAME}/k3s/database"
-
diff --git a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-downloads.yaml b/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-downloads.yaml
deleted file mode 100644
index 9505f397..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-downloads.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/storageclass.json
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: "cifs-downloads"
-provisioner: smb.csi.k8s.io
-parameters:
-  source: "//${SECRET_UNRAID_HOSTNAME}/k3s/downloads"
-
diff --git a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-movies.yaml b/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-movies.yaml
deleted file mode 100644
index 5284e780..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-movies.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/storageclass.json
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: "cifs-movies"
-provisioner: smb.csi.k8s.io
-parameters:
-  source: "//${SECRET_UNRAID_HOSTNAME}/movies"
diff --git a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-tv.yaml b/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-tv.yaml
deleted file mode 100644
index aed83988..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/storage-classes/cifs-tv.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/storageclass.json
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: "cifs-tv"
-provisioner: smb.csi.k8s.io
-parameters:
-  source: "//${SECRET_UNRAID_HOSTNAME}/shows"
diff --git a/kubernetes/apps/storage/csi-driver-smb/storage-classes/kustomization.yaml b/kubernetes/apps/storage/csi-driver-smb/storage-classes/kustomization.yaml
deleted file mode 100644
index 9a3c44c7..00000000
--- a/kubernetes/apps/storage/csi-driver-smb/storage-classes/kustomization.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./cifs-appdata.yaml
-  - ./cifs-movies.yaml
-  - ./cifs-tv.yaml
-  - ./cifs-database.yaml
-  - ./cifs-downloads.yaml
diff --git a/kubernetes/templates/csi-driver-smb/claims/cifs-appdata.yaml b/kubernetes/templates/csi-driver-smb/claims/cifs-appdata.yaml
deleted file mode 100644
index 8149b71f..00000000
--- a/kubernetes/templates/csi-driver-smb/claims/cifs-appdata.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# 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
diff --git a/kubernetes/templates/csi-driver-smb/claims/cifs-database.yaml b/kubernetes/templates/csi-driver-smb/claims/cifs-database.yaml
deleted file mode 100644
index 0f901774..00000000
--- a/kubernetes/templates/csi-driver-smb/claims/cifs-database.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# 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
diff --git a/kubernetes/templates/csi-driver-smb/claims/cifs-downloads.yaml b/kubernetes/templates/csi-driver-smb/claims/cifs-downloads.yaml
deleted file mode 100644
index 36570182..00000000
--- a/kubernetes/templates/csi-driver-smb/claims/cifs-downloads.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# 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
diff --git a/kubernetes/templates/csi-driver-smb/claims/cifs-movies.yaml b/kubernetes/templates/csi-driver-smb/claims/cifs-movies.yaml
deleted file mode 100644
index b07af4b3..00000000
--- a/kubernetes/templates/csi-driver-smb/claims/cifs-movies.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# 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
diff --git a/kubernetes/templates/csi-driver-smb/claims/cifs-tv.yaml b/kubernetes/templates/csi-driver-smb/claims/cifs-tv.yaml
deleted file mode 100644
index ed829834..00000000
--- a/kubernetes/templates/csi-driver-smb/claims/cifs-tv.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# 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