diff --git a/clusters/cl01tl/applications/eigenfocus/Chart.yaml b/clusters/cl01tl/applications/eigenfocus/Chart.yaml
index f1c346d48..2054f5cc0 100644
--- a/clusters/cl01tl/applications/eigenfocus/Chart.yaml
+++ b/clusters/cl01tl/applications/eigenfocus/Chart.yaml
@@ -16,6 +16,6 @@ dependencies:
   - name: app-template
     alias: eigenfocus
     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/eigenfocus.png
-appVersion: v1.1.0
+appVersion: 1.1.0
diff --git a/clusters/cl01tl/applications/eigenfocus/templates/external-secret.yaml b/clusters/cl01tl/applications/eigenfocus/templates/external-secret.yaml
index 2099f0bd1..3bf576098 100644
--- a/clusters/cl01tl/applications/eigenfocus/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/eigenfocus/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: eigenfocus-data-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: eigenfocus-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/eigenfocus/templates/http-route.yaml b/clusters/cl01tl/applications/eigenfocus/templates/http-route.yaml
index 6924ba336..499f298d5 100644
--- a/clusters/cl01tl/applications/eigenfocus/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/eigenfocus/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-eigenfocus
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-eigenfocus
+    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/eigenfocus/templates/replication-source.yaml b/clusters/cl01tl/applications/eigenfocus/templates/replication-source.yaml
index 85b93b997..9f390742b 100644
--- a/clusters/cl01tl/applications/eigenfocus/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/eigenfocus/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: eigenfocus-data-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: eigenfocus-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: eigenfocus-data
   trigger:
diff --git a/clusters/cl01tl/applications/eigenfocus/values.yaml b/clusters/cl01tl/applications/eigenfocus/values.yaml
index 037c3891c..d347da824 100644
--- a/clusters/cl01tl/applications/eigenfocus/values.yaml
+++ b/clusters/cl01tl/applications/eigenfocus/values.yaml
@@ -18,8 +18,6 @@ eigenfocus:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -30,6 +28,7 @@ eigenfocus:
           protocol: HTTP
   persistence:
     data:
+      forceRename: eigenfocus-data
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 2Gi