diff --git a/charts/hdx-oss-v2/templates/_helpers.tpl b/charts/hdx-oss-v2/templates/_helpers.tpl
index b9edfe1..2d82a6d 100644
--- a/charts/hdx-oss-v2/templates/_helpers.tpl
+++ b/charts/hdx-oss-v2/templates/_helpers.tpl
@@ -38,6 +38,10 @@ helm.sh/chart: {{ include "hdx-oss.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/part-of: hyperdx
+{{- if .Values.global.additionalLabels}}
+{{ toYaml .Values.global.additionalLabels }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -46,4 +50,32 @@ Selector labels
 {{- define "hdx-oss.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "hdx-oss.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }} 
\ No newline at end of file
+{{- end }}
+
+{{/*
+Hyperdx component
+*/}}
+{{- define "hdx-oss.hyperdx.labels" -}}
+app.kubernetes.io/component: hyperdx
+{{- end }}
+
+{{/*
+clickHouse component
+*/}}
+{{- define "hdx-oss.clickhouse.labels" -}}
+app.kubernetes.io/component: clickhouse
+{{- end }}
+
+{{/*
+MongoDB component
+*/}}
+{{- define "hdx-oss.mongodb.labels" -}}
+app.kubernetes.io/component: mongo
+{{- end }}
+
+{{/*
+OpenTelemetry Collector component
+*/}}
+{{- define "hdx-oss.otel.labels" -}}
+app.kubernetes.io/component: opentelemetry
+{{- end }}
diff --git a/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml b/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
index c7329b5..835fe6a 100644
--- a/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
+++ b/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-clickhouse
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }}
     app: clickhouse
 spec:
   replicas: 1
@@ -15,7 +16,8 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "hdx-oss.selectorLabels" . | nindent 8 }}
+        {{- include "hdx-oss.labels" . | nindent 8 }}
+        {{- include "hdx-oss.clickhouse.labels" . | nindent 8 }}
         app: clickhouse
     spec:
       containers:
@@ -56,6 +58,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-clickhouse
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }}
 spec:
   ports:
     - port: {{ .Values.clickhouse.port }}
@@ -79,6 +82,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-clickhouse-config
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }}
 data:
   config.xml: |-
     {{- tpl (.Files.Get "data/config.xml") . | nindent 4 }}
@@ -90,6 +94,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-clickhouse-users
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }}
 data:
   users.xml: |-
     {{- tpl (.Files.Get "data/users.xml") . | nindent 4 }}
@@ -102,6 +107,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-clickhouse-data
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }}
 spec:
   accessModes:
     - ReadWriteOnce
@@ -118,6 +124,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-clickhouse-logs
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }}
 spec:
   accessModes:
     - ReadWriteOnce
@@ -128,4 +135,4 @@ spec:
     requests:
       storage: {{ .Values.clickhouse.persistence.logSize }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml
index 0e85f06..948c7e4 100644
--- a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml
+++ b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-app-config
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }}
 data:
   APP_PORT: {{ .Values.hyperdx.appPort | quote }}
   API_PORT: {{ .Values.hyperdx.apiPort | quote }}
diff --git a/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml b/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml
index b315012..9fc12d8 100644
--- a/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml
+++ b/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-check-alerts
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }}
 spec:
   schedule: {{ .Values.tasks.checkAlerts.schedule | quote }}
   concurrencyPolicy: Forbid
@@ -32,4 +33,4 @@ spec:
                   value: "hdx-oss-task-check-alerts"
               resources:
                 {{- toYaml .Values.tasks.checkAlerts.resources | nindent 16 }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml
index 45a2d50..3094d72 100644
--- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml
+++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml
@@ -4,10 +4,11 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-app
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }}
     app: {{ include "hdx-oss.fullname" . }}
     {{- if .Values.hyperdx.labels }}
     {{- with .Values.hyperdx.labels }}
-    {{- toYaml . | nindent 4 }} 
+    {{- toYaml . | nindent 4 }}
     {{- end -}}
     {{- end }}
 spec:
@@ -19,12 +20,13 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "hdx-oss.selectorLabels" . | nindent 8 }}
+        {{- include "hdx-oss.labels" . | nindent 8 }}
+        {{- include "hdx-oss.hyperdx.labels" . | nindent 8 }}
         app: {{ include "hdx-oss.fullname" . }}
       annotations:
       {{- if .Values.hyperdx.annotations }}
         {{- with .Values.hyperdx.annotations }}
-        {{- toYaml . | nindent 8 }} 
+        {{- toYaml . | nindent 8 }}
         {{- end -}}
       {{- end }}
     spec:
