diff --git a/charts/selenium-grid/CONFIGURATION.md b/charts/selenium-grid/CONFIGURATION.md
index 975ede75b..85f57fa0a 100644
--- a/charts/selenium-grid/CONFIGURATION.md
+++ b/charts/selenium-grid/CONFIGURATION.md
@@ -682,7 +682,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | videoRecorder.extraVolumeMounts | list | `[]` | Custom video recorder back-end scripts (video.sh, video_ready.py, etc.) further by ConfigMap. NOTE: For the mount point with the name "video", or "video-scripts", it will override the default. For other names, it will be appended. |
 | videoRecorder.extraVolumes | list | `[]` | Extra volumes for video recorder pod |
 | videoRecorder.s3 | object | `{"args":[],"command":[],"extraEnvironmentVariables":[],"imageName":"aws-cli","imagePullPolicy":"IfNotPresent","imageRegistry":"bitnami","imageTag":"latest","securityContext":{"runAsUser":0}}` | Container spec for the uploader if above it is defined as "uploader.name: s3" |
-| customLabels | object | `{}` | Custom labels for k8s resources |
+| customLabels | object | `{}` | Add more labels to all resources created by this chart or override existing label keys |
 | videoManager.enabled | bool | `false` | Enable video manager |
 | videoManager.nameOverride | string | `""` | Override deployment name of video manager |
 | videoManager.ingress.enabled | bool | `true` | Enable ingress resource to access the file browser |
diff --git a/charts/selenium-grid/templates/_helpers.tpl b/charts/selenium-grid/templates/_helpers.tpl
index f3f9aa9d6..d70ec4fbe 100644
--- a/charts/selenium-grid/templates/_helpers.tpl
+++ b/charts/selenium-grid/templates/_helpers.tpl
@@ -304,13 +304,10 @@ template:
     labels:
       app: {{ .name }}
       app.kubernetes.io/name: {{ .name }}
-      {{- include "seleniumGrid.commonLabels" . | nindent 6 }}
+      {{- include "seleniumGrid.commonLabels" $ | nindent 6 }}
       {{- with .node.labels }}
         {{- toYaml . | nindent 6 }}
       {{- end }}
-      {{- with $.Values.customLabels }}
-        {{- toYaml . | nindent 6 }}
-      {{- end }}
     annotations:
       checksum/event-bus-configmap: {{ include (print $.Template.BasePath "/event-bus-configmap.yaml") . | sha256sum }}
       checksum/node-configmap: {{ include (print $.Template.BasePath "/node-configmap.yaml") . | sha256sum }}
@@ -398,6 +395,8 @@ template:
         {{- end }}
           - name: SE_OTEL_SERVICE_NAME
             value: {{ .name | quote }}
+          - name: SE_OTEL_RESOURCE_ATTRIBUTES
+            value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
           - name: SE_NODE_HOST
             valueFrom:
               fieldRef:
