diff --git a/charts/airbyte-bootloader/templates/_helpers.tpl b/charts/airbyte-bootloader/templates/_helpers.tpl
index 4ced41c2f79cd..be2497a57d8b4 100644
--- a/charts/airbyte-bootloader/templates/_helpers.tpl
+++ b/charts/airbyte-bootloader/templates/_helpers.tpl
@@ -40,11 +40,6 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.extraLabels}}
-{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -53,11 +48,6 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.extraSelectorLabels}}
-{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml
index b2d3f90084108..4d3c518e1fbe1 100644
--- a/charts/airbyte-bootloader/templates/pod.yaml
+++ b/charts/airbyte-bootloader/templates/pod.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "airbyte.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraLabels .Values.global.extraLabels) | nindent 4 }}
+    {{- end }}
     {{- if .Values.podLabels }}
       {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 4 }}
     {{- end }}
diff --git a/charts/airbyte-cron/templates/_helpers.tpl b/charts/airbyte-cron/templates/_helpers.tpl
index 445a4833c3996..8c18f34c0e75f 100644
--- a/charts/airbyte-cron/templates/_helpers.tpl
+++ b/charts/airbyte-cron/templates/_helpers.tpl
@@ -40,11 +40,6 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.extraLabels}}
-{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -53,11 +48,6 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.extraSelectorLabels}}
-{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/airbyte-cron/templates/deployment.yaml b/charts/airbyte-cron/templates/deployment.yaml
index 470238eb8ea5a..d7bfca8ab87ce 100644
--- a/charts/airbyte-cron/templates/deployment.yaml
+++ b/charts/airbyte-cron/templates/deployment.yaml
@@ -4,11 +4,17 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "airbyte.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraLabels .Values.global.extraLabels) | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   selector:
     matchLabels:
       {{- include "airbyte.selectorLabels" . | nindent 6 }}
+      {{- if .Values.extraSelectorLabels }}
+      {{ toYaml (mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels) | nindent 6 }}
+      {{- end }}
   template:
     metadata:
       labels:
diff --git a/charts/airbyte-server/templates/_helpers.tpl b/charts/airbyte-server/templates/_helpers.tpl
index cde1d7ffbdc24..e73a70e89a8b4 100644
--- a/charts/airbyte-server/templates/_helpers.tpl
+++ b/charts/airbyte-server/templates/_helpers.tpl
@@ -40,11 +40,6 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.extraLabels}}
-{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -53,11 +48,6 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.extraSelectorLabels}}
-{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml
index 88d5a588ebcc6..d206b5ee449c2 100644
--- a/charts/airbyte-server/templates/deployment.yaml
+++ b/charts/airbyte-server/templates/deployment.yaml
@@ -5,11 +5,17 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "airbyte.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraLabels .Values.global.extraLabels) | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "airbyte.selectorLabels" . | nindent 6 }}
+      {{- if .Values.extraSelectorLabels }}
+      {{ toYaml (mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels) | nindent 6 }}
+      {{- end }}
   strategy:
     type: Recreate # Needed due to volume claims
   template:
diff --git a/charts/airbyte-server/templates/service.yaml b/charts/airbyte-server/templates/service.yaml
index 5078c58de2413..d2d8d9b96bf82 100644
--- a/charts/airbyte-server/templates/service.yaml
+++ b/charts/airbyte-server/templates/service.yaml
@@ -18,3 +18,6 @@ spec:
     name: http
   selector:
     {{- include "airbyte.selectorLabels" . | nindent 4 }}
+    {{- if .Values.extraSelectorLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels) | nindent 4 }}
+    {{- end }}
diff --git a/charts/airbyte-temporal/templates/_helpers.tpl b/charts/airbyte-temporal/templates/_helpers.tpl
index 5c0021698eb51..847ec7b4ddc50 100644
--- a/charts/airbyte-temporal/templates/_helpers.tpl
+++ b/charts/airbyte-temporal/templates/_helpers.tpl
@@ -40,11 +40,6 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.extraLabels}}
-{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -53,11 +48,6 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.extraSelectorLabels}}
-{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/airbyte-temporal/templates/deployment.yaml b/charts/airbyte-temporal/templates/deployment.yaml
index 560f0280d84cd..9b578fb5e7f37 100644
--- a/charts/airbyte-temporal/templates/deployment.yaml
+++ b/charts/airbyte-temporal/templates/deployment.yaml
@@ -5,11 +5,17 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "airbyte.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraLabels .Values.global.extraLabels) | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "airbyte.selectorLabels" . | nindent 6 }}
+      {{- if .Values.extraLabels }}
+      {{ toYaml (mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels) | nindent 4 }}
+      {{- end }}
   template:
     metadata:
       labels:
diff --git a/charts/airbyte-temporal/templates/service.yaml b/charts/airbyte-temporal/templates/service.yaml
index 5e4e0dc79e9dc..39f1363219c65 100644
--- a/charts/airbyte-temporal/templates/service.yaml
+++ b/charts/airbyte-temporal/templates/service.yaml
@@ -13,3 +13,6 @@ spec:
     targetPort: 7233
   selector:
     {{- include "airbyte.selectorLabels" . | nindent 4 }}
+    {{- if .Values.extraSelectorLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels) | nindent 4 }}
+    {{- end }}
diff --git a/charts/airbyte-webapp/templates/_helpers.tpl b/charts/airbyte-webapp/templates/_helpers.tpl
index 7f7a4f29e1700..01b8f68a7baee 100644
--- a/charts/airbyte-webapp/templates/_helpers.tpl
+++ b/charts/airbyte-webapp/templates/_helpers.tpl
@@ -40,11 +40,6 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.extraLabels}}
-{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -53,11 +48,6 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.extraSelectorLabels}}
-{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 
diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
index 55710ae82e5f0..8e5424bd03195 100644
--- a/charts/airbyte-webapp/templates/deployment.yaml
+++ b/charts/airbyte-webapp/templates/deployment.yaml
@@ -5,11 +5,17 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "airbyte.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraLabels .Values.global.extraLabels) | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "airbyte.selectorLabels" . | nindent 6 }}
+      {{- if .Values.extraSelectorLabels }}
+      {{ toYaml (mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels) | nindent 6 }}
+      {{- end }}
   template:
     metadata:
       labels:
diff --git a/charts/airbyte-webapp/templates/service.yaml b/charts/airbyte-webapp/templates/service.yaml
index 532b4001572fa..b5dcb061636f7 100644
--- a/charts/airbyte-webapp/templates/service.yaml
+++ b/charts/airbyte-webapp/templates/service.yaml
@@ -18,6 +18,9 @@ spec:
     name: http
   selector:
     {{- include "airbyte.selectorLabels" . | nindent 4 }}
+    {{- if .Values.extraSelectorLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels) | nindent 4 }}
+    {{- end }}
   {{- if .Values.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.service.loadBalancerIP }}
   {{- end }}
diff --git a/charts/airbyte-worker/templates/_helpers.tpl b/charts/airbyte-worker/templates/_helpers.tpl
index d2b9f7a80b396..76691fe5b233f 100644
--- a/charts/airbyte-worker/templates/_helpers.tpl
+++ b/charts/airbyte-worker/templates/_helpers.tpl
@@ -40,11 +40,6 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.extraLabels}}
-{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -53,11 +48,6 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Values.extraSelectorLabels}}
-{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
-{{ toYaml .}}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml
index ea026012ad735..e4a59507d0cbe 100644
--- a/charts/airbyte-worker/templates/deployment.yaml
+++ b/charts/airbyte-worker/templates/deployment.yaml
@@ -5,11 +5,17 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "airbyte.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels }}
+    {{ toYaml (mergeOverwrite .Values.extraLabels .Values.global.extraLabels) | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "airbyte.selectorLabels" . | nindent 6 }}
+      {{- if .Values.extraSelectorLabels }}
+      {{ toYaml (mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels) | nindent 6 }}
+      {{- end }}
   template:
     metadata:
       labels: