diff --git a/stable/kube-ops-view/Chart.yaml b/stable/kube-ops-view/Chart.yaml
index 064c78da85..f92b851d38 100644
--- a/stable/kube-ops-view/Chart.yaml
+++ b/stable/kube-ops-view/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kube-ops-view
-version: 1.1.1
+version: 1.1.2
 appVersion: 19.9.0
 description: Kubernetes Operational View - read-only system dashboard for multiple
   K8s clusters
@@ -15,3 +15,4 @@ sources:
 maintainers:
 - name: hjacobs
   email: henning@jacobs1.de
+engine: gotpl
diff --git a/stable/kube-ops-view/templates/_helpers.tpl b/stable/kube-ops-view/templates/_helpers.tpl
index cc0b2116c3..f2c71898e2 100644
--- a/stable/kube-ops-view/templates/_helpers.tpl
+++ b/stable/kube-ops-view/templates/_helpers.tpl
@@ -9,8 +9,12 @@ Expand the name of the chart.
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
 */}}
 {{- define "kube-ops-view.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
@@ -18,3 +22,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "kube-ops-view.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/stable/kube-ops-view/templates/clusterrole.yaml b/stable/kube-ops-view/templates/clusterrole.yaml
index 80c43e850d..45f5f52fa0 100644
--- a/stable/kube-ops-view/templates/clusterrole.yaml
+++ b/stable/kube-ops-view/templates/clusterrole.yaml
@@ -3,10 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   labels:
-    app: {{ template "kube-ops-view.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
+    helm.sh/chart: {{ include "kube-ops-view.chart" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
   name: {{ template "kube-ops-view.fullname" . }}
 rules:
 - apiGroups: [""]
diff --git a/stable/kube-ops-view/templates/clusterrolebinding.yaml b/stable/kube-ops-view/templates/clusterrolebinding.yaml
index 17fe67d4a1..40571c4633 100644
--- a/stable/kube-ops-view/templates/clusterrolebinding.yaml
+++ b/stable/kube-ops-view/templates/clusterrolebinding.yaml
@@ -3,10 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app: {{ template "kube-ops-view.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
+    helm.sh/chart: {{ include "kube-ops-view.chart" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
   name: {{ template "kube-ops-view.fullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/stable/kube-ops-view/templates/deployment.yaml b/stable/kube-ops-view/templates/deployment.yaml
index d064a10c9b..eb06ec628d 100644
--- a/stable/kube-ops-view/templates/deployment.yaml
+++ b/stable/kube-ops-view/templates/deployment.yaml
@@ -1,15 +1,29 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "kube-ops-view.fullname" . }}
+  name: {{ include "kube-ops-view.name" .}}
   labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
+    helm.sh/chart: {{ include "kube-ops-view.chart" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
+      app.kubernetes.io/part-of: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ template "kube-ops-view.fullname" . }}
+        app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
+        helm.sh/chart: {{ include "kube-ops-view.chart" . }}
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/version: {{ .Chart.AppVersion }}
+        app.kubernetes.io/part-of: {{ .Release.Name }}
         {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}
         {{- end }}
diff --git a/stable/kube-ops-view/templates/ingress.yaml b/stable/kube-ops-view/templates/ingress.yaml
index 5511e0485b..4f3ec22062 100644
--- a/stable/kube-ops-view/templates/ingress.yaml
+++ b/stable/kube-ops-view/templates/ingress.yaml
@@ -4,10 +4,12 @@ kind: Ingress
 metadata:
   name: {{ template "kube-ops-view.fullname" . }}
   labels:
-    app: {{ template "kube-ops-view.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
+    helm.sh/chart: {{ include "kube-ops-view.chart" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- if .Values.ingress.annotations }}
   annotations:
 {{ toYaml .Values.ingress.annotations | indent 4 }}
diff --git a/stable/kube-ops-view/templates/service.yaml b/stable/kube-ops-view/templates/service.yaml
index eaad330528..7485e609d3 100644
--- a/stable/kube-ops-view/templates/service.yaml
+++ b/stable/kube-ops-view/templates/service.yaml
@@ -7,7 +7,12 @@ metadata:
 {{ toYaml .Values.service.annotations | indent 4 }}
 {{- end }}
   labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
+    helm.sh/chart: {{ include "kube-ops-view.chart" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- if .Values.service.labels }}
 {{ toYaml .Values.service.labels | indent 4 }}
 {{- end }}
@@ -18,4 +23,4 @@ spec:
     targetPort: {{ .Values.service.internalPort }}
     protocol: TCP
   selector:
-    app: {{ template "kube-ops-view.fullname" . }}
+    app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
diff --git a/stable/kube-ops-view/templates/serviceaccount.yaml b/stable/kube-ops-view/templates/serviceaccount.yaml
index 016c84541a..5a8d149a20 100644
--- a/stable/kube-ops-view/templates/serviceaccount.yaml
+++ b/stable/kube-ops-view/templates/serviceaccount.yaml
@@ -3,9 +3,11 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app: {{ template "kube-ops-view.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "kube-ops-view.name" . }}
+    helm.sh/chart: {{ include "kube-ops-view.chart" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
   name: {{ template "kube-ops-view.fullname" . }}
 {{- end -}}