diff --git a/services/Gotify/application-gotify.yaml b/services/Gotify/application-gotify.yaml
index c86daaf..1a20390 100644
--- a/services/Gotify/application-gotify.yaml
+++ b/services/Gotify/application-gotify.yaml
@@ -8,10 +8,11 @@ spec:
     namespace: gotify
     server: https://kubernetes.default.svc
   project: default
-  source:
-    path: services/Gotify
-    repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog.git
-    targetRevision: HEAD
   syncPolicy:
-    automated:
-      selfHeal: true
+    automated: {}
+    syncOptions:
+      - CreateNamespace=true
+  sources:
+  - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog
+    path: services/Gotify
+    targetRevision: HEAD
diff --git a/services/Gotify/persistentvolume-csismb-gotify-data.yaml b/services/Gotify/persistentvolume-csismb-gotify-data.yaml
index 682e6ac..bb0ad73 100644
--- a/services/Gotify/persistentvolume-csismb-gotify-data.yaml
+++ b/services/Gotify/persistentvolume-csismb-gotify-data.yaml
@@ -28,4 +28,4 @@ spec:
       subDir: gotify/data
     nodeStageSecretRef:
       name: smb-credentials
-      namespace: argus
+      namespace: gotify
diff --git a/services/Lighttpd/application-lighttpd.yaml b/services/Lighttpd/application-lighttpd.yaml
index f4ed58c..aa4c5ea 100644
--- a/services/Lighttpd/application-lighttpd.yaml
+++ b/services/Lighttpd/application-lighttpd.yaml
@@ -8,10 +8,11 @@ spec:
     namespace: lighttpd
     server: https://kubernetes.default.svc
   project: default
-  source:
-    path: services/Lighttpd
-    repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog.git
-    targetRevision: HEAD
   syncPolicy:
-    automated:
-      selfHeal: true
+    automated: {}
+    syncOptions:
+      - CreateNamespace=true
+  sources:
+  - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog
+    path: services/Lighttpd
+    targetRevision: HEAD
diff --git a/services/Lighttpd/deployment-lighttpd.yaml b/services/Lighttpd/deployment-lighttpd.yaml
index 7dde77f..1afb106 100644
--- a/services/Lighttpd/deployment-lighttpd.yaml
+++ b/services/Lighttpd/deployment-lighttpd.yaml
@@ -30,7 +30,7 @@ spec:
           subPath: .htpasswd
         - name: configmap-lighttpd-vhosts
           mountPath: /etc/lighttpd/vhosts.d
-        - name: flexvolsmb-lighttpd-websites
+        - name: csismb-lighttpd-websites
           mountPath: /var/www/
       volumes:
       - name: configmap-lighttpd-conf
@@ -39,6 +39,6 @@ spec:
       - name: configmap-lighttpd-vhosts
         configMap:
           name: configmap-lighttpd-vhosts
-      - name: flexvolsmb-lighttpd-websites
+      - name: csismb-lighttpd-websites
         persistentVolumeClaim:
-          claimName: flexvolsmb-lighttpd-websites
+          claimName: csismb-lighttpd-websites
diff --git a/services/Lighttpd/persistentvolume-csismb-lighttpd-websites.yaml b/services/Lighttpd/persistentvolume-csismb-lighttpd-websites.yaml
new file mode 100644
index 0000000..e7ff2e2
--- /dev/null
+++ b/services/Lighttpd/persistentvolume-csismb-lighttpd-websites.yaml
@@ -0,0 +1,31 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  annotations:
+    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
+  name: csismb-lighttpd-websites
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: csismb-lighttpd-websites
+  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#lighttpd#websites
+    volumeAttributes:
+      source: //192.168.154.195/K3s.Volumes
+      subDir: lighttpd/websites
+    nodeStageSecretRef:
+      name: smb-credentials
+      namespace: lighttpd
diff --git a/services/Lighttpd/persistentvolume-flexvolsmb-lighttpd-websites.yaml b/services/Lighttpd/persistentvolume-flexvolsmb-lighttpd-websites.yaml
deleted file mode 100644
index c29a1c6..0000000
--- a/services/Lighttpd/persistentvolume-flexvolsmb-lighttpd-websites.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: flexvolsmb-lighttpd-websites
-spec:
-  capacity:
-    storage: 1Gi
-  accessModes:
-    - ReadWriteMany
-  storageClassName: flexvolsmb-lighttpd-websites
-  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/lighttpd/websites
diff --git a/services/Lighttpd/persistentvolumeclaim-flexvolsmb-lighttpd-websites.yaml b/services/Lighttpd/persistentvolumeclaim-csismb-lighttpd-websites.yaml
similarity index 65%
rename from services/Lighttpd/persistentvolumeclaim-flexvolsmb-lighttpd-websites.yaml
rename to services/Lighttpd/persistentvolumeclaim-csismb-lighttpd-websites.yaml
index db2837e..54be922 100644
--- a/services/Lighttpd/persistentvolumeclaim-flexvolsmb-lighttpd-websites.yaml
+++ b/services/Lighttpd/persistentvolumeclaim-csismb-lighttpd-websites.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: flexvolsmb-lighttpd-websites
+  name: csismb-lighttpd-websites
   namespace: lighttpd
 spec:
   accessModes:
     - ReadWriteMany
