diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml
index 3db454b..b7349e6 100644
--- a/charts/retool/Chart.yaml
+++ b/charts/retool/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.0.17
+version: 6.0.18
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com
diff --git a/charts/retool/templates/deployment_code_executor.yaml b/charts/retool/templates/deployment_code_executor.yaml
index 340cb9f..0b498f2 100644
--- a/charts/retool/templates/deployment_code_executor.yaml
+++ b/charts/retool/templates/deployment_code_executor.yaml
@@ -18,10 +18,6 @@ spec:
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   template:
     metadata:
-      annotations:
-        prometheus.io/job: {{ template "retool.codeExecutor.name" . }}
-        prometheus.io/scrape: 'true'
-        prometheus.io/port: '9090'
 {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
 {{- end }}
@@ -83,10 +79,11 @@ spec:
           {{- end }}
         ports:
         - containerPort: 3004
+          {{ if .Values.codeExecutor.portName }}
+          name: {{ .Values.codeExecutor.portName }}
+          {{ else }}
           name: {{ template "retool.name" . }}
-          protocol: TCP
-        - containerPort: 9090
-          name: metrics
+          {{ end }}
           protocol: TCP
 {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -137,9 +134,9 @@ spec:
   - protocol: TCP
     port: 80
     targetPort: 3004
+    {{ if .Values.codeExecutor.portName }}
+    name: {{ .Values.codeExecutor.portName }}
+    {{ else }}
     name: {{ template "retool.name" . }}
-  - protocol: TCP
-    port: 9090
-    targetPort: metrics
-    name: metrics
+    {{ end }}
 {{- end }}
diff --git a/charts/retool/templates/deployment_workflows.yaml b/charts/retool/templates/deployment_workflows.yaml
index fae6243..b6cf6c4 100644
--- a/charts/retool/templates/deployment_workflows.yaml
+++ b/charts/retool/templates/deployment_workflows.yaml
@@ -217,7 +217,11 @@ spec:
         {{- end }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}
+          {{ if .Values.workflows.backend.portName }}
+          name: {{ .Values.workflows.backend.portName }}
+          {{ else }}
           name: {{ template "retool.name" . }}
+          {{ end }}
           protocol: TCP
 {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -314,4 +318,9 @@ spec:
   - protocol: TCP
     port: 80
     targetPort: {{ .Values.service.internalPort }}
+    {{ if .Values.workflows.backend.portName }}
+    name: {{ .Values.workflows.backend.portName }}
+    {{ else }}
+    name: {{ template "retool.name" . }}
+    {{ end }}
 {{- end }}
diff --git a/charts/retool/templates/deployment_workflows_worker.yaml b/charts/retool/templates/deployment_workflows_worker.yaml
index cafe370..867fc28 100644
--- a/charts/retool/templates/deployment_workflows_worker.yaml
+++ b/charts/retool/templates/deployment_workflows_worker.yaml
@@ -236,10 +236,14 @@ spec:
         {{- end }}
         ports:
         - containerPort: 3005
+          {{ if .Values.workflows.worker.portName }}
+          name: {{ .Values.workflows.worker.portName }}
+          {{ else }}
           name: {{ template "retool.name" . }}
+          {{ end }}
           protocol: TCP
         - containerPort: 9090
-          name: metrics
+          name: {{ .Values.workflows.worker.metricsPortName | default "metrics" }}
           protocol: TCP
 
 {{- if .Values.livenessProbe.enabled }}
@@ -336,9 +340,13 @@ spec:
   - protocol: TCP
     port: 3005
     targetPort: 3005
+    {{ if .Values.workflows.worker.portName }}
+    name: {{ .Values.workflows.worker.portName }}
+    {{ else }}
     name: {{ template "retool.name" . }}
+    {{ end }}
   - protocol: TCP
     port: 9090
-    targetPort: metrics
-    name: metrics
+    targetPort: {{ .Values.workflows.worker.metricsPortName | default "metrics" }}
+    name: {{ .Values.workflows.worker.metricsPortName | default "metrics" }}
 {{- end }}
diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index 93a7857..777b076 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -329,12 +329,15 @@ workflows:
     # Scaling this number will increase the number of workflow workers, e.g. a replicaCount of 4
     # will launch 9 pods -- 1 workflow backend, 4 workflow workers, and 4 for temporal cluster
     replicaCount: 1
+    # portName: custom-port-name, e.g. http-workflows-worker; defaults to "retool.name"
+    # metricsPortName: custom-port-name, e.g. http-workflows-worker-metrics; defaults to "metrics"
 
   backend:
     # A replicaCount of 1 will launch 6 pods -- 1 workflow backend, 1 workflow worker, and 4 pods that make up the executor temporal cluster
     # Scaling this number will increase the number of workflow backends, e.g. a replicaCount of 4
     # will launch 9 pods -- 4 workflow backend, 1 workflow workers, and 4 for temporal cluster
     replicaCount: 1
+    # portName: custom-port-name, e.g. http-workflows-backend; defaults to "retool.name"
 
   # Timeout for queries, in ms. This will set the timeout for workflows-related pods only
   # If this value is not set but config.dbConnectorTimeout is, we will set workflows pod timeouts
@@ -452,6 +455,8 @@ codeExecutor:
     # tag:
     pullPolicy: IfNotPresent
 
+  # portName: custom-port-name, e.g. http-code-executor; defaults to "retool.name"
+
 retool-temporal-services-helm:
   # Enable to spin up a new Temporal Cluster alongside Retool
   enabled: false
diff --git a/values.yaml b/values.yaml
index 93a7857..777b076 100644
--- a/values.yaml
+++ b/values.yaml
@@ -329,12 +329,15 @@ workflows:
     # Scaling this number will increase the number of workflow workers, e.g. a replicaCount of 4
     # will launch 9 pods -- 1 workflow backend, 4 workflow workers, and 4 for temporal cluster
     replicaCount: 1
+    # portName: custom-port-name, e.g. http-workflows-worker; defaults to "retool.name"
+    # metricsPortName: custom-port-name, e.g. http-workflows-worker-metrics; defaults to "metrics"
 
   backend:
     # A replicaCount of 1 will launch 6 pods -- 1 workflow backend, 1 workflow worker, and 4 pods that make up the executor temporal cluster
     # Scaling this number will increase the number of workflow backends, e.g. a replicaCount of 4
     # will launch 9 pods -- 4 workflow backend, 1 workflow workers, and 4 for temporal cluster
     replicaCount: 1
+    # portName: custom-port-name, e.g. http-workflows-backend; defaults to "retool.name"
 
   # Timeout for queries, in ms. This will set the timeout for workflows-related pods only
   # If this value is not set but config.dbConnectorTimeout is, we will set workflows pod timeouts
@@ -452,6 +455,8 @@ codeExecutor:
     # tag:
     pullPolicy: IfNotPresent
 
+  # portName: custom-port-name, e.g. http-code-executor; defaults to "retool.name"
+
 retool-temporal-services-helm:
   # Enable to spin up a new Temporal Cluster alongside Retool
   enabled: false