diff --git a/clusters/base/apps/vaultwarden/secret.enc.yaml b/clusters/base/apps/vaultwarden/secret.enc.yaml
index 5b8f6c4..82299bb 100644
--- a/clusters/base/apps/vaultwarden/secret.enc.yaml
+++ b/clusters/base/apps/vaultwarden/secret.enc.yaml
@@ -4,20 +4,20 @@ metadata:
     name: vaultwarden-secrets
     namespace: vaultwarden
 stringData:
-    #ENC[AES256_GCM,data:rgK6vf2NfmPGlKeWjbMKPgPHsw3WhC5JiSM0ANHC081TZOF6MHk4fKjcshQon7XUCxqZ8wRRv4v7,iv:GSNUF1Pm+D2S6J0TouRIUf9mT+t425bCzmphSml1gl8=,tag:y/gRY9qYlv2WY30UP/TbNA==,type:comment]
-    ADMIN_TOKEN: ENC[AES256_GCM,data:sbUUlOpzNPczSU4Q1OYWO7GUElcqA/poXb3JQ4Ju5ymWuAljSHvod8nAEVO27P+8xvQFdfuIYMvciVcT3fjFufH/UjhRC6XRPuX7adOnjAiFbn+ACuvbGkNLUTZUD0m+y5pR8LNP3q7fgwCMbm7sQ5d/K3dugQ==,iv:1bScd4HBX5I3T4/JziuCblQfZZ3C4HngIGqIHjh5Z2E=,tag:iBMXfEkbhea543Npx2WolQ==,type:str]
+    #ENC[AES256_GCM,data:8kX/g+w8eA9fH5Y6Uw1I5z7QVOAIUKm+/bT+SVaOH95XlM5dpKFZ6A0yt0aYpH7xyj+W92gUHDu3,iv:0w36bhJpjRvVHJIs/wB9BnoN3CI3bPlHPMqDS/lOUuQ=,tag:EGcZ/JP813QOjrS2i0LzgQ==,type:comment]
+    ADMIN_TOKEN: ENC[AES256_GCM,data:y5AbotXvGtJ6nDG13Xz8BxqzwQzWzUwjLJTUSIlxxAi5mEM5BS4hfAnjpkj7r3UchQwgzbF2r6fmfVY0HSX0NbN7hh7GR22QxRJ1MKx6bjLa3KjTnkeOrY9Iu7xD4sb35vdgtOPtuEM6UJEROS5zUwASwrmiFA==,iv:O8ENp5Tj40PlET1pQMt5dFkurPMDwIaJ3oSu+j45w78=,tag:3xC4i0KhAqANzk1n/m3zSg==,type:str]
 sops:
     age:
         - recipient: age109zta6l0cwpkxn5wek82kvauxn6yqrq80rsz4mvu5atdnpcn9pusuvnqk5
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsb2crak9xK1ZxSHZ5Vktj
-            OUlUZml1WHpQOU9BbFM4N3pDcWoxNmYrZG1JCkpQTTE1NldzRnFuTGl4K2ZhaFo1
-            QjVSaU9EL1JjOXpzRzVhNWFEdnpvRkEKLS0tIDYyd0U1Skhmb0V5djlUZnZQdHlZ
-            TUlrM2J4WnAyWDMvU2JxUWUwVmFEWTAKem0oOYIivaV3dn9huUXKfKNxK2uCpEtT
-            cMTLhidF9ejQbLNTnXSSdtN/DcB9sGkfXsfSbK6yMFOt7bxxcyvBkQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFcU5LRUw4YlVNU3pSbEJC
+            UTJtU0YyQ21NK3ZlWERRZFI4K2Nib2VJb253CjJjTEdGcUZZYzZzelozMU1wWmpP
+            MGZ4RVhNODBYWTJMS1pzdDRLVnRrdW8KLS0tIFFmbGZWMG43QkpMRFdCK2VtQSto
+            bSsxeUNBTHR4VkR6M1lPemFoTkNlalUKY/2gyw2SxxNfLuD4zD7P0dJ6IKQsCTFT
+            fAmwH7yfmH6GcDR4mldesfHLavGgS2W4LEVhkwiYnbOuqgQud7smug==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-08-26T10:18:35Z"
-    mac: ENC[AES256_GCM,data:I/rYmuRecxUPU+MVtAjZ1QkGLljwhCW4SYXoOqOJOcwOM3Q0CbXAyvD+XsqzZ6eIX763Rq0pP8BFOUFRdD/zZjcZysmo62LK0dWMZeawPQh7lJaG2luQpk4AafN/3Mnwj7icYHFeTHsFfpNeI5L0laJLYNyXWOwLsH68GASTInc=,iv:vqVd9oX0yNCJ/Iamo1YE/9N+rBdOHiGv1q3YRzRH7yU=,tag:duUJ/BihM9lwsuAJJBAxtw==,type:str]
+    lastmodified: "2026-08-26T10:18:39Z"
+    mac: ENC[AES256_GCM,data:qrFnzvU3gjkYiJEnGktHHo1W8W+sTtZ7XB4Gu7f0J8scckZ652Mpg4w/shzVcsGU5KTq7MVjY68P2QouF6i0u/OBXgqpuAupwWgvgbN0hhMweYRS6Nf6iVPyJBZzmKLKqKgDhsn3BiLNgNECJr6HYD+6pwYiuJJ7sOMQZkHb+H8=,iv:KT+PS8sYteORFoKql9DnO7ipCTIiMm2sv8eRExh33sI=,tag:yw9tQYV6lnhyJDY8zdcyAw==,type:str]
     encrypted_regex: ^(data|stringData)$
     version: 3.11.0
