diff --git a/clusters/base/apps/radicale/helmrelease.yaml b/clusters/base/apps/radicale/helmrelease.yaml
index d21a6a9..b44266b 100644
--- a/clusters/base/apps/radicale/helmrelease.yaml
+++ b/clusters/base/apps/radicale/helmrelease.yaml
@@ -69,7 +69,7 @@ spec:
         type: persistentVolumeClaim
         accessMode: ReadWriteOnce
         size: 1Gi
-        storageClass: longhorn-retain
+        storageClass: longhorn
         retain: true
         globalMounts:
           - path: /data
diff --git a/clusters/base/apps/vaultwarden/helmrelease.yaml b/clusters/base/apps/vaultwarden/helmrelease.yaml
index 83010a2..8335a98 100644
--- a/clusters/base/apps/vaultwarden/helmrelease.yaml
+++ b/clusters/base/apps/vaultwarden/helmrelease.yaml
@@ -59,7 +59,7 @@ spec:
     persistence:
       data:
         type: persistentVolumeClaim
-        storageClass: longhorn-retain
+        storageClass: longhorn
         accessMode: ReadWriteOnce
         size: 2Gi
         retain: true
diff --git a/clusters/base/apps/zigbee2mqtt/helmrelease.yaml b/clusters/base/apps/zigbee2mqtt/helmrelease.yaml
index 90e18f3..6255a63 100644
--- a/clusters/base/apps/zigbee2mqtt/helmrelease.yaml
+++ b/clusters/base/apps/zigbee2mqtt/helmrelease.yaml
@@ -21,7 +21,7 @@ spec:
       storage:
         enabled: true
         size: 1Gi
-        storageClassName: longhorn-retain
+        storageClassName: longhorn
       secrets:
         name: zigbee2mqtt-secrets
 
@@ -44,7 +44,7 @@ spec:
       mqtt:
         server: "mqtt://mosquitto.mqtt.svc.cluster.local:1883"
         user: iot
-        password: '!secret.yaml mqtt_password'
+        password: "!secret.yaml mqtt_password"
         include_device_information: true
         keepalive: 60
         reject_unauthorized: true
@@ -65,7 +65,7 @@ spec:
         channel: 11
         pan_id: 7410
         ext_pan_id: [46, 22, 201, 245, 48, 186, 40, 6]
-        network_key: '!secret.yaml network_key'
+        network_key: "!secret.yaml network_key"
         log_level: info
 
     ingress:
diff --git a/clusters/base/infra/storage-class-local-path-patch/kustomization.yaml b/clusters/base/infra/storage-class-local-path-patch/kustomization.yaml
deleted file mode 100644
index f6fcb35..0000000
--- a/clusters/base/infra/storage-class-local-path-patch/kustomization.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources: []
-patches:
-  - patch: |
-      apiVersion: storage.k8s.io/v1
-      kind: StorageClass
-      metadata:
-        name: local-path
-        annotations:
-          storageclass.kubernetes.io/is-default-class: "false"
-    target:
-      kind: StorageClass
-      name: local-path
\ No newline at end of file
diff --git a/clusters/base/infra/storage-class-longhorn-retain/kustomization.yaml b/clusters/base/infra/storage-class-longhorn-no-retain/kustomization.yaml
similarity index 100%
rename from clusters/base/infra/storage-class-longhorn-retain/kustomization.yaml
rename to clusters/base/infra/storage-class-longhorn-no-retain/kustomization.yaml
diff --git a/clusters/base/infra/storage-class-longhorn-retain/storageclass.yaml b/clusters/base/infra/storage-class-longhorn-no-retain/storageclass.yaml
similarity index 65%
rename from clusters/base/infra/storage-class-longhorn-retain/storageclass.yaml
rename to clusters/base/infra/storage-class-longhorn-no-retain/storageclass.yaml
index 3266666..6b265d0 100644
--- a/clusters/base/infra/storage-class-longhorn-retain/storageclass.yaml
+++ b/clusters/base/infra/storage-class-longhorn-no-retain/storageclass.yaml
@@ -1,11 +1,11 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: longhorn-retain
+  name: longhorn-no-retain
   annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
+    storageclass.kubernetes.io/is-default-class: "false"
 provisioner: driver.longhorn.io
-reclaimPolicy: Retain
+reclaimPolicy: Delete
 allowVolumeExpansion: true
 parameters:
   numberOfReplicas: "3"
diff --git a/clusters/home/infra/kustomization.yaml b/clusters/home/infra/kustomization.yaml
index 3be039d..89ed771 100644
--- a/clusters/home/infra/kustomization.yaml
+++ b/clusters/home/infra/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - storage-class-local-path-patch.yaml
-  - storage-class-longhorn-retain.yaml
+  - storage-class-longhorn-no-retain.yaml
diff --git a/clusters/home/infra/storage-class-local-path-patch.yaml b/clusters/home/infra/storage-class-local-path-patch.yaml
deleted file mode 100644
index e8181d9..0000000
--- a/clusters/home/infra/storage-class-local-path-patch.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: local-path-defaultclass-patch
-  namespace: flux-system
-spec:
-  interval: 10m
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  path: ./clusters/base/infra/storage-class-local-path-patch
-  prune: false # its a local-storage-provisioner object, dont let flux destroy it
-  wait: true
\ No newline at end of file
diff --git a/clusters/home/infra/storage-class-longhorn-retain.yaml b/clusters/home/infra/storage-class-longhorn-no-retain.yaml
similarity index 78%
rename from clusters/home/infra/storage-class-longhorn-retain.yaml
rename to clusters/home/infra/storage-class-longhorn-no-retain.yaml
index f422449..1a0a9b4 100644
--- a/clusters/home/infra/storage-class-longhorn-retain.yaml
+++ b/clusters/home/infra/storage-class-longhorn-no-retain.yaml
@@ -8,6 +8,6 @@ spec:
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./clusters/base/infra/storage-class-longhorn-retain
+  path: ./clusters/base/infra/storage-class-longhorn-no-retain
   prune: true
   wait: true