diff --git a/cluster/charts/rook-ceph-cluster/templates/deployment.yaml b/cluster/charts/rook-ceph-cluster/templates/deployment.yaml
index 7e99948b293d9..73c5cf24ef08b 100644
--- a/cluster/charts/rook-ceph-cluster/templates/deployment.yaml
+++ b/cluster/charts/rook-ceph-cluster/templates/deployment.yaml
@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   name: rook-ceph-tools
   labels:
-    app: rook-ceph-tools
+    app.kubernetes.io/app: rook-ceph-tools
 spec:
   replicas: 1
   selector:
@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       labels:
-        app: rook-ceph-tools
+        app.kubernetes.io/app: rook-ceph-tools
     spec:
       dnsPolicy: ClusterFirstWithHostNet
 {{- $network := .Values.cephClusterSpec.network | default dict -}}
diff --git a/cluster/charts/rook-ceph/templates/clusterrole.yaml b/cluster/charts/rook-ceph/templates/clusterrole.yaml
index d9565da51fbf9..32955e04f1ae5 100644
--- a/cluster/charts/rook-ceph/templates/clusterrole.yaml
+++ b/cluster/charts/rook-ceph/templates/clusterrole.yaml
@@ -4,8 +4,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-system
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
   # Most resources are represented by a string representation of their name, such as “pods”, just as it appears in the URL for the relevant API endpoint.
   # However, some Kubernetes APIs involve a “subresource”, such as the logs for a pod. [...]
@@ -24,8 +24,8 @@ kind: ClusterRole
 metadata:
   name: rook-ceph-cluster-mgmt
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
 - apiGroups:
   - ""
@@ -54,8 +54,8 @@ kind: ClusterRole
 metadata:
   name: rook-ceph-global
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
 - apiGroups:
   - ""
@@ -174,8 +174,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-mgr-cluster
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
 - apiGroups:
   - ""
@@ -227,8 +227,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-object-bucket
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
 - apiGroups:
   - ""
@@ -272,8 +272,8 @@ kind: ClusterRole
 metadata:
   name: rook-ceph-agent-mount
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
 - apiGroups:
   - ""
@@ -458,8 +458,8 @@ kind: ClusterRole
 metadata:
   name: 'psp:rook'
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 rules:
 - apiGroups:
diff --git a/cluster/charts/rook-ceph/templates/clusterrolebinding.yaml b/cluster/charts/rook-ceph/templates/clusterrolebinding.yaml
index d3c22ca74c696..4a3e3081f0955 100644
--- a/cluster/charts/rook-ceph/templates/clusterrolebinding.yaml
+++ b/cluster/charts/rook-ceph/templates/clusterrolebinding.yaml
@@ -4,8 +4,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-system
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -21,8 +21,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-global
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -120,8 +120,8 @@ kind: ClusterRoleBinding
 metadata:
   name: rook-ceph-system-psp
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -138,8 +138,8 @@ metadata:
   name: rook-ceph-default-psp
   namespace: {{ .Release.Namespace }}
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -155,8 +155,8 @@ kind: ClusterRoleBinding
 metadata:
   name: rook-ceph-system-psp-users
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/cluster/charts/rook-ceph/templates/deployment.yaml b/cluster/charts/rook-ceph/templates/deployment.yaml
index 7efb599ebe433..b15090e6e441b 100644
--- a/cluster/charts/rook-ceph/templates/deployment.yaml
+++ b/cluster/charts/rook-ceph/templates/deployment.yaml
@@ -3,8 +3,8 @@ kind: Deployment
 metadata:
   name: rook-ceph-operator
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 1
@@ -14,8 +14,8 @@ spec:
   template:
     metadata:
       labels:
-        app: rook-ceph-operator
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+        app.kubernetes.io/app: rook-ceph-operator
+        app.kubernetes.io/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{- if .Values.annotations }}
       annotations:
 {{ toYaml .Values.annotations | indent 8 }}
diff --git a/cluster/charts/rook-ceph/templates/role.yaml b/cluster/charts/rook-ceph/templates/role.yaml
index 70f899c5dc40d..2b22c19dfe83b 100644
--- a/cluster/charts/rook-ceph/templates/role.yaml
+++ b/cluster/charts/rook-ceph/templates/role.yaml
@@ -6,8 +6,8 @@ metadata:
   name: rook-ceph-system
   namespace:  {{  .Release.Namespace }}
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
 - apiGroups:
   - ""