diff --git a/charts/selenium-grid/templates/_nameHelpers.tpl b/charts/selenium-grid/templates/_nameHelpers.tpl
index bb8110089..1c6087ba9 100644
--- a/charts/selenium-grid/templates/_nameHelpers.tpl
+++ b/charts/selenium-grid/templates/_nameHelpers.tpl
@@ -32,11 +32,28 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "seleniumGrid.commonLabels" -}}
-app.kubernetes.io/managed-by: {{ .Release.Service | lower }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/version: {{ .Chart.AppVersion }}
-app.kubernetes.io/component: {{ printf "selenium-grid-%s" .Chart.AppVersion }}
-helm.sh/chart: {{ include "seleniumGrid.chart" . }}
+{{- $defaultLabels := dict
+    "app.kubernetes.io/managed-by" (.Release.Service | lower)
+    "app.kubernetes.io/instance" .Release.Name
+    "app.kubernetes.io/version" .Chart.AppVersion
+    "app.kubernetes.io/component" (printf "selenium-grid-%s" .Chart.AppVersion)
+    "helm.sh/chart" (include "seleniumGrid.chart" .)
+}}
+{{- $customLabels := tpl (toYaml (.Values.customLabels | default dict)) $ | fromYaml }}
+{{- $mergedLabels := merge $defaultLabels $customLabels }}
+{{- toYaml $mergedLabels | nindent 0 }}
+{{- end -}}
+
+{{/*
+Bring common labels to tracing resource attributes
+*/}}
+{{- define "seleniumGrid.tracing.attributes" -}}
+{{- $labels := include "seleniumGrid.commonLabels" $ | fromYaml }}
+{{- $attrs := list }}
+{{- range $k, $v := $labels }}
+{{- $attrs = append $attrs (printf "%s=%s" $k $v) }}
+{{- end }}
+{{- join "," $attrs }}
 {{- end -}}
 
 {{/*
diff --git a/charts/selenium-grid/templates/basic-auth-secret.yaml b/charts/selenium-grid/templates/basic-auth-secret.yaml
index afedba018..dd9bc5e30 100644
--- a/charts/selenium-grid/templates/basic-auth-secret.yaml
+++ b/charts/selenium-grid/templates/basic-auth-secret.yaml
@@ -9,9 +9,6 @@ metadata:
 {{- end }}
   labels:
     {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 type: Opaque
 data:
 {{- if eq .Values.basicAuth.enabled true }}
diff --git a/charts/selenium-grid/templates/chrome-node-deployment.yaml b/charts/selenium-grid/templates/chrome-node-deployment.yaml
index 38f380d3f..ae726b553 100644
--- a/charts/selenium-grid/templates/chrome-node-deployment.yaml
+++ b/charts/selenium-grid/templates/chrome-node-deployment.yaml
@@ -13,9 +13,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $nodeConfig $.Values.global.seleniumGrid) }}
diff --git a/charts/selenium-grid/templates/chrome-node-hpa.yaml b/charts/selenium-grid/templates/chrome-node-hpa.yaml
index 9f3bae243..838ddf2be 100644
--- a/charts/selenium-grid/templates/chrome-node-hpa.yaml
+++ b/charts/selenium-grid/templates/chrome-node-hpa.yaml
@@ -17,9 +17,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- $podScope := deepCopy $ -}}
   {{- $_ := set $podScope "name" (include "seleniumGrid.chromeNode.fullname" (list $nodeConfig $)) -}}
diff --git a/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml b/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml
index 9a7e409f9..1ce9acf9b 100644
--- a/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml
+++ b/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml
@@ -20,9 +20,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- $podScope := deepCopy $ -}}
   {{- $_ := set $podScope "name" (include "seleniumGrid.chromeNode.fullname" (list $nodeConfig $)) -}}
diff --git a/charts/selenium-grid/templates/distributor-configmap.yaml b/charts/selenium-grid/templates/distributor-configmap.yaml
index 9403c6e36..cd5c22705 100644
--- a/charts/selenium-grid/templates/distributor-configmap.yaml
+++ b/charts/selenium-grid/templates/distributor-configmap.yaml
@@ -7,10 +7,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
 {{- $fileProceeded := list -}}
 {{- range $path, $_ :=  .Files.Glob $.Values.distributorConfigMap.extraScriptsImportFrom }}
diff --git a/charts/selenium-grid/templates/distributor-deployment.yaml b/charts/selenium-grid/templates/distributor-deployment.yaml
index c04697a35..841df9f71 100644
--- a/charts/selenium-grid/templates/distributor-deployment.yaml
+++ b/charts/selenium-grid/templates/distributor-deployment.yaml
@@ -7,10 +7,7 @@ metadata:
   labels: &distributor_labels
     app: {{ template "seleniumGrid.distributor.fullname" . }}
     app.kubernetes.io/name: {{ template "seleniumGrid.distributor.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $.Values.components.distributor $.Values.global.seleniumGrid) }}
@@ -49,6 +46,8 @@ spec:
                   fieldPath: status.hostIP
             - name: SE_OTEL_SERVICE_NAME
               value: '{{ template "seleniumGrid.distributor.fullname" . }}'
+            - name: SE_OTEL_RESOURCE_ATTRIBUTES
+              value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
             - name: SE_DISTRIBUTOR_HOST
               valueFrom:
                 fieldRef:
diff --git a/charts/selenium-grid/templates/distributor-service.yaml b/charts/selenium-grid/templates/distributor-service.yaml
index 44ca872f0..03da0b6e4 100644
--- a/charts/selenium-grid/templates/distributor-service.yaml
+++ b/charts/selenium-grid/templates/distributor-service.yaml
@@ -6,10 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "seleniumGrid.distributor.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 {{- with .Values.components.distributor.serviceAnnotations }}
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/edge-node-deployment.yaml b/charts/selenium-grid/templates/edge-node-deployment.yaml
index 6663a5276..0d6df5014 100644
--- a/charts/selenium-grid/templates/edge-node-deployment.yaml
+++ b/charts/selenium-grid/templates/edge-node-deployment.yaml
@@ -13,9 +13,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $nodeConfig $.Values.global.seleniumGrid) }}
diff --git a/charts/selenium-grid/templates/edge-node-hpa.yaml b/charts/selenium-grid/templates/edge-node-hpa.yaml
index f07fc0144..9f18abf17 100644
--- a/charts/selenium-grid/templates/edge-node-hpa.yaml
+++ b/charts/selenium-grid/templates/edge-node-hpa.yaml
@@ -17,9 +17,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- $podScope := deepCopy $ -}}
   {{- $_ := set $podScope "name" (include "seleniumGrid.edgeNode.fullname" (list $nodeConfig $)) -}}
diff --git a/charts/selenium-grid/templates/edge-node-scaledjob.yaml b/charts/selenium-grid/templates/edge-node-scaledjob.yaml
index 164d8d794..2c65af908 100644
--- a/charts/selenium-grid/templates/edge-node-scaledjob.yaml
+++ b/charts/selenium-grid/templates/edge-node-scaledjob.yaml
@@ -20,9 +20,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- $podScope := deepCopy $ -}}
   {{- $_ := set $podScope "name" (include "seleniumGrid.edgeNode.fullname" (list $nodeConfig $)) -}}
diff --git a/charts/selenium-grid/templates/event-bus-configmap.yaml b/charts/selenium-grid/templates/event-bus-configmap.yaml
index 55e30469c..2e1d2232d 100644
--- a/charts/selenium-grid/templates/event-bus-configmap.yaml
+++ b/charts/selenium-grid/templates/event-bus-configmap.yaml
@@ -10,10 +10,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
   SE_EVENT_BUS_HOST: {{ $eventBusHost | quote }}
   SE_EVENT_BUS_PUBLISH_PORT: {{ $eventBusPublishPort | quote }}
diff --git a/charts/selenium-grid/templates/event-bus-deployment.yaml b/charts/selenium-grid/templates/event-bus-deployment.yaml
index 0094bf44c..8bf5250c5 100644
--- a/charts/selenium-grid/templates/event-bus-deployment.yaml
+++ b/charts/selenium-grid/templates/event-bus-deployment.yaml
@@ -7,10 +7,7 @@ metadata:
   labels: &event_bus_labels
     app: {{ template "seleniumGrid.eventBus.fullname" . }}
     app.kubernetes.io/name: {{ template "seleniumGrid.eventBus.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $.Values.components.eventBus $.Values.global.seleniumGrid) }}
@@ -53,6 +50,8 @@ spec:
                   fieldPath: status.hostIP
             - name: SE_OTEL_SERVICE_NAME
               value: '{{ template "seleniumGrid.eventBus.fullname" . }}'
+            - name: SE_OTEL_RESOURCE_ATTRIBUTES
+              value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
             - name: SE_EVENT_BUS_HOST
               valueFrom:
                 fieldRef:
diff --git a/charts/selenium-grid/templates/event-bus-service.yaml b/charts/selenium-grid/templates/event-bus-service.yaml
index 3e1902654..1b8a6cf0a 100644
--- a/charts/selenium-grid/templates/event-bus-service.yaml
+++ b/charts/selenium-grid/templates/event-bus-service.yaml
@@ -6,10 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "seleniumGrid.eventBus.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 {{- with .Values.components.eventBus.serviceAnnotations }}
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/firefox-node-deployment.yaml b/charts/selenium-grid/templates/firefox-node-deployment.yaml
index aa0a48922..0ac14528f 100644
--- a/charts/selenium-grid/templates/firefox-node-deployment.yaml
+++ b/charts/selenium-grid/templates/firefox-node-deployment.yaml
@@ -13,9 +13,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $nodeConfig $.Values.global.seleniumGrid) }}
diff --git a/charts/selenium-grid/templates/firefox-node-hpa.yaml b/charts/selenium-grid/templates/firefox-node-hpa.yaml
index 425a2f894..dfd0f38ca 100644
--- a/charts/selenium-grid/templates/firefox-node-hpa.yaml
+++ b/charts/selenium-grid/templates/firefox-node-hpa.yaml
@@ -17,9 +17,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- $podScope := deepCopy $ -}}
   {{- $_ := set $podScope "name" (include "seleniumGrid.firefoxNode.fullname" (list $nodeConfig $)) -}}
diff --git a/charts/selenium-grid/templates/firefox-node-scaledjob.yaml b/charts/selenium-grid/templates/firefox-node-scaledjob.yaml
index b1bed800d..fcee31132 100644
--- a/charts/selenium-grid/templates/firefox-node-scaledjob.yaml
+++ b/charts/selenium-grid/templates/firefox-node-scaledjob.yaml
@@ -20,9 +20,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- $podScope := deepCopy $ -}}
   {{- $_ := set $podScope "name" (include "seleniumGrid.firefoxNode.fullname" (list $nodeConfig $)) -}}
diff --git a/charts/selenium-grid/templates/hub-deployment.yaml b/charts/selenium-grid/templates/hub-deployment.yaml
index 55abce2cc..faf983a87 100644
--- a/charts/selenium-grid/templates/hub-deployment.yaml
+++ b/charts/selenium-grid/templates/hub-deployment.yaml
@@ -7,13 +7,10 @@ metadata:
   labels: &hub_labels
     app: {{ template "seleniumGrid.hub.fullname" . }}
     app.kubernetes.io/name: {{ template "seleniumGrid.hub.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
     {{- with .Values.hub.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $.Values.hub $.Values.global.seleniumGrid) }}
@@ -110,6 +107,8 @@ spec:
                   fieldPath: status.hostIP
             - name: SE_OTEL_SERVICE_NAME
               value: '{{ template "seleniumGrid.hub.fullname" . }}'
+            - name: SE_OTEL_RESOURCE_ATTRIBUTES
+              value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
             - name: SE_HUB_HOST
               valueFrom:
                 fieldRef:
diff --git a/charts/selenium-grid/templates/hub-service.yaml b/charts/selenium-grid/templates/hub-service.yaml
index cf838f9a4..5c7825223 100644
--- a/charts/selenium-grid/templates/hub-service.yaml
+++ b/charts/selenium-grid/templates/hub-service.yaml
@@ -6,10 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "seleniumGrid.hub.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 {{- with .Values.hub.serviceAnnotations }}
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/ingress.yaml b/charts/selenium-grid/templates/ingress.yaml
index 0f0fa4bba..725c566e2 100644
--- a/charts/selenium-grid/templates/ingress.yaml
+++ b/charts/selenium-grid/templates/ingress.yaml
@@ -16,10 +16,7 @@ metadata:
   name: {{ template "seleniumGrid.ingress.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
   {{- $ingressAnnotations := (include "seleniumGrid.ingress.nginx.annotations.default" . | toString | fromYaml ) }}
   {{- with .Values.ingress.annotations -}}
     {{- $ingressAnnotations = mergeOverwrite $ingressAnnotations . }}
diff --git a/charts/selenium-grid/templates/jaeger-ingress.yaml b/charts/selenium-grid/templates/jaeger-ingress.yaml
index b3f4cb176..f89514fed 100644
--- a/charts/selenium-grid/templates/jaeger-ingress.yaml
+++ b/charts/selenium-grid/templates/jaeger-ingress.yaml
@@ -10,10 +10,7 @@ metadata:
   name: {{ .Release.Name }}-jaeger-ingress
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
   {{- with .Values.tracing.ingress.annotations }}
   annotations:
     {{- . | toYaml | nindent 4 }}
diff --git a/charts/selenium-grid/templates/logging-configmap.yaml b/charts/selenium-grid/templates/logging-configmap.yaml
index 03df5c680..f2460df0f 100644
--- a/charts/selenium-grid/templates/logging-configmap.yaml
+++ b/charts/selenium-grid/templates/logging-configmap.yaml
@@ -7,10 +7,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
   SE_LOG_LEVEL: {{ default "INFO" .Values.global.seleniumGrid.logLevel | quote }}
   SE_STRUCTURED_LOGS: {{ default false .Values.global.seleniumGrid.structuredLogs | quote }}
diff --git a/charts/selenium-grid/templates/monitoring-exporter-deployment.yaml b/charts/selenium-grid/templates/monitoring-exporter-deployment.yaml
index aa0f64abe..4aa43d70c 100644
--- a/charts/selenium-grid/templates/monitoring-exporter-deployment.yaml
+++ b/charts/selenium-grid/templates/monitoring-exporter-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels: &exporter_labels
     app: {{ template "seleniumGrid.monitoring.exporter.fullname" $ }}
     app.kubernetes.io/name: {{ template "seleniumGrid.monitoring.exporter.fullname" $ }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 spec:
   replicas: {{ .Values.monitoring.exporter.replicas }}
   selector:
diff --git a/charts/selenium-grid/templates/monitoring-exporter-service.yaml b/charts/selenium-grid/templates/monitoring-exporter-service.yaml
index 5fa102ae4..c2f98b4c8 100644
--- a/charts/selenium-grid/templates/monitoring-exporter-service.yaml
+++ b/charts/selenium-grid/templates/monitoring-exporter-service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: {{ template "seleniumGrid.monitoring.exporter.fullname" $ }}
     app.kubernetes.io/name: {{ template "seleniumGrid.monitoring.exporter.fullname" $ }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 spec:
   selector:
     app: {{ template "seleniumGrid.monitoring.exporter.fullname" $ }}
diff --git a/charts/selenium-grid/templates/monitoring-scape-secret.yaml b/charts/selenium-grid/templates/monitoring-scape-secret.yaml
index ab29d689a..3932ba657 100644
--- a/charts/selenium-grid/templates/monitoring-scape-secret.yaml
+++ b/charts/selenium-grid/templates/monitoring-scape-secret.yaml
@@ -10,9 +10,6 @@ metadata:
   {{- end }}
   labels:
     {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 type: Opaque
 data:
   {{- $key := include "seleniumGrid.monitoring.scrape.key" $ -}}
diff --git a/charts/selenium-grid/templates/node-configmap.yaml b/charts/selenium-grid/templates/node-configmap.yaml
index 297ea79e5..8740ee2de 100644
--- a/charts/selenium-grid/templates/node-configmap.yaml
+++ b/charts/selenium-grid/templates/node-configmap.yaml
@@ -10,10 +10,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
 {{- if .Values.isolateComponents }}
   SE_DISTRIBUTOR_HOST: {{ $distributorHost | quote }}
diff --git a/charts/selenium-grid/templates/patch-keda/delete-keda-objects-job.yaml b/charts/selenium-grid/templates/patch-keda/delete-keda-objects-job.yaml
index 3f965fdc0..412f6df34 100644
--- a/charts/selenium-grid/templates/patch-keda/delete-keda-objects-job.yaml
+++ b/charts/selenium-grid/templates/patch-keda/delete-keda-objects-job.yaml
@@ -13,9 +13,6 @@ metadata:
     app: {{ template "seleniumGrid.keda.deleteObjectsJob.fullname" $ }}
     app.kubernetes.io/name: {{ template "seleniumGrid.keda.deleteObjectsJob.fullname" $ }}
     {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
-  {{- with $.Values.customLabels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   template:
     metadata:
diff --git a/charts/selenium-grid/templates/patch-keda/patch-keda-objects-cm.yaml b/charts/selenium-grid/templates/patch-keda/patch-keda-objects-cm.yaml
index 57b1c93cb..30ea4018c 100644
--- a/charts/selenium-grid/templates/patch-keda/patch-keda-objects-cm.yaml
+++ b/charts/selenium-grid/templates/patch-keda/patch-keda-objects-cm.yaml
@@ -13,9 +13,6 @@ metadata:
     app: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
     app.kubernetes.io/name: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
     {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
-  {{- with $.Values.customLabels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 data:
 {{- if $.Values.autoscaling.patchObjectFinalizers.deleteObjectsScript }}
   deleteObjectsScript.sh: {{- toYaml $.Values.autoscaling.patchObjectFinalizers.deleteObjectsScript | nindent 4 }}
diff --git a/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml b/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml
index f4e962260..343e53358 100644
--- a/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml
+++ b/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml
@@ -13,9 +13,6 @@ metadata:
     app: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
     app.kubernetes.io/name: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
     {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
-  {{- with $.Values.customLabels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   template:
     metadata:
diff --git a/charts/selenium-grid/templates/patch-keda/rbac-role.yaml b/charts/selenium-grid/templates/patch-keda/rbac-role.yaml
index 131a0079f..e33a7afd4 100644
--- a/charts/selenium-grid/templates/patch-keda/rbac-role.yaml
+++ b/charts/selenium-grid/templates/patch-keda/rbac-role.yaml
@@ -11,9 +11,6 @@ metadata:
   labels:
     deploymentName: {{ template "seleniumGrid.rbac.role.fullname" $ }}
     {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 {{- with $.Values.rbacRole.rules }}
 rules:
   {{- toYaml . | nindent 2 }}
diff --git a/charts/selenium-grid/templates/patch-keda/rbac-rolebinding.yaml b/charts/selenium-grid/templates/patch-keda/rbac-rolebinding.yaml
index 6e5592401..63030a056 100644
--- a/charts/selenium-grid/templates/patch-keda/rbac-rolebinding.yaml
+++ b/charts/selenium-grid/templates/patch-keda/rbac-rolebinding.yaml
@@ -12,9 +12,6 @@ metadata:
     app: {{ template "seleniumGrid.rbac.roleBinding.fullname" $ }}
     app.kubernetes.io/name: {{ template "seleniumGrid.rbac.roleBinding.fullname" $ }}
     {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 subjects:
   - kind: ServiceAccount
     name: {{ default (include "seleniumGrid.serviceAccount.fullname" $) $.Values.autoscaling.patchObjectFinalizers.serviceAccount }}
diff --git a/charts/selenium-grid/templates/recorder-configmap.yaml b/charts/selenium-grid/templates/recorder-configmap.yaml
index d2b2dbe51..b37899e54 100644
--- a/charts/selenium-grid/templates/recorder-configmap.yaml
+++ b/charts/selenium-grid/templates/recorder-configmap.yaml
@@ -8,10 +8,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
   SE_VIDEO_UPLOAD_ENABLED: '{{ default "false" .Values.videoRecorder.uploader.enabled }}'
   SE_VIDEO_FILE_NAME: 'auto'
diff --git a/charts/selenium-grid/templates/relay-node-deployment.yaml b/charts/selenium-grid/templates/relay-node-deployment.yaml
index 54f8c1d22..937ba7ff2 100644
--- a/charts/selenium-grid/templates/relay-node-deployment.yaml
+++ b/charts/selenium-grid/templates/relay-node-deployment.yaml
@@ -13,9 +13,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $nodeConfig $.Values.global.seleniumGrid) }}
diff --git a/charts/selenium-grid/templates/relay-node-hpa.yaml b/charts/selenium-grid/templates/relay-node-hpa.yaml
index 43c733760..26ed974a1 100644
--- a/charts/selenium-grid/templates/relay-node-hpa.yaml
+++ b/charts/selenium-grid/templates/relay-node-hpa.yaml
@@ -17,9 +17,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- $podScope := deepCopy $ -}}
   {{- $_ := set $podScope "name" (include "seleniumGrid.relayNode.fullname" (list $nodeConfig $)) -}}
diff --git a/charts/selenium-grid/templates/relay-node-scaledjobs.yaml b/charts/selenium-grid/templates/relay-node-scaledjobs.yaml
index 5a5aaa0d8..0a40acb1a 100644
--- a/charts/selenium-grid/templates/relay-node-scaledjobs.yaml
+++ b/charts/selenium-grid/templates/relay-node-scaledjobs.yaml
@@ -20,9 +20,6 @@ metadata:
     {{- with $nodeConfig.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with $.Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- $podScope := deepCopy $ -}}
   {{- $_ := set $podScope "name" (include "seleniumGrid.relayNode.fullname" (list $nodeConfig $)) -}}
diff --git a/charts/selenium-grid/templates/router-configmap.yaml b/charts/selenium-grid/templates/router-configmap.yaml
index 54f3223a9..7e317154b 100644
--- a/charts/selenium-grid/templates/router-configmap.yaml
+++ b/charts/selenium-grid/templates/router-configmap.yaml
@@ -7,10 +7,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
   ROUTER_CONFIG_DIRECTORY: '{{ $.Values.routerConfigMap.extraScriptsDirectory }}'
 {{- $fileProceeded := list -}}
diff --git a/charts/selenium-grid/templates/router-deployment.yaml b/charts/selenium-grid/templates/router-deployment.yaml
index f2b519875..18e085cc9 100644
--- a/charts/selenium-grid/templates/router-deployment.yaml
+++ b/charts/selenium-grid/templates/router-deployment.yaml
@@ -7,10 +7,7 @@ metadata:
   labels: &router_labels
     app: {{ template "seleniumGrid.router.fullname" . }}
     app.kubernetes.io/name: {{ template "seleniumGrid.router.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $.Values.components.router $.Values.global.seleniumGrid) }}
@@ -47,6 +44,8 @@ spec:
                   fieldPath: status.hostIP
             - name: SE_OTEL_SERVICE_NAME
               value: '{{ template "seleniumGrid.router.fullname" . }}'
+            - name: SE_OTEL_RESOURCE_ATTRIBUTES
+              value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
             - name: SE_ROUTER_HOST
               valueFrom:
                 fieldRef:
diff --git a/charts/selenium-grid/templates/router-service.yaml b/charts/selenium-grid/templates/router-service.yaml
index 24b681ba0..077c4cb93 100644
--- a/charts/selenium-grid/templates/router-service.yaml
+++ b/charts/selenium-grid/templates/router-service.yaml
@@ -6,10 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "seleniumGrid.router.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 {{- with .Values.components.router.serviceAnnotations }}
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/secrets.yaml b/charts/selenium-grid/templates/secrets.yaml
index b067a0c8e..b629854b9 100644
--- a/charts/selenium-grid/templates/secrets.yaml
+++ b/charts/selenium-grid/templates/secrets.yaml
@@ -8,10 +8,7 @@ metadata:
   name: {{ include "seleniumGrid.common.secrets.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 type: Opaque
 data:
   SE_NODE_GRID_URL: {{ include "seleniumGrid.url" $ | b64enc }}
diff --git a/charts/selenium-grid/templates/server-configmap.yaml b/charts/selenium-grid/templates/server-configmap.yaml
index 9a2ac7326..b510a3f99 100644
--- a/charts/selenium-grid/templates/server-configmap.yaml
+++ b/charts/selenium-grid/templates/server-configmap.yaml
@@ -7,10 +7,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
   SE_SERVER_PROTOCOL: {{ include "seleniumGrid.server.protocol" . | quote }}
 {{- if eq (include "seleniumGrid.server.secureConnection" $) "true" }}
diff --git a/charts/selenium-grid/templates/serviceaccount.yaml b/charts/selenium-grid/templates/serviceaccount.yaml
index 9b6691809..1d0df766b 100644
--- a/charts/selenium-grid/templates/serviceaccount.yaml
+++ b/charts/selenium-grid/templates/serviceaccount.yaml
@@ -6,10 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: selenium-service-account
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/selenium-grid/templates/session-map-configmap.yaml b/charts/selenium-grid/templates/session-map-configmap.yaml
index b3c4261c5..d3a020d9c 100644
--- a/charts/selenium-grid/templates/session-map-configmap.yaml
+++ b/charts/selenium-grid/templates/session-map-configmap.yaml
@@ -8,10 +8,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
 {{- if .Values.components.sessionMap.externalDatastore.enabled }}
   SE_SESSIONS_MAP_EXTERNAL_DATASTORE: "true"
diff --git a/charts/selenium-grid/templates/session-map-deployment.yaml b/charts/selenium-grid/templates/session-map-deployment.yaml
index 4ed214f4d..d8231d96a 100644
--- a/charts/selenium-grid/templates/session-map-deployment.yaml
+++ b/charts/selenium-grid/templates/session-map-deployment.yaml
@@ -7,10 +7,7 @@ metadata:
   labels: &session_map_labels
     app: {{ template "seleniumGrid.sessionMap.fullname" . }}
     app.kubernetes.io/name: {{ template "seleniumGrid.sessionMap.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $.Values.components.sessionMap $.Values.global.seleniumGrid) }}
@@ -47,6 +44,8 @@ spec:
                   fieldPath: status.hostIP
             - name: SE_OTEL_SERVICE_NAME
               value: '{{ template "seleniumGrid.sessionMap.fullname" . }}'
+            - name: SE_OTEL_RESOURCE_ATTRIBUTES
+              value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
             - name: SE_SESSIONS_MAP_HOST
               valueFrom:
                 fieldRef:
diff --git a/charts/selenium-grid/templates/session-map-service.yaml b/charts/selenium-grid/templates/session-map-service.yaml
index 293c91178..b1abd471c 100644
--- a/charts/selenium-grid/templates/session-map-service.yaml
+++ b/charts/selenium-grid/templates/session-map-service.yaml
@@ -6,10 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "seleniumGrid.sessionMap.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 {{- with .Values.components.sessionMap.serviceAnnotations }}
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/session-queue-configmap.yaml b/charts/selenium-grid/templates/session-queue-configmap.yaml
index 7d029920c..a1bfc88cd 100644
--- a/charts/selenium-grid/templates/session-queue-configmap.yaml
+++ b/charts/selenium-grid/templates/session-queue-configmap.yaml
@@ -8,10 +8,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
 {{- range $key, $value := $.Values.sessionQueueConfigMap.data }}
   {{ $key }}: {{ tpl $value $ | quote }}
diff --git a/charts/selenium-grid/templates/session-queue-deployment.yaml b/charts/selenium-grid/templates/session-queue-deployment.yaml
index 337ff90b5..c19cdf1c9 100644
--- a/charts/selenium-grid/templates/session-queue-deployment.yaml
+++ b/charts/selenium-grid/templates/session-queue-deployment.yaml
@@ -7,10 +7,7 @@ metadata:
   labels: &session_queue_labels
     app: {{ template "seleniumGrid.sessionQueue.fullname" . }}
     app.kubernetes.io/name: {{ template "seleniumGrid.sessionQueue.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $.Values.components.sessionQueue $.Values.global.seleniumGrid) }}
@@ -46,6 +43,8 @@ spec:
                   fieldPath: status.hostIP
             - name: SE_OTEL_SERVICE_NAME
               value: '{{ template "seleniumGrid.sessionQueue.fullname" . }}'
+            - name: SE_OTEL_RESOURCE_ATTRIBUTES
+              value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
             - name: SE_SESSION_QUEUE_HOST
               valueFrom:
                 fieldRef:
diff --git a/charts/selenium-grid/templates/session-queue-service.yaml b/charts/selenium-grid/templates/session-queue-service.yaml
index 8221608b7..9c88a4c80 100644
--- a/charts/selenium-grid/templates/session-queue-service.yaml
+++ b/charts/selenium-grid/templates/session-queue-service.yaml
@@ -6,10 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "seleniumGrid.sessionQueue.fullname" . }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 {{- with .Values.components.sessionQueue.serviceAnnotations }}
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/tls-cert-secret.yaml b/charts/selenium-grid/templates/tls-cert-secret.yaml
index cc26ca0a7..4e2c80a29 100644
--- a/charts/selenium-grid/templates/tls-cert-secret.yaml
+++ b/charts/selenium-grid/templates/tls-cert-secret.yaml
@@ -7,10 +7,7 @@ metadata:
   name: {{ include "seleniumGrid.tls.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 type: kubernetes.io/tls
 data:
 {{- if and (eq (include "seleniumGrid.ingress.secureConnection" $) "true") $.Values.tls.ingress.generateTLS }}
diff --git a/charts/selenium-grid/templates/uploader-configmap.yaml b/charts/selenium-grid/templates/uploader-configmap.yaml
index 7e0bdbd5b..0a582bee2 100644
--- a/charts/selenium-grid/templates/uploader-configmap.yaml
+++ b/charts/selenium-grid/templates/uploader-configmap.yaml
@@ -8,10 +8,7 @@ metadata:
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 data:
 {{- with .Values.uploaderConfigMap.extraScriptsDirectory }}
   UPLOAD_CONFIG_DIRECTORY: '{{ . }}'
diff --git a/charts/selenium-grid/templates/video-manager/file-browser-deployment.yaml b/charts/selenium-grid/templates/video-manager/file-browser-deployment.yaml
index d3aaafb96..ded181244 100644
--- a/charts/selenium-grid/templates/video-manager/file-browser-deployment.yaml
+++ b/charts/selenium-grid/templates/video-manager/file-browser-deployment.yaml
@@ -7,10 +7,7 @@ metadata:
   labels: &app_labels
     app: {{ template "seleniumGrid.videoManager.fullname" $ }}
     app.kubernetes.io/name: {{ template "seleniumGrid.videoManager.fullname" $ }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 spec:
   strategy:
     {{- template "seleniumGrid.updateStrategy" (list $.Values.videoManager $.Values.global.seleniumGrid) }}
diff --git a/charts/selenium-grid/templates/video-manager/file-browser-ingress.yaml b/charts/selenium-grid/templates/video-manager/file-browser-ingress.yaml
index 520456a29..b05a4a42e 100644
--- a/charts/selenium-grid/templates/video-manager/file-browser-ingress.yaml
+++ b/charts/selenium-grid/templates/video-manager/file-browser-ingress.yaml
@@ -10,10 +10,7 @@ metadata:
   name: {{ template "seleniumGrid.videoManager.fullname" $ }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
   {{- with .Values.videoManager.ingress.annotations }}
   annotations:
     {{- . | toYaml | nindent 4 }}
diff --git a/charts/selenium-grid/templates/video-manager/file-browser-service.yaml b/charts/selenium-grid/templates/video-manager/file-browser-service.yaml
index 8a705ef0e..18196acf5 100644
--- a/charts/selenium-grid/templates/video-manager/file-browser-service.yaml
+++ b/charts/selenium-grid/templates/video-manager/file-browser-service.yaml
@@ -6,10 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "seleniumGrid.videoManager.fullname" $ }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
-    {{- with .Values.customLabels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
 {{- with .Values.videoManager.serviceAnnotations }}
   annotations: {{- toYaml . | nindent 4 }}
 {{- end }}
diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml
index 67278225b..127cd692b 100644
--- a/charts/selenium-grid/values.yaml
+++ b/charts/selenium-grid/values.yaml
@@ -2039,7 +2039,7 @@ videoRecorder:
     #       name: secret-name
     #       key: secret-key
 
-# -- Custom labels for k8s resources
+# -- Add more labels to all resources created by this chart or override existing label keys
 customLabels: {}
 
 videoManager:
diff --git a/tests/charts/refValues/simplex-docker-desktop.yaml b/tests/charts/refValues/simplex-docker-desktop.yaml
index 33ce7daa7..0ea2699e5 100644
--- a/tests/charts/refValues/simplex-docker-desktop.yaml
+++ b/tests/charts/refValues/simplex-docker-desktop.yaml
@@ -10,6 +10,9 @@ tls:
   ingress:
     enabled: true
 
+tracing:
+  enabled: true
+
 ingress:
   enableWithController: true
   annotations:
@@ -117,3 +120,8 @@ ingress-nginx:
     kind: DaemonSet
     service:
       type: LoadBalancer
+
+customLabels:
+  organization: "SeleniumHQ"
+  environment: "dev"
+