diff --git a/build/dev-env.sh b/build/dev-env.sh
index 1e49f899209e..541c5ca15ed6 100755
--- a/build/dev-env.sh
+++ b/build/dev-env.sh
@@ -52,5 +52,5 @@ echo "updating image..."
 kubectl set image \
     deployments \
     --namespace ingress-nginx \
-    --selector app=ingress-nginx \
+    --selector app.kubernetes.io/name=ingress-nginx \
     nginx-ingress-controller=${DEV_IMAGE}
diff --git a/deploy/default-backend.yaml b/deploy/default-backend.yaml
index a7e28e52fdd5..de14a9f8dc9a 100644
--- a/deploy/default-backend.yaml
+++ b/deploy/default-backend.yaml
@@ -13,10 +13,12 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: default-http-backend
+      app.kubernetes.io/part-of: ingress-nginx
   template:
     metadata:
       labels:
         app.kubernetes.io/name: default-http-backend
+        app.kubernetes.io/part-of: ingress-nginx
     spec:
       terminationGracePeriodSeconds: 60
       containers:
@@ -57,3 +59,4 @@ spec:
     targetPort: 8080
   selector:
     app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
diff --git a/deploy/mandatory.yaml b/deploy/mandatory.yaml
index 61862bfa461f..6906fb9568ed 100644
--- a/deploy/mandatory.yaml
+++ b/deploy/mandatory.yaml
@@ -19,6 +19,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: default-http-backend
+      app.kubernetes.io/part-of: ingress-nginx
   template:
     metadata:
       labels:
@@ -64,6 +65,7 @@ spec:
     targetPort: 8080
   selector:
     app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
 ---
 
 kind: ConfigMap
@@ -259,10 +261,12 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: ingress-nginx
+      app.kubernetes.io/part-of: ingress-nginx
   template:
     metadata:
       labels:
         app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
       annotations:
         prometheus.io/port: '10254'
         prometheus.io/scrape: 'true'
diff --git a/deploy/provider/aws/service-l4.yaml b/deploy/provider/aws/service-l4.yaml
index b3e9664c3691..f63d64203469 100644
--- a/deploy/provider/aws/service-l4.yaml
+++ b/deploy/provider/aws/service-l4.yaml
@@ -15,6 +15,7 @@ spec:
   type: LoadBalancer
   selector:
     app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
   ports:
   - name: http
     port: 80
diff --git a/deploy/provider/aws/service-l7.yaml b/deploy/provider/aws/service-l7.yaml
index 8ea1127377ec..ecc2c95f049d 100644
--- a/deploy/provider/aws/service-l7.yaml
+++ b/deploy/provider/aws/service-l7.yaml
@@ -19,6 +19,7 @@ spec:
   type: LoadBalancer
   selector:
     app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
   ports:
   - name: http
     port: 80
diff --git a/deploy/provider/aws/service-nlb.yaml b/deploy/provider/aws/service-nlb.yaml
index 83e1231562bd..49c6e3cf6146 100644
--- a/deploy/provider/aws/service-nlb.yaml
+++ b/deploy/provider/aws/service-nlb.yaml
@@ -15,6 +15,7 @@ spec:
   type: LoadBalancer
   selector:
     app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
   ports:
   - name: http
     port: 80
diff --git a/deploy/provider/baremetal/service-nodeport.yaml b/deploy/provider/baremetal/service-nodeport.yaml
index 7296ea948aef..a8d0336be44e 100644
--- a/deploy/provider/baremetal/service-nodeport.yaml
+++ b/deploy/provider/baremetal/service-nodeport.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/part-of: ingress-nginx
-
 spec:
   type: NodePort
   ports:
@@ -20,3 +19,4 @@ spec:
     protocol: TCP
   selector:
     app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
diff --git a/deploy/provider/cloud-generic.yaml b/deploy/provider/cloud-generic.yaml
index 53560770ed7f..9261d49a2c21 100644
--- a/deploy/provider/cloud-generic.yaml
+++ b/deploy/provider/cloud-generic.yaml
@@ -11,6 +11,7 @@ spec:
   type: LoadBalancer
   selector:
     app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
   ports:
   - name: http
     port: 80
