diff --git a/clusters/cl01tl/applications/jellystat/Chart.yaml b/clusters/cl01tl/applications/jellystat/Chart.yaml
index 11841dac5..9da3b8d6f 100644
--- a/clusters/cl01tl/applications/jellystat/Chart.yaml
+++ b/clusters/cl01tl/applications/jellystat/Chart.yaml
@@ -18,7 +18,7 @@ dependencies:
   - name: app-template
     alias: jellystat
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
   - name: postgres-cluster
     alias: postgres-17-cluster
     version: 5.1.0
diff --git a/clusters/cl01tl/applications/jellystat/templates/external-secret.yaml b/clusters/cl01tl/applications/jellystat/templates/external-secret.yaml
index 59954e820..8a2fbc76a 100644
--- a/clusters/cl01tl/applications/jellystat/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/jellystat/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: jellystat-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellystat-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
@@ -43,11 +40,8 @@ metadata:
   name: jellystat-data-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellystat-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
@@ -102,11 +96,8 @@ metadata:
   name: jellystat-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellystat-postgresql-17-cluster-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: database
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/applications/jellystat/templates/http-route.yaml b/clusters/cl01tl/applications/jellystat/templates/http-route.yaml
index 11dc51777..96cf6dc7d 100644
--- a/clusters/cl01tl/applications/jellystat/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/jellystat/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-jellystat
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-jellystat
+    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:
   parentRefs:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/applications/jellystat/templates/replication-source.yaml b/clusters/cl01tl/applications/jellystat/templates/replication-source.yaml
index 4c0738600..33bed792a 100644
--- a/clusters/cl01tl/applications/jellystat/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/jellystat/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: jellystat-data-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellystat-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: jellystat-data
   trigger:
diff --git a/clusters/cl01tl/applications/jellystat/values.yaml b/clusters/cl01tl/applications/jellystat/values.yaml
index d6b86b9af..b383b9d3d 100644
--- a/clusters/cl01tl/applications/jellystat/values.yaml
+++ b/clusters/cl01tl/applications/jellystat/values.yaml
@@ -58,8 +58,6 @@ jellystat:
             requests:
               cpu: 10m
               memory: 256Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -70,6 +68,7 @@ jellystat:
           protocol: HTTP
   persistence:
     data:
+      forceRename: jellystat-data
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 5Gi