diff --git a/cluster/charts/rook-ceph/templates/rolebinding.yaml b/cluster/charts/rook-ceph/templates/rolebinding.yaml
index aeda4636ad7be..0f1caabb0dbba 100644
--- a/cluster/charts/rook-ceph/templates/rolebinding.yaml
+++ b/cluster/charts/rook-ceph/templates/rolebinding.yaml
@@ -6,8 +6,8 @@ metadata:
   name: rook-ceph-system
   namespace: {{ .Release.Namespace }}
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/cluster/charts/rook-ceph/templates/serviceaccount.yaml b/cluster/charts/rook-ceph/templates/serviceaccount.yaml
index f9317cb0a8962..a9d6e9b3e138b 100644
--- a/cluster/charts/rook-ceph/templates/serviceaccount.yaml
+++ b/cluster/charts/rook-ceph/templates/serviceaccount.yaml
@@ -5,8 +5,8 @@ metadata:
   name: rook-ceph-system
   namespace:  {{  .Release.Namespace }}
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{ template "imagePullSecrets" . }}
 ---
@@ -17,8 +17,8 @@ metadata:
   name: rook-ceph-osd
   namespace:  {{  .Release.Namespace }}
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{ template "imagePullSecrets" . }}
 ---
@@ -29,8 +29,8 @@ metadata:
   name: rook-ceph-mgr
   namespace:  {{  .Release.Namespace }}
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{ template "imagePullSecrets" . }}
 ---
@@ -40,8 +40,8 @@ metadata:
   name: rook-ceph-cmd-reporter
   namespace:  {{  .Release.Namespace }}
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{ template "imagePullSecrets" . }}
 ---
diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml
index 15ee9a612b955..d6d501c8e4170 100644
--- a/cluster/examples/kubernetes/ceph/common.yaml
+++ b/cluster/examples/kubernetes/ceph/common.yaml
@@ -38,8 +38,8 @@ kind: ClusterRole
 metadata:
   name: rook-ceph-cluster-mgmt
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
   - apiGroups:
       - ""
@@ -67,8 +67,8 @@ kind: ClusterRole
 metadata:
   name: rook-ceph-system
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
     # Most resources are represented by a string representation of their name, such as “pods”, just as it appears in the URL for the relevant API endpoint.
     # However, some Kubernetes APIs involve a “subresource”, such as the logs for a pod. [...]
@@ -88,8 +88,8 @@ metadata:
   name: rook-ceph-system
   namespace: rook-ceph # namespace:operator
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
   - apiGroups:
       - ""
@@ -132,8 +132,8 @@ kind: ClusterRole
 metadata:
   name: rook-ceph-global
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
   - apiGroups:
       - ""
@@ -252,8 +252,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-mgr-cluster
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
   - apiGroups:
       - ""
@@ -290,8 +290,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-object-bucket
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 rules:
   - apiGroups:
       - ""
@@ -324,8 +324,8 @@ metadata:
   name: rook-ceph-system
   namespace: rook-ceph # namespace:operator
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 # imagePullSecrets:
 # - name: my-registry-secret
 
@@ -339,8 +339,8 @@ metadata:
   name: rook-ceph-system
   namespace: rook-ceph # namespace:operator
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -355,8 +355,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-system
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -372,8 +372,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-global
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/cluster/examples/kubernetes/ceph/csi/cephfs/kube-registry.yaml b/cluster/examples/kubernetes/ceph/csi/cephfs/kube-registry.yaml
index 22ca0df821cd4..c43e0ae30c876 100644
--- a/cluster/examples/kubernetes/ceph/csi/cephfs/kube-registry.yaml
+++ b/cluster/examples/kubernetes/ceph/csi/cephfs/kube-registry.yaml
@@ -17,8 +17,8 @@ metadata:
   name: kube-registry
   namespace: kube-system
   labels:
-    k8s-app: kube-registry
-    kubernetes.io/cluster-service: "true"
+    app.kubernetes.io/k8s-app: kube-registry
+    app.kubernetes.io/cluster-service: "true"
 spec:
   replicas: 3
   selector:
@@ -27,8 +27,8 @@ spec:
   template:
     metadata:
       labels:
-        k8s-app: kube-registry
-        kubernetes.io/cluster-service: "true"
+        app.kubernetes.io/k8s-app: kube-registry
+        app.kubernetes.io/cluster-service: "true"
     spec:
       containers:
         - name: registry
