diff --git a/charts/argo/templates/ui-service.yaml b/charts/argo/templates/ui-service.yaml
index cb6d3e95..5f84e246 100644
--- a/charts/argo/templates/ui-service.yaml
+++ b/charts/argo/templates/ui-service.yaml
@@ -16,6 +16,9 @@ metadata:
 spec:
   ports:
   - port: {{ .Values.ui.servicePort }}
+    {{- if .Values.ui.servicePortName }}
+    name: {{ .Values.ui.servicePortName }}
+    {{- end }}
     protocol: TCP
     targetPort: 8001
   selector:
diff --git a/charts/argo/templates/workflow-controller-service.yaml b/charts/argo/templates/workflow-controller-service.yaml
index e7ddf2b5..7985a54c 100644
--- a/charts/argo/templates/workflow-controller-service.yaml
+++ b/charts/argo/templates/workflow-controller-service.yaml
@@ -17,13 +17,13 @@ metadata:
 spec:
   ports:
   {{- if .Values.controller.metricsConfig.enabled }}
-  - name: metrics
+  - name: {{ .Values.controller.metricsServicePortName }}
     port: {{ .Values.controller.metricsServicePort }}
     protocol: TCP
     targetPort: {{ .Values.controller.metricsConfig.port }}
   {{- end }}
   {{- if .Values.controller.telemetryConfig.enabled }}
-  - name: telemetry
+  - name: {{ .Values.controller.telemetryServicePortName }}
     port: {{ .Values.controller.telemetryServicePort }}
     protocol: TCP
     targetPort: {{ .Values.controller.telemetryConfig.port }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index c124db6f..500ec06c 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -52,7 +52,9 @@ controller:
     globallevel: "0"
   serviceType: ClusterIP
   metricsServicePort: 8080
+  metricsServicePortName: metrics
   telemetryServicePort: 8081
+  telemetryServicePortName: telemetry
   # Annotations to be applied to the controller Service
   serviceAnnotations: {}
   # Optional labels to add to the controller Service
@@ -81,6 +83,7 @@ ui:
   name: ui
   serviceType: ClusterIP
   servicePort: 80
+  # servicePortName: http
   serviceAccount: argo-ui
   # Annotations to be applied to the UI Service
   serviceAnnotations: {}