diff --git a/docs/deploy/index.md b/docs/deploy/index.md
index 321d083cfd1a..a22c05070856 100644
--- a/docs/deploy/index.md
+++ b/docs/deploy/index.md
@@ -138,7 +138,7 @@ kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/mast
 To check if the ingress controller pods have started, run the following command:
 
 ```console
-kubectl get pods --all-namespaces -l app=ingress-nginx --watch
+kubectl get pods --all-namespaces -l app.kubernetes.io/name=ingress-nginx --watch
 ```
 
 Once the operator pods are running, you can cancel the above command by typing `Ctrl+C`.
@@ -150,7 +150,7 @@ To detect which version of the ingress controller is running, exec into the pod
 
 ```console
 POD_NAMESPACE=ingress-nginx
-POD_NAME=$(kubectl get pods -n $POD_NAMESPACE -l app=ingress-nginx -o jsonpath='{.items[0].metadata.name}')
+POD_NAME=$(kubectl get pods -n $POD_NAMESPACE -l app.kubernetes.io/name=ingress-nginx -o jsonpath='{.items[0].metadata.name}')
 kubectl exec -it $POD_NAME -n $POD_NAMESPACE -- /nginx-ingress-controller --version
 ```
 
@@ -172,7 +172,7 @@ helm install stable/nginx-ingress --name my-nginx --set rbac.create=true
 Detect installed version:
 
 ```console
-POD_NAME=$(kubectl get pods -l app=nginx-ingress -o jsonpath='{.items[0].metadata.name}')
+POD_NAME=$(kubectl get pods -l app.kubernetes.io/name=ingress-nginx -o jsonpath='{.items[0].metadata.name}')
 kubectl exec -it $POD_NAME -- /nginx-ingress-controller --version
 ```
 
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index cf3209fe9b4e..68b9b5b60281 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -108,7 +108,7 @@ func (f *Framework) BeforeEach() {
 	Expect(err).NotTo(HaveOccurred())
 
 	err = WaitForPodsReady(f.KubeClientSet, 5*time.Minute, 1, f.IngressController.Namespace, metav1.ListOptions{
-		LabelSelector: "app=ingress-nginx",
+		LabelSelector: "app.kubernetes.io/name=ingress-nginx",
 	})
 	Expect(err).NotTo(HaveOccurred())
 
@@ -200,7 +200,7 @@ func (f *Framework) WaitForNginxConfiguration(matcher func(cfg string) bool) err
 // NginxLogs returns the logs of the nginx ingress controller pod running
 func (f *Framework) NginxLogs() (string, error) {
 	l, err := f.KubeClientSet.CoreV1().Pods(f.IngressController.Namespace).List(metav1.ListOptions{
-		LabelSelector: "app=ingress-nginx",
+		LabelSelector: "app.kubernetes.io/name=ingress-nginx",
 	})
 	if err != nil {
 		return "", err
@@ -220,7 +220,7 @@ func (f *Framework) NginxLogs() (string, error) {
 func (f *Framework) matchNginxConditions(name string, matcher func(cfg string) bool) wait.ConditionFunc {
 	return func() (bool, error) {
 		l, err := f.KubeClientSet.CoreV1().Pods(f.IngressController.Namespace).List(metav1.ListOptions{
-			LabelSelector: "app=ingress-nginx",
+			LabelSelector: "app.kubernetes.io/name=ingress-nginx",
 		})
 		if err != nil {
 			return false, err
diff --git a/test/e2e/wait-for-nginx.sh b/test/e2e/wait-for-nginx.sh
index 9293fbb3cc36..360a7986dab0 100755
--- a/test/e2e/wait-for-nginx.sh
+++ b/test/e2e/wait-for-nginx.sh
@@ -28,7 +28,7 @@ function on_exit {
     test $error_code == 0 && return;
 
     echo "Obtaining ingress controller pod logs..."
-    kubectl logs -l app=ingress-nginx -n $NAMESPACE
+    kubectl logs -l app.kubernetes.io/name=ingress-nginx -n $NAMESPACE
 }
 trap on_exit EXIT