diff --git a/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml b/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
index 139e20cf2..77df3ea86 100644
--- a/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
+++ b/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
@@ -45,10 +45,10 @@ apiVersion: v1
 metadata:
   name: csi-snapshotter
   labels:
-    app: csi-snapshotter
+    app.kubernetes.io/name: csi-snapshotter
 spec:
   selector:
-    app: csi-snapshotter
+    app.kubernetes.io/name: csi-snapshotter
   ports:
     - name: dummy
       port: 12345
@@ -63,11 +63,11 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-snapshotter
+      app.kubernetes.io/name: csi-snapshotter
   template:
     metadata:
       labels:
-        app: csi-snapshotter
+        app.kubernetes.io/name: csi-snapshotter
     spec:
       serviceAccountName: csi-snapshotter
       containers:
diff --git a/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml b/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
index ed3577be9..d60e13710 100644
--- a/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
+++ b/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
@@ -15,7 +15,7 @@ spec:
   replicas: 2
   selector:
     matchLabels:
-      app: snapshot-controller
+      app.kubernetes.io/name: snapshot-controller
   # the snapshot controller won't be marked as ready if the v1 CRDs are unavailable
   # in #504 the snapshot-controller will exit after around 7.5 seconds if it
   # can't find the v1 CRDs so this value should be greater than that
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       labels:
-        app: snapshot-controller
+        app.kubernetes.io/name: snapshot-controller
     spec:
       serviceAccountName: snapshot-controller
       containers:
diff --git a/deploy/kubernetes/webhook-example/webhook.yaml b/deploy/kubernetes/webhook-example/webhook.yaml
index 45df4af1d..636ea7447 100644
--- a/deploy/kubernetes/webhook-example/webhook.yaml
+++ b/deploy/kubernetes/webhook-example/webhook.yaml
@@ -5,16 +5,16 @@ metadata:
   name: snapshot-validation-deployment
   namespace: default # NOTE: change the namespace
   labels:
-    app: snapshot-validation
+    app.kubernetes.io/name: snapshot-validation
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app: snapshot-validation
+      app.kubernetes.io/name: snapshot-validation
   template:
     metadata:
       labels:
-        app: snapshot-validation
+        app.kubernetes.io/name: snapshot-validation
     spec:
       serviceAccountName: snapshot-webhook
       containers:
@@ -40,7 +40,7 @@ metadata:
   namespace: default # NOTE: change the namespace
 spec:
   selector:
-    app: snapshot-validation
+    app.kubernetes.io/name: snapshot-validation
   ports:
     - protocol: TCP
       port: 443 # Change if needed