diff --git a/clusters/cl01tl/applications/hoarder/Chart.yaml b/clusters/cl01tl/applications/hoarder/Chart.yaml
index dfd27e7ec..76d13dd9e 100644
--- a/clusters/cl01tl/applications/hoarder/Chart.yaml
+++ b/clusters/cl01tl/applications/hoarder/Chart.yaml
@@ -21,13 +21,13 @@ dependencies:
   - name: app-template
     alias: hoarder
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
   - name: meilisearch
     version: 0.13.0
     repository: https://meilisearch.github.io/meilisearch-kubernetes
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.14.8
+    version: 1.15.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/webp/karakeep.webp
 appVersion: 0.24.1
diff --git a/clusters/cl01tl/applications/hoarder/templates/external-secret.yaml b/clusters/cl01tl/applications/hoarder/templates/external-secret.yaml
index 02aca78d9..9251ba9f3 100644
--- a/clusters/cl01tl/applications/hoarder/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/hoarder/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: karakeep-key-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: karakeep-key-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -29,11 +26,8 @@ metadata:
   name: karakeep-oidc-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: karakeep-oidc-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -61,11 +55,8 @@ metadata:
   name: karakeep-meilisearch-master-key-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: karakeep-meilisearch-master-key-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: meilisearch
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -86,11 +77,8 @@ metadata:
   name: karakeep-cloudflared-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: karakeep-cloudflared-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -111,11 +99,8 @@ metadata:
   name: hoarder-data-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: hoarder-data-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: backup
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/applications/hoarder/templates/replication-source.yaml b/clusters/cl01tl/applications/hoarder/templates/replication-source.yaml
index 44aa158db..76428eb61 100644
--- a/clusters/cl01tl/applications/hoarder/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/hoarder/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: hoarder-data-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: hoarder-data-backup-source
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: backup
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   sourcePVC: hoarder-data
   trigger:
diff --git a/clusters/cl01tl/applications/hoarder/values.yaml b/clusters/cl01tl/applications/hoarder/values.yaml
index d3c740424..0db8946b6 100644
--- a/clusters/cl01tl/applications/hoarder/values.yaml
+++ b/clusters/cl01tl/applications/hoarder/values.yaml
@@ -80,8 +80,6 @@ hoarder:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -96,6 +94,7 @@ hoarder:
           protocol: HTTP
   persistence:
     data:
+      forceRename: hoarder-data
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 10Gi