diff --git a/cluster/examples/kubernetes/ceph/dashboard-external-http.yaml b/cluster/examples/kubernetes/ceph/dashboard-external-http.yaml
index 27fc598660f5c..dc464d90e47a0 100644
--- a/cluster/examples/kubernetes/ceph/dashboard-external-http.yaml
+++ b/cluster/examples/kubernetes/ceph/dashboard-external-http.yaml
@@ -4,8 +4,8 @@ metadata:
   name: rook-ceph-mgr-dashboard-external-http
   namespace: rook-ceph # namespace:cluster
   labels:
-    app: rook-ceph-mgr
-    rook_cluster: rook-ceph # namespace:cluster
+    app.kubernetes.io/app: rook-ceph-mgr
+    app.kubernetes.io/rook_cluster: rook-ceph # namespace:cluster
 spec:
   ports:
     - name: dashboard
diff --git a/cluster/examples/kubernetes/ceph/dashboard-external-https.yaml b/cluster/examples/kubernetes/ceph/dashboard-external-https.yaml
index 9d30fadcae993..e2720ab6e6e66 100644
--- a/cluster/examples/kubernetes/ceph/dashboard-external-https.yaml
+++ b/cluster/examples/kubernetes/ceph/dashboard-external-https.yaml
@@ -4,8 +4,8 @@ metadata:
   name: rook-ceph-mgr-dashboard-external-https
   namespace: rook-ceph # namespace:cluster
   labels:
-    app: rook-ceph-mgr
-    rook_cluster: rook-ceph # namespace:cluster
+    app.kubernetes.io/app: rook-ceph-mgr
+    app.kubernetes.io/rook_cluster: rook-ceph # namespace:cluster
 spec:
   ports:
     - name: dashboard
diff --git a/cluster/examples/kubernetes/ceph/dashboard-loadbalancer.yaml b/cluster/examples/kubernetes/ceph/dashboard-loadbalancer.yaml
index 98c0b9075ea37..d07b253b24996 100644
--- a/cluster/examples/kubernetes/ceph/dashboard-loadbalancer.yaml
+++ b/cluster/examples/kubernetes/ceph/dashboard-loadbalancer.yaml
@@ -4,8 +4,8 @@ metadata:
   name: rook-ceph-mgr-dashboard-loadbalancer
   namespace: rook-ceph # namespace:cluster
   labels:
-    app: rook-ceph-mgr
-    rook_cluster: rook-ceph # namespace:cluster
+    app.kubernetes.io/app: rook-ceph-mgr
+    app.kubernetes.io/rook_cluster: rook-ceph # namespace:cluster
 spec:
   ports:
     - name: dashboard
diff --git a/cluster/examples/kubernetes/ceph/direct-mount.yaml b/cluster/examples/kubernetes/ceph/direct-mount.yaml
index ad0af7779ef8e..97ba06789c717 100644
--- a/cluster/examples/kubernetes/ceph/direct-mount.yaml
+++ b/cluster/examples/kubernetes/ceph/direct-mount.yaml
@@ -4,7 +4,7 @@ metadata:
   name: rook-direct-mount
   namespace: rook-ceph # namespace:cluster
   labels:
-    app: rook-direct-mount
+    app.kubernetes.io/app: rook-direct-mount
 spec:
   replicas: 1
   selector:
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       labels:
-        app: rook-direct-mount
+        app.kubernetes.io/app: rook-direct-mount
     spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
diff --git a/cluster/examples/kubernetes/ceph/flex/kube-registry.yaml b/cluster/examples/kubernetes/ceph/flex/kube-registry.yaml
index 344fefe73b081..c556050190ee3 100644
--- a/cluster/examples/kubernetes/ceph/flex/kube-registry.yaml
+++ b/cluster/examples/kubernetes/ceph/flex/kube-registry.yaml
@@ -4,8 +4,8 @@ metadata:
   name: kube-registry
   namespace: kube-system
   labels:
-    k8s-app: kube-registry
-    kubernetes.io/cluster-service: "true"
+    app.kubernetes.io/k8s-app: kube-registry
+    app.kubernetes.io/cluster-service: "true"
 spec:
   replicas: 3
   selector:
@@ -14,8 +14,8 @@ spec:
   template:
     metadata:
       labels:
