diff --git a/clusters/cl01tl/applications/home-assistant/Chart.yaml b/clusters/cl01tl/applications/home-assistant/Chart.yaml
index 98566d0d7..27b74e0a5 100644
--- a/clusters/cl01tl/applications/home-assistant/Chart.yaml
+++ b/clusters/cl01tl/applications/home-assistant/Chart.yaml
@@ -18,6 +18,6 @@ dependencies:
   - name: app-template
     alias: home-assistant
     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/home-assistant.png
-appVersion: 2025.5.1
+appVersion: 2025.5.2
diff --git a/clusters/cl01tl/applications/home-assistant/templates/external-secret.yaml b/clusters/cl01tl/applications/home-assistant/templates/external-secret.yaml
index f1b47b4d2..4c07bba49 100644
--- a/clusters/cl01tl/applications/home-assistant/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/home-assistant/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: home-assistant-code-server-password-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: home-assistant-code-server-password-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
@@ -36,11 +33,8 @@ metadata:
   name: home-assistant-token-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: home-assistant-token-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
diff --git a/clusters/cl01tl/applications/home-assistant/templates/http-route.yaml b/clusters/cl01tl/applications/home-assistant/templates/http-route.yaml
index c0bb8e2bf..1dfc1fbc6 100644
--- a/clusters/cl01tl/applications/home-assistant/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/home-assistant/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-home-assistant
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-home-assistant
+    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
@@ -36,11 +33,8 @@ metadata:
   name: http-route-home-assistant-code-server
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-home-assistant-code-server
+    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/home-assistant/templates/service-monitor.yaml b/clusters/cl01tl/applications/home-assistant/templates/service-monitor.yaml
index 095ccb3bc..ab159e15b 100644
--- a/clusters/cl01tl/applications/home-assistant/templates/service-monitor.yaml
+++ b/clusters/cl01tl/applications/home-assistant/templates/service-monitor.yaml
@@ -4,11 +4,8 @@ metadata:
   name: home-assistant
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: home-assistant
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   selector:
     matchLabels:
diff --git a/clusters/cl01tl/applications/home-assistant/values.yaml b/clusters/cl01tl/applications/home-assistant/values.yaml
index b39ecb79f..afd2f1296 100644
--- a/clusters/cl01tl/applications/home-assistant/values.yaml
+++ b/clusters/cl01tl/applications/home-assistant/values.yaml
@@ -16,8 +16,8 @@ home-assistant:
               value: US/Central
           resources:
             requests:
-              cpu: 1
-              memory: 2Gi
+              cpu: 50m
+              memory: 512Mi
         code-server:
           image:
             repository: ghcr.io/linuxserver/code-server
@@ -39,8 +39,6 @@ home-assistant:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -58,6 +56,7 @@ home-assistant:
           protocol: HTTP
   persistence:
     config:
+      forceRename: home-assistant-config
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 5Gi