diff --git a/stable/home-assistant/Chart.yaml b/stable/home-assistant/Chart.yaml
index 6c4305ea93..159d87ff08 100644
--- a/stable/home-assistant/Chart.yaml
+++ b/stable/home-assistant/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: 0.84.6
+appVersion: 0.89.1
 description: Home Assistant
 name: home-assistant
-version: 0.5.2
+version: 0.6.0
 keywords:
 - home-assistant
 - hass
diff --git a/stable/home-assistant/README.md b/stable/home-assistant/README.md
index 46b9f5f966..1a612dbe2c 100644
--- a/stable/home-assistant/README.md
+++ b/stable/home-assistant/README.md
@@ -39,6 +39,7 @@ The following tables lists the configurable parameters of the Home Assistant cha
 | `image.tag`                | Image tag. Possible values listed [here](https://hub.docker.com/r/homeassistant/home-assistant/tags/).| `0.84.6`|
 | `image.pullPolicy`         | Image pull policy | `IfNotPresent` |
 | `image.pullSecrets`        | Secrets to use when pulling the image | `[]` |
+| `strategyType`             | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
 | `service.type`             | Kubernetes service type for the home-assistant GUI | `ClusterIP` |
 | `service.port`             | Kubernetes port where the home-assistant GUI is exposed| `8123` |
 | `service.annotations`      | Service annotations for the home-assistant GUI | `{}` |
@@ -80,7 +81,6 @@ The following tables lists the configurable parameters of the Home Assistant cha
 | `configurator.nodeSelector`             | Node labels for pod assignment for the configurator UI | `{}` |
 | `configurator.schedulerName`            | Use an alternate scheduler, e.g. "stork" for the configurator UI | `` |
 | `configurator.podAnnotations`           | Affinity settings for pod assignment for the configurator UI | `{}` |
-| `configurator.replicaCount`             | Number of replicas for the configurator UI | `1` |
 | `configurator.resources`                | CPU/Memory resource requests/limits for the configurator UI | `{}` |
 | `configurator.securityContext`          | Security context to be added to hass-configurator pods for the configurator UI | `{}` |
 | `configurator.service.type`             | Kubernetes service type for the configurator UI | `ClusterIP` |
diff --git a/stable/home-assistant/templates/configurator-ingress.yaml b/stable/home-assistant/templates/configurator-ingress.yaml
index 6f67bce15c..86c8a31509 100644
--- a/stable/home-assistant/templates/configurator-ingress.yaml
+++ b/stable/home-assistant/templates/configurator-ingress.yaml
@@ -2,15 +2,15 @@
 {{- $fullName := include "home-assistant.fullname" . -}}
 {{- $servicePort := .Values.configurator.service.port -}}
 {{- $ingressPath := .Values.configurator.ingress.path -}}
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-configurator
   labels:
-    app: {{ template "home-assistant.name" . }}
-    chart: {{ template "home-assistant.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "home-assistant.name" . }}
+    helm.sh/chart: {{ include "home-assistant.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- with .Values.configurator.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/stable/home-assistant/templates/deployment.yaml b/stable/home-assistant/templates/deployment.yaml
index def1c0626e..aa356d53b9 100644
--- a/stable/home-assistant/templates/deployment.yaml
+++ b/stable/home-assistant/templates/deployment.yaml
@@ -1,14 +1,16 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "home-assistant.fullname" . }}
   labels:
-    app: {{ template "home-assistant.name" . }}
-    chart: {{ template "home-assistant.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "home-assistant.name" . }}
+    helm.sh/chart: {{ include "home-assistant.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: 1
+  strategy:
+    type: {{ .Values.strategyType }}
   selector:
     matchLabels:
       app: {{ template "home-assistant.name" . }}
diff --git a/stable/home-assistant/templates/ingress.yaml b/stable/home-assistant/templates/ingress.yaml
index 936d8a6386..d2125f0b78 100644
--- a/stable/home-assistant/templates/ingress.yaml
+++ b/stable/home-assistant/templates/ingress.yaml
@@ -7,10 +7,10 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    app: {{ template "home-assistant.name" . }}
-    chart: {{ template "home-assistant.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "home-assistant.name" . }}
+    helm.sh/chart: {{ include "home-assistant.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- with .Values.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/stable/home-assistant/templates/secret.yaml b/stable/home-assistant/templates/secret.yaml
index a48f055e80..30644df79c 100644
--- a/stable/home-assistant/templates/secret.yaml
+++ b/stable/home-assistant/templates/secret.yaml
@@ -4,10 +4,10 @@ kind: Secret
 metadata:
   name: {{ template "home-assistant.fullname" . }}-configurator
   labels:
-    app: {{ template "home-assistant.name" . }}
-    chart: {{ template "home-assistant.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "home-assistant.name" . }}
+    helm.sh/chart: {{ include "home-assistant.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:
   {{- if .Values.configurator.hassApiPassword }}
diff --git a/stable/home-assistant/templates/service.yaml b/stable/home-assistant/templates/service.yaml
index 9d372a57a9..e34af3c053 100644
--- a/stable/home-assistant/templates/service.yaml
+++ b/stable/home-assistant/templates/service.yaml
@@ -3,10 +3,10 @@ kind: Service
 metadata:
   name: {{ template "home-assistant.fullname" . }}
   labels:
-    app: {{ template "home-assistant.name" . }}
-    chart: {{ template "home-assistant.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "home-assistant.name" . }}
+    helm.sh/chart: {{ include "home-assistant.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Values.service.labels }}
 {{ toYaml .Values.service.labels | indent 4 }}
 {{- end }}
@@ -54,5 +54,5 @@ spec:
 {{ end }}
 {{- end }}
   selector:
-    app: {{ template "home-assistant.name" . }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "home-assistant.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/stable/home-assistant/values.yaml b/stable/home-assistant/values.yaml
index 316f1a7235..2a95fb7ef9 100644
--- a/stable/home-assistant/values.yaml
+++ b/stable/home-assistant/values.yaml
@@ -2,14 +2,15 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-replicaCount: 1
-
 image:
   repository: homeassistant/home-assistant
-  tag: 0.84.6
+  tag: 0.89.1
   pullPolicy: IfNotPresent
   pullSecrets: []
 
+# upgrade strategy type (e.g. Recreate or RollingUpdate)
+strategyType: Recreate
+
 service:
   type: ClusterIP
   port: 8123