-        k8s-app: kube-registry
-        kubernetes.io/cluster-service: "true"
+        app.kubernetes.io/k8s-app: kube-registry
+        app.kubernetes.io/cluster-service: "true"
     spec:
       containers:
         - name: registry
diff --git a/cluster/examples/kubernetes/ceph/monitoring/csi-metrics-service-monitor.yaml b/cluster/examples/kubernetes/ceph/monitoring/csi-metrics-service-monitor.yaml
index ba43fbd2c7644..dd480db36081a 100644
--- a/cluster/examples/kubernetes/ceph/monitoring/csi-metrics-service-monitor.yaml
+++ b/cluster/examples/kubernetes/ceph/monitoring/csi-metrics-service-monitor.yaml
@@ -5,7 +5,7 @@ metadata:
   name: csi-metrics
   namespace: rook-ceph
   labels:
-    team: rook
+    app.kubernetes.io/team: rook
 spec:
   namespaceSelector:
     matchNames:
diff --git a/cluster/examples/kubernetes/ceph/operator-openshift.yaml b/cluster/examples/kubernetes/ceph/operator-openshift.yaml
index 930554d0f5af0..3aba4a045afa4 100644
--- a/cluster/examples/kubernetes/ceph/operator-openshift.yaml
+++ b/cluster/examples/kubernetes/ceph/operator-openshift.yaml
@@ -414,8 +414,8 @@ metadata:
   name: rook-ceph-operator
   namespace: rook-ceph # namespace:operator
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 spec:
   selector:
     matchLabels:
@@ -424,7 +424,7 @@ spec:
   template:
     metadata:
       labels:
-        app: rook-ceph-operator
+        app.kubernetes.io/app: rook-ceph-operator
     spec:
       serviceAccountName: rook-ceph-system
       containers:
diff --git a/cluster/examples/kubernetes/ceph/operator.yaml b/cluster/examples/kubernetes/ceph/operator.yaml
index 0a3d70594898f..e01575e9e40fb 100644
--- a/cluster/examples/kubernetes/ceph/operator.yaml
+++ b/cluster/examples/kubernetes/ceph/operator.yaml
@@ -337,8 +337,8 @@ metadata:
   name: rook-ceph-operator
   namespace: rook-ceph # namespace:operator
   labels:
-    operator: rook
-    storage-backend: ceph
+    app.kubernetes.io/operator: rook
+    app.kubernetes.io/storage-backend: ceph
 spec:
   selector:
     matchLabels:
@@ -347,7 +347,7 @@ spec:
   template:
     metadata:
       labels:
-        app: rook-ceph-operator
+        app.kubernetes.io/app: rook-ceph-operator
     spec:
       serviceAccountName: rook-ceph-system
       containers:
diff --git a/cluster/examples/kubernetes/ceph/osd-purge.yaml b/cluster/examples/kubernetes/ceph/osd-purge.yaml
index 3acc2405b752b..ea0531f28e747 100644
--- a/cluster/examples/kubernetes/ceph/osd-purge.yaml
+++ b/cluster/examples/kubernetes/ceph/osd-purge.yaml
@@ -18,7 +18,7 @@ metadata:
   name: rook-ceph-purge-osd
   namespace: rook-ceph # namespace:operator
   labels:
-    app: rook-ceph-purge-osd
+    app.kubernetes.io/app: rook-ceph-purge-osd
 spec:
   template:
     spec:
diff --git a/cluster/examples/kubernetes/ceph/rgw-external.yaml b/cluster/examples/kubernetes/ceph/rgw-external.yaml
index 8897c0fd65894..687dfb44cd73d 100644
--- a/cluster/examples/kubernetes/ceph/rgw-external.yaml
+++ b/cluster/examples/kubernetes/ceph/rgw-external.yaml
@@ -4,9 +4,9 @@ metadata:
   name: rook-ceph-rgw-my-store-external
   namespace: rook-ceph # namespace:cluster
   labels:
-    app: rook-ceph-rgw
-    rook_cluster: rook-ceph # namespace:cluster
-    rook_object_store: my-store
+    app.kubernetes.io/app: rook-ceph-rgw
+    app.kubernetes.io/rook_cluster: rook-ceph # namespace:cluster
+    app.kubernetes.io/rook_object_store: my-store
 spec:
   ports:
     - name: rgw