-  storageClassName: flexvolsmb-lighttpd-websites
+  storageClassName: csismb-lighttpd-websites
   resources:
     requests:
       storage: 1Gi
diff --git a/services/Lighttpd/sealedsecret-flexvolsmb-credentials.yaml b/services/Lighttpd/sealedsecret-flexvolsmb-credentials.yaml
deleted file mode 100644
index 770ea4c..0000000
--- a/services/Lighttpd/sealedsecret-flexvolsmb-credentials.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: flexvolsmb-credentials
-  namespace: lighttpd
-spec:
-  encryptedData:
-    password: AgAc9UFx4rs5SmuntY7dUxf80geDlDc/zn9SaGWu4Z5n9aWJZZWlrAAq081fTeb4jjiR3bjdlKqgwLkKiIgkYlp1nBgfLsLo5rE49c8eo+s0x+0L2gVj9ArqHWD5hw76evnD73AU3zuQGNoHg7x7iUmyCtBk9kLDQTXWsLkSnb0HLB7knOqQjK8C1uC4eTdjQRLmhevQAl/oxiDZ8lf/xkj7GH3o0Gp6DKiGetnKYsaJJGPeImdAQzHMlH7F0ypQGMeyWU9zh4ro8a8G+Sxorjz45ws/ORpN6jWifnDX0xshVjsVM/hD98xui7thsf++B8JxZK0i+sls0zpgtJvKyzJJytOXknPNMyqG+S5QN94iFfoCnP1ZgBGdEJVI7c+RXFekenXSNgrCqjCEHy+L09AjTXOwrtPfQovhw7ai7lAsE6f4N5uU8XbYdbqh6jG442ZowWyl0vpVa1Ea93Fy205vxoncasAiO0UT0UcMxekZ5jzeJU8crxieCtck7Z65GsHWuoWLSH2PX43k1JSKMG5zbZNvOszjR58fXHdj/HjXug9K5hHJekNk0A4+iAY/SwdzxaTCKbQgly4HTHX2JqBHMXRDYGm15qns/R5O48XcEs7aEWWVDvYyeiDrSM0il/29kMNb+vwzaPOdSwfb5GShZcirRWQgAdPdEM36Z6O1h+EoeazO6/Hj+JYf+DcX8/5DuC1nTkhQj9NFmoLzrHtc
-    username: AgDW9pYxGa/I0NBjXWcqcHZY2ZSY9IUd/sOyg40e6T5wPSioUgWqn3tf3EzNqUVJsSJndKWZnagXZGMafkYS3WYOsrIiSR4jyAtHc7t7D9TGw8dEzXeP8UF+ICCpd3YzD7856+Xov9pmXziHS1gT5hqywdFEruoiR9gtbrdEqG0PHFt96Bcve5JillbFWh2VsRBe4gMKoRfjGHd69voGsqkn3H4VwHITRWixNploRXOyq1+hO49Ka+Rs4TbQvXWTVAyqYZEWWKC9W0S8CN3mhzBDg+JNHSzsd1BqQNQ+lJ9S12gaTphWH5v+IUSlCWsIGDjwC5oKTzy5IYcw5V/DcfMl8/vYexb2dB4nQo0vJb1Ip+HPrBSl3HvV/Vz7Tq2fXN0h7QvyUjeEsTQaMrYe47AuMBCiNcmUY5z1KwNMfNjXSYbJEqLZ25ABj2xNq2GefZhWcBOl3zkQExgGfrmfh8eSzThMkfY8NpWho9DfitD44a9B9J2hGn5H/eUKbEJXLYs8JKXXBfSYZQJS7ac/ub/iPDfefSPPXeJFPBZIwnSP/khp9D/6/4tVQyT1XijJBrD2FkcX6nE5fcrnVmJtGEv6YBkOSyszJqtTBjXbHQuNnyCc2R//ybPev+CIyGvD2uZwN5b/8nKbABweLPRKpRJlM2v4e1N/Y70hxSOIN5iFd7FSG/8QV0U8Jm6ZI7xkoHAAitu8A2U=
-  template:
-    metadata:
-      creationTimestamp: null
-      name: flexvolsmb-credentials
-      namespace: lighttpd
-    type: mount/smb