diff --git a/charts/home-assistant/Chart.yaml b/charts/home-assistant/Chart.yaml
index 7c35114..b71b077 100644
--- a/charts/home-assistant/Chart.yaml
+++ b/charts/home-assistant/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: home-assistant
-version: 0.0.16
+version: 0.1.0
 description: Chart for Home Assistant
 keywords:
   - home-automation
diff --git a/charts/home-assistant/templates/deployment.yaml b/charts/home-assistant/templates/deployment.yaml
index 6682c6b..dadd0e2 100644
--- a/charts/home-assistant/templates/deployment.yaml
+++ b/charts/home-assistant/templates/deployment.yaml
@@ -4,7 +4,7 @@ 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: web
@@ -16,15 +16,15 @@ spec:
     type: {{ .Values.deployment.strategy }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: home-assistant
+      app.kubernetes.io/name: {{ .Release.Name }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: home-assistant
+        app.kubernetes.io/name: {{ .Release.Name }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
-      serviceAccountName: home-assistant
+      serviceAccountName: {{ .Release.Name }}
       automountServiceAccountToken: true
       containers:
         - name: {{ .Release.Name }}
@@ -95,4 +95,4 @@ spec:
       volumes:
         - name: home-assistant-config
           persistentVolumeClaim:
-            claimName: home-assistant-config
+            claimName: "{{ .Release.Name }}-config"
diff --git a/charts/home-assistant/templates/ingress-route.yaml b/charts/home-assistant/templates/ingress-route.yaml
index c94d1bd..f0a3897 100644
--- a/charts/home-assistant/templates/ingress-route.yaml
+++ b/charts/home-assistant/templates/ingress-route.yaml
@@ -2,35 +2,26 @@
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
-  name: home-assistant
+  name: {{ .Release.Name }}
   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: web
-    app.kubernetes.io/part-of: home-assistant
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   entryPoints:
     - websecure
   routes:
     - kind: Rule
       match: "Host(`{{ .Values.ingressRoute.host }}`)"
-      middlewares:
-        - name: "authentik-{{ .Release.Name }}"
-          namespace: {{ .Release.Namespace }}
       priority: 10
       services:
         - kind: Service
-          name: home-assistant
+          name: {{ .Release.Name }}
           port: {{ .Values.service.http.port }}
-    - kind: Rule
-      match: "Host(`{{ .Values.ingressRoute.host }}`) && PathPrefix(`/outpost.goauthentik.io/`)"
-      priority: 15
-      services:
-        - kind: Service
-          name: {{ .Values.ingressRoute.authentik.outpost }}
-          port: {{ .Values.ingressRoute.authentik.port }}
+
 {{- end }}
 
 ---
@@ -38,23 +29,33 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
-  name: home-assistant-codeserver
+  name: "{{ .Release.Name }}-codeserver"
   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: web
-    app.kubernetes.io/part-of: home-assistant
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   entryPoints:
     - websecure
   routes:
     - kind: Rule
       match: "Host(`{{ .Values.codeserver.ingressRoute.host }}`)"
+      middlewares:
+        - name: "authentik-{{ .Release.Name }}"
+          namespace: {{ .Release.Namespace }}      
       priority: 10
       services:
         - kind: Service
-          name: home-assistant-codeserver
+          name: "{{ .Release.Name }}-codeserver"
           port: {{ .Values.codeserver.service.http.port }}
+    - kind: Rule
+      match: "Host(`{{ .Values.ingressRoute.host }}`) && PathPrefix(`/outpost.goauthentik.io/`)"
+      priority: 15
+      services:
+        - kind: Service
+          name: {{ .Values.ingressRoute.authentik.outpost }}
+          port: {{ .Values.ingressRoute.authentik.port }}          
 {{- end }}
diff --git a/charts/home-assistant/templates/persistant-volume-claim.yaml b/charts/home-assistant/templates/persistant-volume-claim.yaml
index e400e12..3bd781a 100644
--- a/charts/home-assistant/templates/persistant-volume-claim.yaml
+++ b/charts/home-assistant/templates/persistant-volume-claim.yaml
@@ -1,10 +1,10 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: home-assistant-config
+  name: "{{ .Release.Name }}-config"
   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: web
diff --git a/charts/home-assistant/templates/prometheus-rule.yaml b/charts/home-assistant/templates/prometheus-rule.yaml
index a0f9fed..8088d3e 100644
--- a/charts/home-assistant/templates/prometheus-rule.yaml
+++ b/charts/home-assistant/templates/prometheus-rule.yaml
@@ -2,14 +2,14 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: home-assistant
+  name: {{ .Release.Name }}
   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: web
-    app.kubernetes.io/part-of: home-assistant
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   groups:
     - name: {{ .Release.Name }}
diff --git a/charts/home-assistant/templates/service-account.yaml b/charts/home-assistant/templates/service-account.yaml
index 55ba961..a437092 100644
--- a/charts/home-assistant/templates/service-account.yaml
+++ b/charts/home-assistant/templates/service-account.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: home-assistant
+  name: {{ .Release.Name }}
   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: web
-    app.kubernetes.io/part-of: home-assistant
+    app.kubernetes.io/part-of: {{ .Release.Name }}
diff --git a/charts/home-assistant/templates/service-monitor.yaml b/charts/home-assistant/templates/service-monitor.yaml
index 8019d9a..604f0d9 100644
--- a/charts/home-assistant/templates/service-monitor.yaml
+++ b/charts/home-assistant/templates/service-monitor.yaml
@@ -2,18 +2,18 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: home-assistant
+  name: {{ .Release.Name }}
   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: web
-    app.kubernetes.io/part-of: home-assistant
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: home-assistant
+      app.kubernetes.io/name: {{ .Release.Name }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
     - port: http
diff --git a/charts/home-assistant/templates/service.yaml b/charts/home-assistant/templates/service.yaml
index 9c78673..831c486 100644
--- a/charts/home-assistant/templates/service.yaml
+++ b/charts/home-assistant/templates/service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: home-assistant
+  name: {{ .Release.Name }}
   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: web
@@ -17,7 +17,7 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app.kubernetes.io/name: home-assistant
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 
 ---
@@ -25,10 +25,10 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: home-assistant-codeserver
+  name: "{{ .Release.Name }}-codeserver"
   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: web
@@ -41,6 +41,6 @@ spec:
       protocol: TCP
       name: codeserver-http
   selector:
-    app.kubernetes.io/name: home-assistant
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
diff --git a/charts/home-assistant/values.yaml b/charts/home-assistant/values.yaml
index e4a5812..c8e5142 100644
--- a/charts/home-assistant/values.yaml
+++ b/charts/home-assistant/values.yaml
@@ -22,7 +22,7 @@ ingressRoute:
   enabled: true
   host:
   authentik:
-    outpost: authentik-proxy-outpost
+    outpost:
     port: 9000
 metrics:
   enabled: false