@@ -61,4 +63,4 @@ spec:
             {{- end }}
             {{- with .Values.hyperdx.env }}
             {{- toYaml . | nindent 12 }}
-            {{- end }}
\ No newline at end of file
+            {{- end }}
diff --git a/charts/hdx-oss-v2/templates/hyperdx-service.yaml b/charts/hdx-oss-v2/templates/hyperdx-service.yaml
index f02a5af..89099ed 100644
--- a/charts/hdx-oss-v2/templates/hyperdx-service.yaml
+++ b/charts/hdx-oss-v2/templates/hyperdx-service.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-app
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }}
 spec:
   type: LoadBalancer
   ports:
@@ -15,4 +16,4 @@ spec:
       name: opamp
   selector:
     {{- include "hdx-oss.selectorLabels" . | nindent 4 }}
-    app: {{ include "hdx-oss.fullname" . }} 
\ No newline at end of file
+    app: {{ include "hdx-oss.fullname" . }}
diff --git a/charts/hdx-oss-v2/templates/ingress.yaml b/charts/hdx-oss-v2/templates/ingress.yaml
index f05c2fa..1733d04 100644
--- a/charts/hdx-oss-v2/templates/ingress.yaml
+++ b/charts/hdx-oss-v2/templates/ingress.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-app-ingress
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }}
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /$1
     nginx.ingress.kubernetes.io/use-regex: "true"
@@ -35,4 +36,4 @@ spec:
                 name: {{ include "hdx-oss.fullname" . }}-app
                 port:
                   number: {{ .Values.hyperdx.appPort }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/hdx-oss-v2/templates/mongodb-deployment.yaml b/charts/hdx-oss-v2/templates/mongodb-deployment.yaml
index 91ea4fd..a988067 100644
--- a/charts/hdx-oss-v2/templates/mongodb-deployment.yaml
+++ b/charts/hdx-oss-v2/templates/mongodb-deployment.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-mongodb
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.mongodb.labels" . | nindent 4 }}
     app: mongodb
 spec:
   replicas: 1
@@ -14,7 +15,8 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "hdx-oss.selectorLabels" . | nindent 8 }}
+        {{- include "hdx-oss.labels" . | nindent 8 }}
+        {{- include "hdx-oss.mongodb.labels" . | nindent 8 }}
         app: mongodb
     spec:
       containers:
@@ -36,10 +38,11 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-mongodb
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.mongodb.labels" . | nindent 4 }}
 spec:
   ports:
     - port: {{ .Values.mongodb.port }}
       targetPort: {{ .Values.mongodb.port }}
   selector:
     {{- include "hdx-oss.selectorLabels" . | nindent 4 }}
-    app: mongodb
\ No newline at end of file
+    app: mongodb
diff --git a/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml b/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
index 9a8c8b6..476f537 100644
--- a/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
+++ b/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-otel-collector
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.otel.labels" . | nindent 4 }}
     app: otel-collector
 spec:
   replicas: 1
@@ -16,6 +17,7 @@ spec:
     metadata:
       labels:
         {{- include "hdx-oss.selectorLabels" . | nindent 8 }}
+        {{- include "hdx-oss.otel.labels" . | nindent 8 }}
         app: otel-collector
     spec:
       containers:
@@ -58,6 +60,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-otel-collector
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.otel.labels" . | nindent 4 }}
 spec:
   ports:
     - port: {{ .Values.otel.port }}
@@ -78,4 +81,4 @@ spec:
   selector:
     {{- include "hdx-oss.selectorLabels" . | nindent 4 }}
     app: otel-collector
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/hdx-oss-v2/templates/secrets.yaml b/charts/hdx-oss-v2/templates/secrets.yaml
index f2828b4..fe4ed3a 100644
--- a/charts/hdx-oss-v2/templates/secrets.yaml
+++ b/charts/hdx-oss-v2/templates/secrets.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-app-secrets
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }}
 type: Opaque
 data:
   api-key: {{ .Values.hyperdx.apiKey | b64enc }}
@@ -15,8 +16,9 @@ metadata:
   name: {{ include "hdx-oss.fullname" . }}-clickhouse-secrets
   labels:
     {{- include "hdx-oss.labels" . | nindent 4 }}
+    {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }}
 type: Opaque
 data:
   appUserPassword: {{ .Values.clickhouse.config.users.appUserPassword | toString | b64enc }}
   otelUserPassword: {{ .Values.clickhouse.config.users.otelUserPassword | toString | b64enc }}
-{{- end }}
\ No newline at end of file
+{{- end }}