diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index 5174751..27b5a36 100644
--- a/charts/quickwit/Chart.yaml
+++ b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.7.7
+version: 0.8.0
 appVersion: "v0.8.2"
 keywords:
   - quickwit
diff --git a/charts/quickwit/templates/_helpers.tpl b/charts/quickwit/templates/_helpers.tpl
index 542b56e..20b9b1a 100644
--- a/charts/quickwit/templates/_helpers.tpl
+++ b/charts/quickwit/templates/_helpers.tpl
@@ -44,7 +44,6 @@ Common labels
 */}}
 {{- define "quickwit.labels" -}}
 helm.sh/chart: {{ include "quickwit.chart" . }}
-{{ include "quickwit.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
diff --git a/charts/quickwit/templates/configmap-bootstrap.yaml b/charts/quickwit/templates/configmap-bootstrap.yaml
index ddb1025..170b3a4 100644
--- a/charts/quickwit/templates/configmap-bootstrap.yaml
+++ b/charts/quickwit/templates/configmap-bootstrap.yaml
@@ -5,6 +5,8 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-bootstrap
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: config
 data:
   {{- range .Values.seed.indexes }}
   {{ .index_id }}.yaml: |-
diff --git a/charts/quickwit/templates/configmap.yaml b/charts/quickwit/templates/configmap.yaml
index e046270..53add20 100644
--- a/charts/quickwit/templates/configmap.yaml
+++ b/charts/quickwit/templates/configmap.yaml
@@ -4,6 +4,8 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: config
 data:
   node.yaml: |-
     {{- toYaml .Values.config | nindent 4 }}
diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index 38ff065..ec106f8 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-control-plane
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -29,7 +30,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "quickwit.additionalLabels" . | nindent 8 }}
+        {{- include "quickwit.labels" . | nindent 8 }}
         {{- include "quickwit.control_plane.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
diff --git a/charts/quickwit/templates/prometheusrule.yaml b/charts/quickwit/templates/prometheusrule.yaml
index 4b758dc..104dfae 100644
--- a/charts/quickwit/templates/prometheusrule.yaml
+++ b/charts/quickwit/templates/prometheusrule.yaml
@@ -5,6 +5,8 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: metrics
     {{- with .Values.prometheusRule.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/charts/quickwit/templates/service.yaml b/charts/quickwit/templates/service.yaml
index b6fb7ec..d5a15a5 100644
--- a/charts/quickwit/templates/service.yaml
+++ b/charts/quickwit/templates/service.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-searcher
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.searcher.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -36,6 +37,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-headless
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -72,6 +74,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-indexer
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.indexer.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -104,6 +107,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-metastore
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.metastore.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -136,6 +140,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-control-plane
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -161,7 +166,6 @@ spec:
       name: grpc
   selector:
     {{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}
-
 ---
 apiVersion: v1
 kind: Service
@@ -169,6 +173,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-janitor
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.janitor.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
diff --git a/charts/quickwit/templates/serviceaccount.yaml b/charts/quickwit/templates/serviceaccount.yaml
index 5f9d6a7..518cb6a 100644
--- a/charts/quickwit/templates/serviceaccount.yaml
+++ b/charts/quickwit/templates/serviceaccount.yaml
@@ -5,6 +5,8 @@ metadata:
   name: {{ include "quickwit.serviceAccountName" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: rbac
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/quickwit/templates/servicemonitor.yaml b/charts/quickwit/templates/servicemonitor.yaml
index 206549c..0dbb57e 100644
--- a/charts/quickwit/templates/servicemonitor.yaml
+++ b/charts/quickwit/templates/servicemonitor.yaml
@@ -5,6 +5,8 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: metrics
     {{- with .Values.serviceMonitor.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}