diff --git a/homeassistant/Chart.yaml b/homeassistant/Chart.yaml
index a36f7ff..31db69e 100644
--- a/homeassistant/Chart.yaml
+++ b/homeassistant/Chart.yaml
@@ -3,6 +3,9 @@ name: homeassistant
 description: A Helm chart to deploy Home Assistant on Kubernetes
 type: application
 
-version: 1.0.1-release-2026-2-3
+version: 1.0.2-release-2026-2-3
 
 appVersion: "2026.2.3"
+
+maintainers:
+  - name: jklein
\ No newline at end of file
diff --git a/homeassistant/templates/_helpers.tpl b/homeassistant/templates/_helpers.tpl
deleted file mode 100644
index 7090d85..0000000
--- a/homeassistant/templates/_helpers.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-{{- define "homeassistant.release" -}}
-{{- printf "%s-%s" .Release.Name .Chart.Name }}
-{{- end }}
-
diff --git a/homeassistant/templates/homeassistant.ingress.yaml b/homeassistant/templates/homeassistant.ingress.yaml
index dc23b73..7bff858 100644
--- a/homeassistant/templates/homeassistant.ingress.yaml
+++ b/homeassistant/templates/homeassistant.ingress.yaml
@@ -2,9 +2,9 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: "{{ include "homeassistant.release" . }}-ingress"
+  name: "{{ .Release.Name }}-{{ .Chart.Name }}-ingress"
   labels:
-    app: "{{ include "homeassistant.release" . }}"
+    app: "{{ .Release.Name }}-{{ .Chart.Name }}"
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -33,7 +33,7 @@ spec:
             {{- end }}
             backend:
               service:
-                name: "{{ include "homeassistant.release" . }}-service"
+                name: "{{ $.Release.Name }}-{{ $.Chart.Name }}-service"
                 port:
                   name: http
           {{- end }}
diff --git a/homeassistant/templates/homeassistant.service.yaml b/homeassistant/templates/homeassistant.service.yaml
index 81fb0dd..27f9b0a 100644
--- a/homeassistant/templates/homeassistant.service.yaml
+++ b/homeassistant/templates/homeassistant.service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ include "homeassistant.release" . }}-service"
+  name: "{{ .Release.Name }}-{{ .Chart.Name }}-service"
   labels:
-    app: "{{ include "homeassistant.release" . }}"
+    app: "{{ .Release.Name }}-{{ .Chart.Name }}"
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app: "{{ include "homeassistant.release" . }}"
+    app: "{{ .Release.Name }}-{{ .Chart.Name }}"
diff --git a/homeassistant/templates/homeassistant.sfs.yaml b/homeassistant/templates/homeassistant.sfs.yaml
index e57db3d..0e34d70 100644
--- a/homeassistant/templates/homeassistant.sfs.yaml
+++ b/homeassistant/templates/homeassistant.sfs.yaml
@@ -1,21 +1,22 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: "{{ include "homeassistant.release" . }}-sfs"
+  name: "{{ .Release.Name }}-{{ .Chart.Name }}-sfs"
   labels:
-    app: "{{ include "homeassistant.release" . }}"
+    app: "{{ .Release.Name }}-{{ .Chart.Name }}"
 spec:
+  serviceName: "{{ .Release.Name }}-{{ .Chart.Name }}-service"
   replicas: 1
   selector:
     matchLabels:
-      app: "{{ include "homeassistant.release" . }}"
+      app: "{{ .Release.Name }}-{{ .Chart.Name }}"
   template:
     metadata:
-      name: "{{ include "homeassistant.release" . }}-sfs"
+      name: "{{ .Release.Name }}-{{ .Chart.Name }}-sfs"
     spec:
       automountServiceAccountToken: false
       containers:
-        - name: "{{ include "homeassistant.release" . }}"
+        - name: "{{ .Release.Name }}-{{ .Chart.Name }}"
           image: "ghcr.io/home-assistant/home-assistant:{{ .Chart.AppVersion }}"
           imagePullPolicy: IfNotPresent
           ports: