diff --git a/templates/fluentbit-logs/daemonset.yaml b/templates/fluentbit-logs/daemonset.yaml
index 1104a45193c154e9205fd19fcafbff620ff22fb1..d62d574dca1a8b03de4048056cbfeae4dfaedacf 100644
--- a/templates/fluentbit-logs/daemonset.yaml
+++ b/templates/fluentbit-logs/daemonset.yaml
@@ -9,13 +9,14 @@ metadata:
 spec:
   selector:
       matchLabels:
-        name: it-monit-logs-collector-fluentbit
+        {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+        app.kubernetes.io/component: fluentbit-logs
   template:
     metadata:
       name: it-monit-logs-collector-fluentbit
       namespace: {{ .Release.Namespace }}
       labels:
-        name: it-monit-logs-collector-fluentbit
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
     spec:
       serviceAccountName: it-monit-logs-collector-fluentbit
       containers:
diff --git a/templates/fluentbit-metrics/service.yaml b/templates/fluentbit-metrics/service.yaml
index e45fc295eac14c86e4c724473642bc3b7bc776ed..372792f1c0c0b91236728fd9f324f17828dbdf7b 100644
--- a/templates/fluentbit-metrics/service.yaml
+++ b/templates/fluentbit-metrics/service.yaml
@@ -12,5 +12,6 @@ spec:
   - name: http
     port: {{ .Values.metrics.fluentbit.prometheusRemoteWriteInputConfig.port }}
   selector:
-    name: it-monit-metrics-collector-fluentbit
+    {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: fluentbit-metrics
 {{- end -}}
diff --git a/templates/fluentbit-metrics/statefulset.yaml b/templates/fluentbit-metrics/statefulset.yaml
index 6fc036af32b0f99386157d4f606668e92306c322..a3a3e70e8adbedef44cbf2591ae62c77cc5e360a 100644
--- a/templates/fluentbit-metrics/statefulset.yaml
+++ b/templates/fluentbit-metrics/statefulset.yaml
@@ -8,15 +8,17 @@ metadata:
     {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 4 }}
 spec:
   selector:
-      matchLabels:
-        name: it-monit-metrics-collector-fluentbit
+    matchLabels:
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: fluentbit-metrics
   replicas: {{ .Values.metrics.fluentbit.replicas }}
   template:
     metadata:
       name: it-monit-metrics-collector-fluentbit
       namespace: {{ .Release.Namespace }}
       labels:
-        name: it-monit-metrics-collector-fluentbit
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: fluentbit-metrics
     spec:
       containers:
         - name: it-monit-metrics-collector-fluentbit
diff --git a/templates/kube_state/deployment.yaml b/templates/kube_state/deployment.yaml
index b506c488e85a047afb5256057dd1d27c5a5202b2..6974a889d85b5cf0fff2e38f16177bf6cd153855 100644
--- a/templates/kube_state/deployment.yaml
+++ b/templates/kube_state/deployment.yaml
@@ -10,11 +10,13 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: it-monit-metrics-collector-kubestate
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: kube-state
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: it-monit-metrics-collector-kubestate
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: kube-state
     spec:
       automountServiceAccountToken: true
       containers:
diff --git a/templates/kube_state/service.yaml b/templates/kube_state/service.yaml
index a5ba53e00c2fc27a1492c3721893c793a8aaf7a2..1a1e83ff9e2e64ced4b3b579eca44617f2bf987d 100644
--- a/templates/kube_state/service.yaml
+++ b/templates/kube_state/service.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 4 }}
+    app.kubernetes.io/component: kube-state
 spec:
   clusterIP: None
   ports:
@@ -16,5 +17,6 @@ spec:
     port: 8081
     targetPort: telemetry
   selector:
-    app.kubernetes.io/name: it-monit-metrics-collector-kubestate
+    {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: kube-state
 {{- end -}}
diff --git a/templates/kube_state/servicemonitor.yaml b/templates/kube_state/servicemonitor.yaml
index b4ed03c310c8f3ec8057676a685df48782939865..e6d0d8bdd33677c76bb212c822c90d3285b22117 100644
--- a/templates/kube_state/servicemonitor.yaml
+++ b/templates/kube_state/servicemonitor.yaml
@@ -26,7 +26,8 @@ spec:
     {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: "it-monit-metrics-collector-kubestate"
+      {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 6 }}
+      app.kubernetes.io/component: kube-state
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}
diff --git a/templates/node_exporter/daemonset.yaml b/templates/node_exporter/daemonset.yaml
index fdd1c3623cfac28a5591ba1513f28dc770978667..e553d128a009d486f087fd2b5775a6afffd0ad38 100644
--- a/templates/node_exporter/daemonset.yaml
+++ b/templates/node_exporter/daemonset.yaml
@@ -9,13 +9,13 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/component: exporter
-      app.kubernetes.io/name: node-exporter
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: node-exporter
   template:
     metadata:
       labels:
