diff --git a/charts/argo/templates/ui-deployment.yaml b/charts/argo/templates/ui-deployment.yaml
index 31d998cd..7bd712c0 100644
--- a/charts/argo/templates/ui-deployment.yaml
+++ b/charts/argo/templates/ui-deployment.yaml
@@ -13,6 +13,9 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.ui.name}}
         release: {{ .Release.Name }}
+        {{- if .Values.ui.podLabels }}
+        {{- toYaml .Values.ui.podLabels | nindent 8 }}
+        {{- end }}
       {{- if .Values.ui.podAnnotations }}
       annotations:
 {{ toYaml .Values.ui.podAnnotations | indent 8}}{{- end }}
diff --git a/charts/argo/templates/ui-service.yaml b/charts/argo/templates/ui-service.yaml
index 5cd848cc..cb6d3e95 100644
--- a/charts/argo/templates/ui-service.yaml
+++ b/charts/argo/templates/ui-service.yaml
@@ -7,6 +7,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- if .Values.ui.serviceLabels }}
+    {{- toYaml .Values.ui.serviceLabels | nindent 4 }}
+    {{- end }}
   {{- if .Values.ui.serviceAnnotations }}
   annotations:
 {{ toYaml .Values.ui.serviceAnnotations | indent 4}}{{- end }}
diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml
index 69b5f8bc..5a19b5a2 100644
--- a/charts/argo/templates/workflow-controller-deployment.yaml
+++ b/charts/argo/templates/workflow-controller-deployment.yaml
@@ -13,6 +13,9 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.controller.name}}
         release: {{ .Release.Name }}
+        {{- if .Values.controller.podLabels }}
+        {{ toYaml .Values.controller.podLabels | nindent 8}}
+        {{- end }}
       {{- if .Values.controller.podAnnotations }}
       annotations:
 {{ toYaml .Values.controller.podAnnotations | indent 8}}{{- end }}
diff --git a/charts/argo/templates/workflow-controller-service.yaml b/charts/argo/templates/workflow-controller-service.yaml
index 5d4391de..e7ddf2b5 100644
--- a/charts/argo/templates/workflow-controller-service.yaml
+++ b/charts/argo/templates/workflow-controller-service.yaml
@@ -8,6 +8,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- if .Values.controller.serviceLabels }}
+    {{ toYaml .Values.controller.serviceLabels | nindent 4}}
+    {{- end }}
   {{- if .Values.controller.serviceAnnotations }}
   annotations:
 {{ toYaml .Values.controller.serviceAnnotations | indent 4}}{{- end }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 06ae465a..c124db6f 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -21,6 +21,8 @@ controller:
     tag: ""
   # podAnnotations is an optional map of annotations to be applied to the controller Pods
   podAnnotations: {}
+  # Optional labels to add to the controller pods
+  podLabels: {}
   metricsConfig:
     enabled: false
     path: /metrics
@@ -53,6 +55,8 @@ controller:
   telemetryServicePort: 8081
   # Annotations to be applied to the controller Service
   serviceAnnotations: {}
+  # Optional labels to add to the controller Service
+  serviceLabels: {}
   # Source ranges to allow access to service from. Only applies to
   # service type `LoadBalancer`
   loadBalancerSourceRanges: []
@@ -72,12 +76,16 @@ ui:
     tag: ""
   # optional map of annotations to be applied to the ui Pods
   podAnnotations: {}
+  # Optional labels to add to the UI pods
+  podLabels: {}
   name: ui
   serviceType: ClusterIP
   servicePort: 80
   serviceAccount: argo-ui
   # Annotations to be applied to the UI Service
   serviceAnnotations: {}
+  # Optional labels to add to the UI Service
+  serviceLabels: {}
   # Static IP address to assign to loadBalancer
   # service type `LoadBalancer`
   loadBalancerIP: ""