diff --git a/cluster/examples/kubernetes/ceph/toolbox-job.yaml b/cluster/examples/kubernetes/ceph/toolbox-job.yaml
index 3fee97919082c..ef63642d86909 100644
--- a/cluster/examples/kubernetes/ceph/toolbox-job.yaml
+++ b/cluster/examples/kubernetes/ceph/toolbox-job.yaml
@@ -4,7 +4,7 @@ metadata:
   name: rook-ceph-toolbox-job
   namespace: rook-ceph # namespace:cluster
   labels:
-    app: ceph-toolbox-job
+    app.kubernetes.io/app: ceph-toolbox-job
 spec:
   template:
     spec:
diff --git a/cluster/examples/kubernetes/ceph/toolbox.yaml b/cluster/examples/kubernetes/ceph/toolbox.yaml
index 28edc958b4bf7..d463874cf40cb 100644
--- a/cluster/examples/kubernetes/ceph/toolbox.yaml
+++ b/cluster/examples/kubernetes/ceph/toolbox.yaml
@@ -4,7 +4,7 @@ metadata:
   name: rook-ceph-tools
   namespace: rook-ceph # namespace:cluster
   labels:
-    app: rook-ceph-tools
+    app.kubernetes.io/app: rook-ceph-tools
 spec:
   replicas: 1
   selector:
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       labels:
-        app: rook-ceph-tools
+        app.kubernetes.io/app: rook-ceph-tools
     spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
diff --git a/cluster/examples/kubernetes/mysql.yaml b/cluster/examples/kubernetes/mysql.yaml
index c3ac4ce1f972e..09d35980a5523 100644
--- a/cluster/examples/kubernetes/mysql.yaml
+++ b/cluster/examples/kubernetes/mysql.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: wordpress-mysql
   labels:
-    app: wordpress
+    app.kubernetes.io/app: wordpress
 spec:
   ports:
     - port: 3306
@@ -17,7 +17,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: mysql-pv-claim
   labels:
-    app: wordpress
+    app.kubernetes.io/app: wordpress
 spec:
   storageClassName: rook-ceph-block
   accessModes:
@@ -31,8 +31,8 @@ kind: Deployment
 metadata:
   name: wordpress-mysql
   labels:
-    app: wordpress
-    tier: mysql
+    app.kubernetes.io/app: wordpress
+    app.kubernetes.io/tier: mysql
 spec:
   selector:
     matchLabels:
@@ -43,8 +43,8 @@ spec:
   template:
     metadata:
       labels:
-        app: wordpress
-        tier: mysql
+        app.kubernetes.io/app: wordpress
+        app.kubernetes.io/tier: mysql
     spec:
       containers:
         - image: mysql:5.6
diff --git a/cluster/examples/kubernetes/wordpress.yaml b/cluster/examples/kubernetes/wordpress.yaml
index e1d88c390d906..67943b40d22dd 100644
--- a/cluster/examples/kubernetes/wordpress.yaml
+++ b/cluster/examples/kubernetes/wordpress.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: wordpress
   labels:
-    app: wordpress
+    app.kubernetes.io/app: wordpress
 spec:
   ports:
     - port: 80
@@ -17,7 +17,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: wp-pv-claim
   labels:
-    app: wordpress
+    app.kubernetes.io/app: wordpress
 spec:
   storageClassName: rook-ceph-block
   accessModes:
@@ -31,8 +31,8 @@ kind: Deployment
 metadata:
   name: wordpress
   labels:
-    app: wordpress
-    tier: frontend
+    app.kubernetes.io/app: wordpress
+    app.kubernetes.io/tier: frontend
 spec:
   selector:
     matchLabels:
@@ -43,8 +43,8 @@ spec:
   template:
     metadata:
       labels:
-        app: wordpress
-        tier: frontend
+        app.kubernetes.io/app: wordpress
+        app.kubernetes.io/tier: frontend
     spec:
       containers:
         - image: wordpress:4.6.1-apache
diff --git a/tests/integration/ceph_base_file_test.go b/tests/integration/ceph_base_file_test.go
index f2acba483cb3a..0da1fe1aa6b7e 100644
--- a/tests/integration/ceph_base_file_test.go
+++ b/tests/integration/ceph_base_file_test.go
@@ -555,8 +555,8 @@ kind: ClusterRoleBinding
 metadata:
   name: rook-ceph-agent-mount
   labels:
-    operator: rook
-    storage-backend: ceph
+  	operator: rook
+	storage-backend: ceph
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole