diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml
index 1247d6d086..c71df0056b 100644
--- a/stable/kube2iam/Chart.yaml
+++ b/stable/kube2iam/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kube2iam
-version: 1.1.0
+version: 2.0.0
 appVersion: 0.10.7
 description: Provide IAM credentials to pods based on annotations.
 keywords:
diff --git a/stable/kube2iam/templates/_helpers.tpl b/stable/kube2iam/templates/_helpers.tpl
index 42a2e6aaec..d8de027bc8 100644
--- a/stable/kube2iam/templates/_helpers.tpl
+++ b/stable/kube2iam/templates/_helpers.tpl
@@ -18,3 +18,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "kube2iam.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/stable/kube2iam/templates/clusterrole.yaml b/stable/kube2iam/templates/clusterrole.yaml
index 78ea94b221..23542344b6 100644
--- a/stable/kube2iam/templates/clusterrole.yaml
+++ b/stable/kube2iam/templates/clusterrole.yaml
@@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   labels:
-    app: {{ template "kube2iam.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+    helm.sh/chart: {{ template "kube2iam.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   name: {{ template "kube2iam.fullname" . }}
 rules:
   - apiGroups:
diff --git a/stable/kube2iam/templates/clusterrolebinding.yaml b/stable/kube2iam/templates/clusterrolebinding.yaml
index be986d4870..4609fe6ad5 100644
--- a/stable/kube2iam/templates/clusterrolebinding.yaml
+++ b/stable/kube2iam/templates/clusterrolebinding.yaml
@@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app: {{ template "kube2iam.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+    helm.sh/chart: {{ template "kube2iam.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   name: {{ template "kube2iam.fullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/stable/kube2iam/templates/daemonset.yaml b/stable/kube2iam/templates/daemonset.yaml
index 01db927018..996266353b 100644
--- a/stable/kube2iam/templates/daemonset.yaml
+++ b/stable/kube2iam/templates/daemonset.yaml
@@ -2,10 +2,10 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   labels:
-    app: {{ template "kube2iam.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+    helm.sh/chart: {{ template "kube2iam.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   name: {{ template "kube2iam.fullname" . }}
 spec:
   template:
@@ -15,8 +15,8 @@ spec:
 {{ toYaml .Values.podAnnotations | indent 8 }}
     {{- end }}
       labels:
-        app: {{ template "kube2iam.name" . }}
-        release: {{ .Release.Name }}
+        app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
       {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}
       {{- end }}
diff --git a/stable/kube2iam/templates/secret.yaml b/stable/kube2iam/templates/secret.yaml
index 968a1dd146..58c9a36691 100644
--- a/stable/kube2iam/templates/secret.yaml
+++ b/stable/kube2iam/templates/secret.yaml
@@ -3,10 +3,10 @@ apiVersion: v1
 kind: Secret
 metadata:
   labels:
-    app: {{ template "kube2iam.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+    helm.sh/chart: {{ template "kube2iam.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   name: {{ template "kube2iam.fullname" . }}
 type: Opaque
 data:
diff --git a/stable/kube2iam/templates/service.yaml b/stable/kube2iam/templates/service.yaml
index fcc567b709..588ef2cc68 100644
--- a/stable/kube2iam/templates/service.yaml
+++ b/stable/kube2iam/templates/service.yaml
@@ -4,18 +4,18 @@ kind: Service
 metadata:
   name: {{ template "kube2iam.fullname" . }}-metrics
   labels:
-    app: {{ template "kube2iam.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+    helm.sh/chart: {{ template "kube2iam.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   {{- if .Values.prometheus.service.annotations }}
   annotations:
     {{- toYaml .Values.prometheus.service.annotations | nindent 4 }}
   {{- end }}
 spec:
   selector:
-    app: {{ template "kube2iam.name" . }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   ports:
     {{- if .Values.prometheus.metricsPort }}
     - name: metrics
diff --git a/stable/kube2iam/templates/serviceaccount.yaml b/stable/kube2iam/templates/serviceaccount.yaml
index 1920914202..442b2059da 100644
--- a/stable/kube2iam/templates/serviceaccount.yaml
+++ b/stable/kube2iam/templates/serviceaccount.yaml
@@ -3,9 +3,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app: {{ template "kube2iam.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+    helm.sh/chart: {{ template "kube2iam.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   name: {{ template "kube2iam.fullname" . }}
 {{- end -}}
diff --git a/stable/kube2iam/templates/servicemonitor.yaml b/stable/kube2iam/templates/servicemonitor.yaml
index d54c84c4dc..e7d93f5fa5 100644
--- a/stable/kube2iam/templates/servicemonitor.yaml
+++ b/stable/kube2iam/templates/servicemonitor.yaml
@@ -7,15 +7,15 @@ metadata:
   namespace: {{ .Values.prometheus.serviceMonitor.namespace }}
   {{- end }}
   labels:
-    app: {{ template "kube2iam.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+    helm.sh/chart: {{ template "kube2iam.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   selector:
     matchLabels:
-      app: {{ template "kube2iam.name" . }}
-      release: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ template "kube2iam.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}