-        app.kubernetes.io/component: exporter
-        app.kubernetes.io/name: node-exporter
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: node-exporter
     spec:
       tolerations:
       - operator: Exists
diff --git a/templates/node_exporter/podmonitor.yaml b/templates/node_exporter/podmonitor.yaml
index 091ed20221171df9e8e521d4643f1d331a7cd18c..6e049e740b67c7bd48bba394026e608efa5e0ec2 100644
--- a/templates/node_exporter/podmonitor.yaml
+++ b/templates/node_exporter/podmonitor.yaml
@@ -12,7 +12,8 @@ spec:
         - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: node-exporter
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: node-exporter
   podMetricsEndpoints:
   - targetPort: 9100
     {{- if .Values.metrics.nodeExporter.scrapeInterval }}
diff --git a/templates/prometheus_operator/deployment.yaml b/templates/prometheus_operator/deployment.yaml
index c7631d3aad1cf4523ef5e5e81be37a1d21cdfa64..d7a3120bba78e01140c13e2ff744b2d57811e8e1 100644
--- a/templates/prometheus_operator/deployment.yaml
+++ b/templates/prometheus_operator/deployment.yaml
@@ -10,13 +10,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: it-monit-metrics-operator-prometheus
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: prometheus-operator
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: it-monit-metrics-operator-prometheus
       labels:
-        app.kubernetes.io/name: it-monit-metrics-operator-prometheus
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: prometheus-operator
     spec:
       automountServiceAccountToken: true
       containers:
diff --git a/templates/prometheus_operator/service.yaml b/templates/prometheus_operator/service.yaml
index 14fa20daadf3b6c190e17eb941eb71173524071f..f18294a504b5337650e8052b23d0139d89dc3b5e 100644
--- a/templates/prometheus_operator/service.yaml
+++ b/templates/prometheus_operator/service.yaml
@@ -13,6 +13,6 @@ spec:
     port: 8080
     targetPort: http
   selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: it-monit-metrics-operator-prometheus
+    {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: prometheus-operator
 {{- end -}}
diff --git a/templates/pushgateway/deployment.yaml b/templates/pushgateway/deployment.yaml
index 1d2d40e5aa3e398b6e6a18c9522f9aa9968963c3..be058bde7e6fec04442d57ecd28c0fdc288b236e 100644
--- a/templates/pushgateway/deployment.yaml
+++ b/templates/pushgateway/deployment.yaml
@@ -10,11 +10,13 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: it-monit-metrics-collector-pushgateway
+      {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 6 }}
+      app.kubernetes.io/component: pushgateway
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: it-monit-metrics-collector-pushgateway
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: pushgateway
     spec:
       containers:
       - image: "{{ .Values.metrics.pushgateway.image.repository }}:{{ .Values.metrics.pushgateway.image.tag }}"
diff --git a/templates/pushgateway/service.yaml b/templates/pushgateway/service.yaml
index 729241c2dd2f4d1242871c1bb8989950a036c7ce..98221d534a9a266baa18faa944f32cdbc9a4ea0d 100644
--- a/templates/pushgateway/service.yaml
+++ b/templates/pushgateway/service.yaml
@@ -6,11 +6,13 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 4 }}
+    app.kubernetes.io/component: pushgateway
 spec:
   clusterIP: None
   ports:
   - name: http
     port: 9091
   selector:
-    app.kubernetes.io/name: it-monit-metrics-collector-pushgateway
+    {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 4 }}
+    app.kubernetes.io/component: pushgateway
 {{- end -}}
diff --git a/templates/pushgateway/servicemonitor.yaml b/templates/pushgateway/servicemonitor.yaml
index 4ece85c910ebe13596b697e2bad9b10f6089e3f2..bff7d57d491e27cac7ddd167c0e48b28b52959c4 100644
--- a/templates/pushgateway/servicemonitor.yaml
+++ b/templates/pushgateway/servicemonitor.yaml
@@ -14,5 +14,6 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: it-monit-metrics-collector-pushgateway
+      {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 6 }}
+      app.kubernetes.io/component: pushgateway
 {{- end -}}