diff --git a/services/Vaultwarden/deployment-vaultwarden.yaml b/services/Vaultwarden/deployment-vaultwarden.yaml
index b5d2d2b..d2c042b 100644
--- a/services/Vaultwarden/deployment-vaultwarden.yaml
+++ b/services/Vaultwarden/deployment-vaultwarden.yaml
@@ -44,8 +44,8 @@ spec:
             containerPort: 3012
         volumeMounts:
         - mountPath: /data
-          name: flexvolsmb-vaultwarden-data
+          name: csismb-vaultwarden-data
       volumes:
-      - name: flexvolsmb-vaultwarden-data
+      - name: csismb-vaultwarden-data
         persistentVolumeClaim:
-          claimName: flexvolsmb-vaultwarden-data
+          claimName: csismb-vaultwarden-data
diff --git a/services/Vaultwarden/persistentvolume-csismb-vaultwarden-data.yaml b/services/Vaultwarden/persistentvolume-csismb-vaultwarden-data.yaml
new file mode 100644
index 0000000..67eaff0
--- /dev/null
+++ b/services/Vaultwarden/persistentvolume-csismb-vaultwarden-data.yaml
@@ -0,0 +1,31 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  annotations:
+    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
+  name: csismb-vaultwarden-data
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: csismb-vaultwarden-data
+  mountOptions:
+    - dir_mode=0777
+    - file_mode=0777
+    - nobrl
+    - cache=none
+    - mfsymlinks
+    - noserverino  # required to prevent data corruption
+  csi:
+    driver: smb.csi.k8s.io
+    # volumeHandle format: {smb-server-address}#{sub-dir-name}#{share-name}
+    # make sure this value is unique for every share in the cluster
+    volumeHandle: 192.168.154.195#vaultwarden#data
+    volumeAttributes:
+      source: //192.168.154.195/K3s.Volumes
+      subDir: vaultwarden/data
+    nodeStageSecretRef:
+      name: smb-credentials
+      namespace: vaultwarden
diff --git a/services/Vaultwarden/persistentvolume-flexvolsmb-vaultwarden-data.yaml b/services/Vaultwarden/persistentvolume-flexvolsmb-vaultwarden-data.yaml
deleted file mode 100644
index 0ee9af2..0000000
--- a/services/Vaultwarden/persistentvolume-flexvolsmb-vaultwarden-data.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: flexvolsmb-vaultwarden-data
-spec:
-  capacity:
-    storage: 1Gi
-  accessModes:
-    - ReadWriteMany
-  storageClassName: flexvolsmb-vaultwarden-data
-  flexVolume:
-    driver: mount/smb
-    secretRef:
-      name: flexvolsmb-credentials
-    options:
-      opts: file_mode=0777,dir_mode=0777,iocharset=utf8,nobrl
-      server: 192.168.154.195
-      share: /K3s.Volumes/vaultwarden/data
diff --git a/services/Vaultwarden/persistentvolumeclaim-flexvolsmb-vaultwarden-data.yaml b/services/Vaultwarden/persistentvolumeclaim-csismb-vaultwarden-data.yaml
similarity index 66%
rename from services/Vaultwarden/persistentvolumeclaim-flexvolsmb-vaultwarden-data.yaml
rename to services/Vaultwarden/persistentvolumeclaim-csismb-vaultwarden-data.yaml
index 77558cc..a7b17b4 100644
--- a/services/Vaultwarden/persistentvolumeclaim-flexvolsmb-vaultwarden-data.yaml
+++ b/services/Vaultwarden/persistentvolumeclaim-csismb-vaultwarden-data.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: flexvolsmb-vaultwarden-data
+  name: csismb-vaultwarden-data
   namespace: vaultwarden
 spec:
   accessModes:
     - ReadWriteMany
-  storageClassName: flexvolsmb-vaultwarden-data
+  storageClassName: csismb-vaultwarden-data
   resources:
     requests:
       storage: 1Gi