diff --git a/clusters/base/apps/zigbee2mqtt/secret.enc.yaml b/clusters/base/apps/zigbee2mqtt/secret.enc.yaml
index e4eddce..37234b0 100644
--- a/clusters/base/apps/zigbee2mqtt/secret.enc.yaml
+++ b/clusters/base/apps/zigbee2mqtt/secret.enc.yaml
@@ -4,19 +4,19 @@ metadata:
     name: zigbee2mqtt-secrets
     namespace: zigbee2mqtt
 stringData:
-    secret.yaml: ENC[AES256_GCM,data:XM3RDE8ntxzPHN8AGO/dAh+EaEMlK4j7GScRANpGC2FP1fLjHUw1XEIp4jK0EvhBhsDCx3V+bfiLTxQuX9v7+6paA6R/iD6PAjYjQ3wgloOBo21aiZsrvBXN+Ofe98Y5RRLjKheOuFXv5E1z1/ovEMJG8ZpksQ8RwaFFfH8=,iv:e9S8FuKyPEFrL82cHVB30teDAqO81J3thulwCPCF4N8=,tag:1nR4cR82pNkFF5DdG1/XBw==,type:str]
+    secret.yaml: ENC[AES256_GCM,data:EJ8VdyUMt1qjn3dv3DJTqs0glqcfUUyYQV/ewEsAiWXTnq7/Pd4PfTYuJhQQami14uPbEZpsBd+M5mJF+YQsfYyHBhDsubL/0EpLp4XtviY5KgFmdLPVfu8NdV+dVoJHS3oVvCVfe1xBhovYmDcPRcyPEmzO4yqM9NkzZcA=,iv:1oarsP0ox+srmeJnPHg+0ENDTgNQIZGtOrG1Ki49ldo=,tag:dipuV7AvuqHyNeRS1y/jPA==,type:str]
 sops:
     age:
         - recipient: age1tu4xgfefvgdda0vn2thaqndq4p9tuydq2ud6qa98tzzgnff6749qnlcx29
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFaFhhRkZ0aHVhdk4rZWs5
-            WU1IOHQ5Si9zK3lzaE5ML2g4ODBORURReFVnCllTVUdQK2hJaG9rS1RLcmE1MlQy
-            SGV6emRNV0hkbHBROUVjdXJRU2pvWWcKLS0tIDZqSitPUXljV0FrcVhvZ2pUeW9T
-            b1M4K3cwbVE4REtsWERSbUNER2hPREEK75AvGripcluDjiz4w3tBi0+uZYQRgjgx
-            32LfVPuZyUkn19JOyiiOetQd0FWykT+rxxyyjp0ZV0Qk9Q54jTcFxg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByRFVZQUNDWGJmdVA4eDV3
+            NS9peWNsOVB2VE9UZzhTTm9YYzJTSGlTZER3Ck1BNE9aTUpHMTBTV2dPeFcvaGs3
+            aCs5Sk5FVE40WnJQcng4QXFtWHkxZjQKLS0tIEE0UlBPVGdmN1pXaUNrcFlFQlZi
+            U2N6SU5OMzc3MzRuRVpKZmloK2p3dDAKqeuliMTfvcgG19nSXN8fNryhSyMIQRok
+            00pgGmwPq9dpfjStyf7ukzgpL21tyPJFpISAwEbYeLxqCv8b1wxE4Q==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-08-26T10:18:36Z"
-    mac: ENC[AES256_GCM,data:hCBmNfhU3E8lMXL5VRAfKU5ulVqcMajMH7ni71bhqAFB42/EybXDaaK0G9KZNS6PJ5bPMmjrryzaDRQI5aFEnA376qr1IAhwyslGEb2ITMxgy5V2EbusdLbVvqfAUa1J+CtlBQLJxKVQbVRbfegVPUe5L6+xKsg1Wh+1nY6sTuo=,iv:/wNL90o4Q2GzYClfvtepYW3EgekYy9LpOHExAafXy7A=,tag:kiSo86KwKWha0M3hCM8sdQ==,type:str]
+    lastmodified: "2026-08-26T10:18:40Z"
+    mac: ENC[AES256_GCM,data:4uHRAMMgnY0j6GPWBDc4s4jUf8y8orbqpAmx+lvrlnWDiVwQXooOEOBC+sQ69fbYW3qupTVo1kse2aBYBVXWeTrNbLeu4ywgOFdjTXevOzXFTrs2CAJQLD+a5R4NLJZG8Qx0mthEzzxb4Y+jwnIpGZY9PkmRAT9BZZJy7fAze3Y=,iv:xJp97D9yr56NOMd5qNfbXNAHwKYzUIgg3lEEbykkVIQ=,tag:bwNOIa4j+iu4kzniw5/FAA==,type:str]
     encrypted_regex: ^(data|stringData)$
     version: 3.11.0
diff --git a/clusters/base/infra/longhorn/storage-class-longhorn-no-retain/kustomization.yaml b/clusters/base/infra/longhorn/storage-classes/kustomization.yaml
similarity index 72%
rename from clusters/base/infra/longhorn/storage-class-longhorn-no-retain/kustomization.yaml
rename to clusters/base/infra/longhorn/storage-classes/kustomization.yaml
index 23c2e0c..55227d2 100644
--- a/clusters/base/infra/longhorn/storage-class-longhorn-no-retain/kustomization.yaml
+++ b/clusters/base/infra/longhorn/storage-classes/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - storageclass.yaml
+  - longhorn-no-retain.yaml
diff --git a/clusters/base/infra/longhorn/storage-class-longhorn-no-retain/storageclass.yaml b/clusters/base/infra/longhorn/storage-classes/longhorn-no-retain.yaml
similarity index 100%
rename from clusters/base/infra/longhorn/storage-class-longhorn-no-retain/storageclass.yaml
rename to clusters/base/infra/longhorn/storage-classes/longhorn-no-retain.yaml