diff --git a/templates/server-config-configmap.yaml b/templates/server-config-configmap.yaml
index 389195a..f2bddaa 100644
--- a/templates/server-config-configmap.yaml
+++ b/templates/server-config-configmap.yaml
@@ -6,10 +6,11 @@ kind: ConfigMap
 metadata:
   name: {{ template "vault.fullname" . }}-config
   labels:
-    app: {{ template "vault.name" . }}
-    chart: {{ template "vault.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    helm.sh/chart: {{ include "vault.chart" . }}
+    app.kubernetes.io/name: {{ include "vault.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.Version | quote }}
 data:
   extraconfig-from-values.hcl: |-
   {{- if eq .mode "standalone" }}
diff --git a/templates/server-disruptionbudget.yaml b/templates/server-disruptionbudget.yaml
index 7dec720..5ff9243 100644
--- a/templates/server-disruptionbudget.yaml
+++ b/templates/server-disruptionbudget.yaml
@@ -7,10 +7,11 @@ kind: PodDisruptionBudget
 metadata:
   name: {{ template "vault.fullname" . }}
   labels:
-    app: {{ template "vault.name" . }}
-    chart: {{ template "vault.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    helm.sh/chart: {{ include "vault.chart" . }}
+    app.kubernetes.io/name: {{ include "vault.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.Version | quote }}
 spec:
   maxUnavailable: {{ template "vault.pdb.maxUnavailable" . }}
   selector:
diff --git a/templates/server-service.yaml b/templates/server-service.yaml
index 3a3279a..7ee7dce 100644
--- a/templates/server-service.yaml
+++ b/templates/server-service.yaml
@@ -9,10 +9,11 @@ kind: Service
 metadata:
   name: {{ template "vault.fullname" . }}
   labels:
-    app: {{ template "vault.name" . }}
-    chart: {{ template "vault.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    helm.sh/chart: {{ include "vault.chart" . }}
+    app.kubernetes.io/name: {{ include "vault.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.Version | quote }}
   annotations:
     # This must be set in addition to publishNotReadyAddresses due
     # to an open issue where it may not work:
diff --git a/templates/server-serviceaccount.yaml b/templates/server-serviceaccount.yaml
index a5a20d8..e1ba42f 100644
--- a/templates/server-serviceaccount.yaml
+++ b/templates/server-serviceaccount.yaml
@@ -6,8 +6,9 @@ metadata:
   name: {{ template "vault.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "vault.name" . }}
-    chart: {{ template "vault.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    helm.sh/chart: {{ include "vault.chart" . }}
+    app.kubernetes.io/name: {{ include "vault.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.Version | quote }}
 {{ end }}
diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
index 160b0a1..5314d0d 100644
--- a/templates/server-statefulset.yaml
+++ b/templates/server-statefulset.yaml
@@ -6,10 +6,11 @@ kind: StatefulSet
 metadata:
   name: {{ template "vault.fullname" . }}
   labels:
-    app: {{ template "vault.name" . }}
-    chart: {{ template "vault.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    helm.sh/chart: {{ include "vault.chart" . }}
+    app.kubernetes.io/name: {{ include "vault.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.Version | quote }}
 spec:
   serviceName: {{ template "vault.fullname" . }}
   podManagementPolicy: Parallel
@@ -18,16 +19,16 @@ spec:
     type: OnDelete
   selector:
     matchLabels:
-      app: {{ template "vault.name" . }}
-      chart: {{ template "vault.chart" . }}
-      release: {{ .Release.Name }}
+      helm.sh/chart: {{ template "vault.chart" . }}
+      app.kubernetes.io/name: {{ template "vault.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       component: server
   template:
     metadata:
       labels:
-        app: {{ template "vault.name" . }}
-        chart: {{ template "vault.chart" . }}
-        release: {{ .Release.Name }}
+        helm.sh/chart: {{ template "vault.chart" . }}
+        app.kubernetes.io/name: {{ template "vault.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
         component: server
       {{ template "vault.annotations" . }}
     spec:
diff --git a/templates/ui-service.yaml b/templates/ui-service.yaml
index 8dfa917..95dc79a 100644
--- a/templates/ui-service.yaml
+++ b/templates/ui-service.yaml
@@ -9,10 +9,11 @@ kind: Service
 metadata:
   name: {{ template "vault.fullname" . }}-ui
   labels:
-    app: {{ template "vault.name" . }}
-    chart: {{ template "vault.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    helm.sh/chart: {{ include "vault.chart" . }}
+    app.kubernetes.io/name: {{ include "vault.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.Version | quote }}
 spec:
   selector:
     app: {{ template "vault.name" . }}
diff --git a/test/acceptance/server-ha.bats b/test/acceptance/server-ha.bats
index 9e54605..30c4e50 100644
--- a/test/acceptance/server-ha.bats
+++ b/test/acceptance/server-ha.bats
@@ -69,7 +69,7 @@ load _helpers
   [ "${token}" != "" ]
 
   # Vault Unseal
-  local pods=($(kubectl get pods --selector='app=vault' -o json | jq -r '.items[].metadata.name'))
+  local pods=($(kubectl get pods --selector='app.kubernetes.io/name=vault' -o json | jq -r '.items[].metadata.name'))
   for pod in "${pods[@]}"
   do  
       kubectl exec -ti ${pod} -- vault operator unseal ${token}