diff --git a/services/Vaultwarden/sealedsecret-flexvolsmb-credentials.yaml b/services/Vaultwarden/sealedsecret-flexvolsmb-credentials.yaml
deleted file mode 100644
index 408db9c..0000000
--- a/services/Vaultwarden/sealedsecret-flexvolsmb-credentials.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: flexvolsmb-credentials
-  namespace: vaultwarden
-spec:
-  encryptedData:
-    password: AgAFSxyvsZICWKYR0ZY7tNH17VP2XPrOIA//MldFVwm4f7npDiclcO/buJE8k/S4iWx5VA9mPXwboZOzUJOakL/6G5rhQ0VxpkaQXDHOqv5412NA0j9lc+ZvB3WD32AvujNUOXgPj4PenmUKe1SX4LT8p3QXbC/3Cpl9YmgsB7c7T3TNg9NGtztbPibwHPUn/wc9wcGbyZQVN7JUd0U9eayifucGxdzjVQtNx9khHerCHDdEJ9AzM4YDPAUwLrkML3KaKO4Kr7XhNRDYV1eGNWBTFbM1O/kISJmt2TBXDe+cQjcygznmybcs8lhX3nHSjJ27SzheBtnD26SwcZ5UqihExK6m1qvl62ePwtztUlHFJeCSTfwWZHigVFwi7TIw6xaXvdDX6Th4/KN403hh0EkxHvlvcHOLsI3eu8predUf3ZyqpZex6fB+c9CBrCRMQzoMXeSBntC+59NxfH7tDLthAS+nHMrBEJDvpckPFd/SZe2xA6nBZngaA0NZewWwBgMVhyjp9/zvHyLwfItb0IgVIN7sfK58BKDT40JdbdwwpvB1xdZ8IktAoUpMc+pSI+ZrVtQwrPYR6g09QzMV6qqTfz/V34zkScaK/E5vLr4hhUv2gjJeqWKc+xg7vrLg3z6K2Ssys21o+UyzOlm3tPl+LPTMFor1B8QrPLX/hFQX2kzG7wblWt1PHA7PoYLby/VEXRiOeDv3Aq30+TyF8RaH
-    username: AgAErKLnO4ikMdR2PSkFdBIFY3deVh1dcpe6+bbOoXCSfqThLnXlszT5xyfgicwYH21MkTjaGovX63CPNva7SgN430nJHZ6v0TbSRwABVFvyXQJxFGTKe+9Bv6+FF76de/qZyhdgXFkX9Wseh1YdEhKmzopUYLtFjArYOGkGE8antUDs448OALwT73ZoRUFnUVfDxdAinKwdzcGQFr6zbK7LeflhX6buCC/+arJxoG3lDDjiuz00bliZf6+Fa5N0JohaUrWp2vOU25IHnVD7GawLWP6Eihb7GbM4BK9/h4oLcyUr9mD5DP/NsNeDe023mbrsog0vcyAG+y1oxYmknB5JKhTbdkwOEubmoQFLvF8qqARsZSg22twWTHayGZrK9Egj1N+kkQyiHLFJCCAu5YDzBLfBRgH1GIQNVFiFi1BDHS/3X+LJpSW5RhHhN7StfDUL81ej9heFbpvwVo8FwcT1Z0sSJ6OIEgIKmg0XVy7NCFdsiUkIwA1dndbHBFtlmrmUaTxnxKS7H73RI1v9OO7FLtX3RYgiKflR+rmggn2M1vaIS+FrgAdowQyDToxlRV2uMpiPJAlaURb/0GnNjN/7UaLtyM42DSBbKs7TO+vQ0UI6WjsZoEGPhJb8pN9LdUpUS0g6QRSCxHTDykEy4b2bmVqlf44bbTDBl0HzbmQXPkHKympQb6otIUy5m61Iy0XNjrCDyJw=
-  template:
-    metadata:
-      creationTimestamp: null
-      name: flexvolsmb-credentials
-      namespace: vaultwarden
-    type: mount/smb
diff --git a/services/Vaultwarden/sealedsecret-smb-credentials.yaml b/services/Vaultwarden/sealedsecret-smb-credentials.yaml
new file mode 100644
index 0000000..132c980
--- /dev/null
+++ b/services/Vaultwarden/sealedsecret-smb-credentials.yaml
@@ -0,0 +1,16 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  creationTimestamp: null
+  name: smb-credentials
+  namespace: vaultwarden
+spec:
+  encryptedData:
+    password: AgBIOwepK5EH0QYlBDHyOlvv1x70SyCxljcPphZurQJXTfJFZBp2T5MHKI34VpzauOuWUCShQaXPVYC7mpSWPZY4vpEBGYhFyvFifkxvjvg5EzNf2ElVg0Ee+oo9rsWa8gCYx+nVsWM0uHeKNr1mTzSUaBOS2dIuf1EmaRHIx8ADQ+ZcLPajeN6NLsDF+Xz5kZamQk6Y50/bkcL1XJW4vjXA5cMGsn34EITNPN2Qzt8wZZmnDwABKGepJiSx+j644CTGF6aAdQ8JLVtcRQCe5HeJl9UNObUjO5peFBdVgf1P47B8XXyQ9AXO49kdjEdFlv8IX/8irw0yIDfrQyNFFmmPzBUljDntOwh2+vwjjfYIEkV+ZHkN34waaSPnRPq/k4WZj//Iwe7Ky1HG0s6ttvTq/5rSEKk6c9Qfq3gtkfZQD95WKxZaM+fFIQYps0/LXwhpfrUfw8RSgI2bZUwC0KEm1bI6cQE3MDZ6CDr1K30HQ/spoS7xsU8XrUyVsLbObbv6wIi915w2BNjJHtvn42VrToIbr/8tCYfeOmHfDttLMngWw1RWbodcLnRhOEOK2tNzU27KWG/+MxIS4jZauHbAD67w8caePV4zJncQ/1e47PTDMc5CppETjz3cLdJfy/J/C6bOxJk9gKY+96pACFineYdOSrHuFf73hbAc1ardBMSsX3/FU9c4Oagld8U/j/LbhIN96c6E1DV+OqftAOkD
+    username: AgCX6SVgkZwDEqkMv5yrqIS5yVyWwCSmkorZtCuCfkBQp5WfopNg/gWXF2dxD+tA/AO857AUW704A8SWm9C3lAtueoZyYxaonVEmSUUoT5MoXt6go6eoqDMU1suFxRd2I7JM2b3gUdfWCcJibP0CbWUglp9HKZu9eHmFYK8mW6a6O8gmoB2VCYHq5lUFVmCwYJZNuRL/pxWsIOWT71qhi52EbXH3a9ATZ9C9EGSVnrdI3CGQGW3TeLh36XTr7LuBizHbHLzVM6j+QIsKKTiPzVimRiEnAstWfein5lXPbulBwkaoL/vaL9RE7j6iWfT7WNXFtCvOfGqXAFNjcOcXDYRHcpzVTJKclmqm/Dvh2ofB9xz0NbOc1wOGYADNfV/EcIriIY72eJoUzPTo9vtiZiXKTjv2dFN7FMObRHzkjAo53+YntPnRSQUuh5mPPaSaGRLrDACtoa1mgcMvy4Ufel6d+0ubXnlG7JZcnOWmWFxXf08T+UdM1bR0Nqjav6EXBSJGkUt3O2Ry+8zcPNHDsiugOdanmtT4PjE3/Kky7+RkqvCldLg0u+1MxQOoq7FsM/RC//ULgp44CPv70gSyKWNqVggw7SzlALZkVQcCW6SjmD2IuxPzGQBm8btrpfsSs2R1QjqeGGvfyPI5VFBnF9o8h7YVdv16T9IK2aidV1ihh0fE8buLDnkMmO9f0nr3uQvHlMiI9KU=
+  template:
+    metadata:
+      creationTimestamp: null
+      name: smb-credentials
+      namespace: vaultwarden
+    type: Opaque