diff --git a/clusters/cl01tl/applications/jellyfin/Chart.yaml b/clusters/cl01tl/applications/jellyfin/Chart.yaml
index 6c20a9c2b..40b3fd222 100644
--- a/clusters/cl01tl/applications/jellyfin/Chart.yaml
+++ b/clusters/cl01tl/applications/jellyfin/Chart.yaml
@@ -20,6 +20,6 @@ dependencies:
   - name: app-template
     alias: jellyfin
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/jellyfin.png
 appVersion: 10.10.7
diff --git a/clusters/cl01tl/applications/jellyfin/templates/external-secret.yaml b/clusters/cl01tl/applications/jellyfin/templates/external-secret.yaml
index 294abb1a5..39275c7bd 100644
--- a/clusters/cl01tl/applications/jellyfin/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/jellyfin/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: jellyfin-config-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellyfin-config-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/jellyfin/templates/http-route.yaml b/clusters/cl01tl/applications/jellyfin/templates/http-route.yaml
index ca973b600..27b5ac3b1 100644
--- a/clusters/cl01tl/applications/jellyfin/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/jellyfin/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-jellyfin
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-jellyfin
+    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/jellyfin/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/jellyfin/templates/persistent-volume-claim.yaml
index fa5cd762f..b28ef678b 100644
--- a/clusters/cl01tl/applications/jellyfin/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/jellyfin/templates/persistent-volume-claim.yaml
@@ -4,11 +4,8 @@ metadata:
   name: jellyfin-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellyfin-nfs-storage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   volumeName: jellyfin-nfs-storage
   storageClassName: nfs-client
@@ -25,11 +22,8 @@ metadata:
   name: jellyfin-youtube-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellyfin-youtube-nfs-storage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   volumeName: jellyfin-youtube-nfs-storage
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/applications/jellyfin/templates/persistent-volume.yaml b/clusters/cl01tl/applications/jellyfin/templates/persistent-volume.yaml
index aa051e830..65f53a356 100644
--- a/clusters/cl01tl/applications/jellyfin/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/jellyfin/templates/persistent-volume.yaml
@@ -4,11 +4,8 @@ metadata:
   name: jellyfin-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellyfin-nfs-storage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -31,11 +28,8 @@ metadata:
   name: jellyfin-youtube-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellyfin-youtube-nfs-storage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/applications/jellyfin/templates/replication-source.yaml b/clusters/cl01tl/applications/jellyfin/templates/replication-source.yaml
index 665b265fc..16ba7db00 100644
--- a/clusters/cl01tl/applications/jellyfin/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/jellyfin/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: jellyfin-config-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: jellyfin-config-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: jellyfin-config
   trigger:
diff --git a/clusters/cl01tl/applications/jellyfin/values.yaml b/clusters/cl01tl/applications/jellyfin/values.yaml
index d258e3c3d..688f87577 100644
--- a/clusters/cl01tl/applications/jellyfin/values.yaml
+++ b/clusters/cl01tl/applications/jellyfin/values.yaml
@@ -25,8 +25,6 @@ jellyfin:
               gpu.intel.com/i915: 1
               cpu: 1
               memory: 2Gi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -37,6 +35,7 @@ jellyfin:
           protocol: HTTP
   persistence:
     config:
+      forceRename: jellyfin-config
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 100Gi