diff --git a/deploy/cert-manager-ibm-cis-webhook/templates/apiservice.yaml b/deploy/cert-manager-ibm-cis-webhook/templates/apiservice.yaml
index bcabdd1..49db4c3 100644
--- a/deploy/cert-manager-ibm-cis-webhook/templates/apiservice.yaml
+++ b/deploy/cert-manager-ibm-cis-webhook/templates/apiservice.yaml
@@ -3,7 +3,7 @@ kind: APIService
 metadata:
   name: v1alpha1.{{ .Values.groupName }}
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/deploy/cert-manager-ibm-cis-webhook/templates/deployment.yaml b/deploy/cert-manager-ibm-cis-webhook/templates/deployment.yaml
index 8a262e7..1908b11 100644
--- a/deploy/cert-manager-ibm-cis-webhook/templates/deployment.yaml
+++ b/deploy/cert-manager-ibm-cis-webhook/templates/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -12,14 +12,15 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+      app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+        app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
         release: {{ .Release.Name }}
       annotations:
+        kubectl.kubernetes.io/default-container: {{ .Chart.Name }}
         checksum/secrets: {{ include (print $.Template.BasePath "/secret.yaml") $ | sha256sum }}
 
     spec:
diff --git a/deploy/cert-manager-ibm-cis-webhook/templates/networkpolicies.yaml b/deploy/cert-manager-ibm-cis-webhook/templates/networkpolicies.yaml
index 001bc88..1827743 100644
--- a/deploy/cert-manager-ibm-cis-webhook/templates/networkpolicies.yaml
+++ b/deploy/cert-manager-ibm-cis-webhook/templates/networkpolicies.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   podSelector:
     matchLabels:
-      app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+      app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
   policyTypes:
   - Egress
   egress:
@@ -15,7 +15,7 @@ spec:
     - namespaceSelector: {}
       podSelector:
         matchLabels:
-          k8s-app: kube-dns
+          k8s-app.kubernetes.io/name: kube-dns
     ports:
     - protocol: UDP
       port: 53
diff --git a/deploy/cert-manager-ibm-cis-webhook/templates/pki.yaml b/deploy/cert-manager-ibm-cis-webhook/templates/pki.yaml
index b96c0f5..9981819 100644
--- a/deploy/cert-manager-ibm-cis-webhook/templates/pki.yaml
+++ b/deploy/cert-manager-ibm-cis-webhook/templates/pki.yaml
@@ -7,7 +7,7 @@ metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.selfSignedIssuer" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -23,7 +23,7 @@ metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.rootCACertificate" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -44,7 +44,7 @@ metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.rootCAIssuer" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -61,7 +61,7 @@ metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.servingCertificate" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/deploy/cert-manager-ibm-cis-webhook/templates/rbac.yaml b/deploy/cert-manager-ibm-cis-webhook/templates/rbac.yaml
index 9fdcf9c..9b96a48 100644
--- a/deploy/cert-manager-ibm-cis-webhook/templates/rbac.yaml
+++ b/deploy/cert-manager-ibm-cis-webhook/templates/rbac.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -18,7 +18,7 @@ metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.fullname" . }}:webhook-authentication-reader
   namespace: kube-system
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -39,7 +39,7 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.fullname" . }}:auth-delegator
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -59,7 +59,7 @@ kind: ClusterRole
 metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.fullname" . }}:domain-solver
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -76,7 +76,7 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.fullname" . }}:domain-solver
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/deploy/cert-manager-ibm-cis-webhook/templates/service.yaml b/deploy/cert-manager-ibm-cis-webhook/templates/service.yaml
index 5515ea1..73e4916 100644
--- a/deploy/cert-manager-ibm-cis-webhook/templates/service.yaml
+++ b/deploy/cert-manager-ibm-cis-webhook/templates/service.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "cert-manager-ibm-cis-webhook.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     chart: {{ include "cert-manager-ibm-cis-webhook.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -16,5 +16,5 @@ spec:
       protocol: TCP
       name: https
   selector:
-    app: {{ include "cert-manager-ibm-cis-webhook.name" . }}
+    app.kubernetes.io/name: {{ include "cert-manager-ibm-cis-webhook.name" . }}
     release: {{ .Release.Name }}