diff --git a/templates/cdi/cdi-operator/deployment.yaml b/templates/cdi/cdi-operator/deployment.yaml
index 7a046bdf14..877ebfcaa3 100644
--- a/templates/cdi/cdi-operator/deployment.yaml
+++ b/templates/cdi/cdi-operator/deployment.yaml
@@ -60,7 +60,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  {{- include "helm_lib_module_labels" (list .) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "cdi-operator" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
   name: cdi-operator
   namespace: d8-{{ .Chart.Name }}
 spec:
diff --git a/templates/cdi/config.yaml b/templates/cdi/config.yaml
index f317a1f160..ed05d9cd6f 100644
--- a/templates/cdi/config.yaml
+++ b/templates/cdi/config.yaml
@@ -71,8 +71,17 @@ spec:
         type: strategic
     {{- end }}
 
-      # Add kube-api-rewriter as a sidecar container to cdi-apiserver and cdi-deployment.
+      # set labels for components
+      - resourceType: Deployment
+        resourceName: cdi-deployment
+        patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "cdi-deployment" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
+        type: strategic
+      - resourceType: Deployment
+        resourceName: cdi-apiserver
+        patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "cdi-apiserver" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
+        type: strategic
 
+      # Add kube-api-rewriter as a sidecar container to cdi-apiserver and cdi-deployment.
       {{- $apiRewriterSettings := dict }}
       {{- $_ := set $apiRewriterSettings "WEBHOOK_ADDRESS" "https://127.0.0.1:8443" }}
       {{- $_ := set $apiRewriterSettings "WEBHOOK_CERT_FILE" "/var/run/certs/cdi-apiserver-server-cert/tls.crt" }}
diff --git a/templates/dvcr/deployment.yaml b/templates/dvcr/deployment.yaml
index 54bb2317bd..12d51488d3 100644
--- a/templates/dvcr/deployment.yaml
+++ b/templates/dvcr/deployment.yaml
@@ -44,7 +44,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  {{- include "helm_lib_module_labels" (list . (dict "app" "dvcr")) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "dvcr" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
   name: dvcr
   namespace: d8-{{ .Chart.Name }}
 spec:
diff --git a/templates/kubevirt/kubevirt.yaml b/templates/kubevirt/kubevirt.yaml
index c7e8a8ab75..1b6e6df075 100644
--- a/templates/kubevirt/kubevirt.yaml
+++ b/templates/kubevirt/kubevirt.yaml
@@ -269,6 +269,24 @@ spec:
       patch: '[{"op": "replace", "path": "/spec/ports/0/targetPort", "value": "https-metrics"}]'
       type: json
 
+    # set labels for components
+    - resourceType: Deployment
+      resourceName: virt-api
+      patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-api" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
+      type: strategic
+    - resourceType: Deployment
+      resourceName: virt-operator
+      patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-operator" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
+      type: strategic
+    - resourceType: Deployment
+      resourceName: virt-controller
+      patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-controller" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
+      type: strategic
+    - resourceType: DaemonSet
+      resourceName: virt-handler
+      patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-handler" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
+      type: strategic
+
 # Additional environment variables for virt-controller.
 {{ define "virt-controller-additional-envs" }}
 env:
diff --git a/templates/kubevirt/virt-operator/deployment.yaml b/templates/kubevirt/virt-operator/deployment.yaml
index 35f93318bd..2c8a5cc9f0 100644
--- a/templates/kubevirt/virt-operator/deployment.yaml
+++ b/templates/kubevirt/virt-operator/deployment.yaml
@@ -57,9 +57,9 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  {{- include "helm_lib_module_labels" (list . (dict "app" "virt-operator")) | nindent 2 }}
   name: virt-operator
   namespace: d8-{{ .Chart.Name }}
+  {{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-operator" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
 spec:
   {{- include "helm_lib_deployment_strategy_and_replicas_for_ha" . | nindent 2 }}
   revisionHistoryLimit: 2
diff --git a/templates/virtualization-api/deployment.yaml b/templates/virtualization-api/deployment.yaml
index e63247e775..c2d3638549 100644
--- a/templates/virtualization-api/deployment.yaml
+++ b/templates/virtualization-api/deployment.yaml
@@ -47,7 +47,7 @@ kind: Deployment
 metadata:
   name: virtualization-api
   namespace: d8-{{ .Chart.Name }}
-  {{- include "helm_lib_module_labels" (list . (dict "app" "virtualization-api")) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virtualization-api" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
 spec:
   {{- include "helm_lib_deployment_strategy_and_replicas_for_ha" . | nindent 2 }}
   revisionHistoryLimit: 2
diff --git a/templates/virtualization-controller/deployment.yaml b/templates/virtualization-controller/deployment.yaml
index f30a9404c5..8711f4488f 100644
--- a/templates/virtualization-controller/deployment.yaml
+++ b/templates/virtualization-controller/deployment.yaml
@@ -49,7 +49,7 @@ kind: Deployment
 metadata:
   name: virtualization-controller
   namespace: d8-{{ .Chart.Name }}
-  {{- include "helm_lib_module_labels" (list . (dict "app" "virtualization-controller")) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virtualization-controller" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
 spec:
   {{- include "helm_lib_deployment_strategy_and_replicas_for_ha" . | nindent 2 }}
   revisionHistoryLimit: 2
diff --git a/templates/vm-route-forge/daemonset.yaml b/templates/vm-route-forge/daemonset.yaml
index af803663cb..05c3044202 100644
--- a/templates/vm-route-forge/daemonset.yaml
+++ b/templates/vm-route-forge/daemonset.yaml
@@ -34,7 +34,7 @@ kind: DaemonSet
 metadata:
   name: vm-route-forge
   namespace: d8-{{ .Chart.Name }}
-  {{- include "helm_lib_module_labels" (list . (dict "app" "vm-route-forge")) | nindent 2 }}
+  {{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "vm-route-forge" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
 spec:
   selector:
     matchLabels: