diff --git a/charts/sourcegraph-executor/dind/templates/executor/executor.Deployment.yaml b/charts/sourcegraph-executor/dind/templates/executor/executor.Deployment.yaml
index ab058fab..9570283d 100644
--- a/charts/sourcegraph-executor/dind/templates/executor/executor.Deployment.yaml
+++ b/charts/sourcegraph-executor/dind/templates/executor/executor.Deployment.yaml
@@ -51,20 +51,20 @@ spec:
           livenessProbe:
             httpGet:
               path: /healthz
-              port: debug
+              port: http-debug
               scheme: HTTP
             initialDelaySeconds: 60
             timeoutSeconds: 5
           readinessProbe:
             httpGet:
               path: /ready
-              port: debug
+              port: http-debug
               scheme: HTTP
             periodSeconds: 5
             timeoutSeconds: 5
           ports:
-            - containerPort: 6060
-              name: debug
+            - name: http-debug
+              containerPort: 6060
           terminationMessagePolicy: FallbackToLogsOnError
           env:
             {{- range $name, $item := .Values.executor.env }}
diff --git a/charts/sourcegraph-executor/dind/templates/executor/executor.Service.yaml b/charts/sourcegraph-executor/dind/templates/executor/executor.Service.yaml
index 579af804..970de1a9 100644
--- a/charts/sourcegraph-executor/dind/templates/executor/executor.Service.yaml
+++ b/charts/sourcegraph-executor/dind/templates/executor/executor.Service.yaml
@@ -16,9 +16,9 @@ metadata:
   name: executor
 spec:
   ports:
-    - name: debug
+    - name: http-debug
       port: 6060
-      targetPort: debug
+      targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: {{include "executor.name" . }}
diff --git a/charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Deployment.yaml b/charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Deployment.yaml
index eba01538..257dae57 100644
--- a/charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Deployment.yaml
+++ b/charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Deployment.yaml
@@ -47,19 +47,19 @@ spec:
             - name: REGISTRY_PROXY_REMOTEURL
               value: http://registry-1.docker.io
           ports:
-            - containerPort: 5000
-              name: registry
+            - name: http
+              containerPort: 5000
           livenessProbe:
             httpGet:
               path: /
-              port: registry
+              port: http
               scheme: HTTP
             initialDelaySeconds: 5
             timeoutSeconds: 5
           readinessProbe:
             httpGet:
               path: /
-              port: registry
+              port: http
               scheme: HTTP
             periodSeconds: 5
             timeoutSeconds: 5
diff --git a/charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Service.yaml b/charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Service.yaml
index 35ff507b..356293ca 100644
--- a/charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Service.yaml
+++ b/charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Service.yaml
@@ -16,7 +16,7 @@ spec:
     - name: http
       port: 5000
       protocol: TCP
-      targetPort: 5000
+      targetPort: http
   selector:
     app: private-docker-registry
   type: ClusterIP
diff --git a/charts/sourcegraph-executor/k8s/templates/executor.Deployment.yaml b/charts/sourcegraph-executor/k8s/templates/executor.Deployment.yaml
index 635798c3..dd33bdf9 100644
--- a/charts/sourcegraph-executor/k8s/templates/executor.Deployment.yaml
+++ b/charts/sourcegraph-executor/k8s/templates/executor.Deployment.yaml
@@ -55,8 +55,8 @@ spec:
           securityContext:
             privileged: {{ .Values.executor.securityContext.privileged }}
           ports:
-            - containerPort: 6060
-              name: debug
+            - name: http-debug
+              containerPort: 6060
           envFrom:
             - configMapRef:
                 name: {{ include "executor.name" . }}
diff --git a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml
index e7b3c58b..33d841b3 100644
--- a/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml
+++ b/charts/sourcegraph-executor/k8s/templates/executor.Service.yaml
@@ -13,9 +13,9 @@ metadata:
   name: {{ include "executor.name" . }}
 spec:
   ports:
-  - name: debug
+  - name: http-debug
     port: 6060
-    targetPort: debug
+    targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: {{ include "executor.name" . }}
diff --git a/charts/sourcegraph/README.md b/charts/sourcegraph/README.md
index 5e917aa7..b30d4d0d 100644
--- a/charts/sourcegraph/README.md
+++ b/charts/sourcegraph/README.md
@@ -195,7 +195,7 @@ In addition to the documented values, all services also support the following va
 | openTelemetry.agent.containerSecurityContext.allowPrivilegeEscalation | bool | `false` |  |
 | openTelemetry.agent.containerSecurityContext.runAsGroup | int | `101` |  |
 | openTelemetry.agent.containerSecurityContext.runAsUser | int | `100` |  |
-| openTelemetry.agent.hostPorts | object | `{"otlpGrpc":4317,"otlpHttp":4318,"zpages":55679}` | Resource requests & limits for the `otel-agent` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
+| openTelemetry.agent.hostPorts | object | `{"grpcOtlp":4317,"httpOtlp":4318,"httpZpages":55679}` | Resource requests & limits for the `otel-agent` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
 | openTelemetry.agent.name | string | `"otel-agent"` | Name used by resources. Does not affect service names or PVCs. |
 | openTelemetry.agent.resources.limits.cpu | string | `"500m"` |  |
 | openTelemetry.agent.resources.limits.memory | string | `"500Mi"` |  |
diff --git a/charts/sourcegraph/templates/_helpers.tpl b/charts/sourcegraph/templates/_helpers.tpl
index caf8f0b5..c1671edd 100644
--- a/charts/sourcegraph/templates/_helpers.tpl
+++ b/charts/sourcegraph/templates/_helpers.tpl
@@ -175,7 +175,7 @@ app.kubernetes.io/name: jaeger
     fieldRef:
       fieldPath: status.hostIP
 - name: OTEL_EXPORTER_OTLP_ENDPOINT
-  value: http://$(OTEL_AGENT_HOST):{{ toYaml .Values.openTelemetry.agent.hostPorts.otlpGrpc }}
+  value: http://$(OTEL_AGENT_HOST):{{ toYaml .Values.openTelemetry.agent.hostPorts.grpcOtlp }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/sourcegraph/templates/_worker.tpl b/charts/sourcegraph/templates/_worker.tpl
index b824cc82..73c4b64a 100644
--- a/charts/sourcegraph/templates/_worker.tpl
+++ b/charts/sourcegraph/templates/_worker.tpl
@@ -1,7 +1,7 @@
 {{- define "sourcegraph.worker" -}}
 {{- $top := index . 0 }}
 {{- $suffix := index . 1 -}}
-{{- $allowlist := index . 2 -}} 
+{{- $allowlist := index . 2 -}}
 {{- $blocklist := index . 3 -}}
 {{- $resources := index . 4 -}}
 
@@ -100,24 +100,24 @@ spec:
         livenessProbe:
           httpGet:
             path: /healthz
-            port: debug
+            port: http-debug
             scheme: HTTP
           initialDelaySeconds: 60
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /ready
-            port: debug
+            port: http-debug
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
         ports:
-        - containerPort: 3189
-          name: http
-        - containerPort: 6060
-          name: debug
-        - containerPort: 6996
-          name: prom
+        - name: http
+          containerPort: 3189
+        - name: http-debug
+          containerPort: 6060
+        - name: http-debug-exec
+          containerPort: 6996
         {{- if not $top.Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml $resources | nindent 10 }}
diff --git a/charts/sourcegraph/templates/blobstore/blobstore.Deployment.yaml b/charts/sourcegraph/templates/blobstore/blobstore.Deployment.yaml
index 25dae8f3..08c87d9d 100644
--- a/charts/sourcegraph/templates/blobstore/blobstore.Deployment.yaml
+++ b/charts/sourcegraph/templates/blobstore/blobstore.Deployment.yaml
@@ -55,19 +55,19 @@ spec:
         args: {{- default (list "") .Values.blobstore.args | toYaml | nindent 8 }}
         terminationMessagePolicy: FallbackToLogsOnError
         ports:
-        - containerPort: 9000
-          name: blobstore
+        - name: http
+          containerPort: 9000
         livenessProbe:
           httpGet:
             path: /
-            port: blobstore
+            port: http
             scheme: HTTP
           initialDelaySeconds: 60
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /
-            port: blobstore
+            port: http
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
diff --git a/charts/sourcegraph/templates/blobstore/blobstore.Service.yaml b/charts/sourcegraph/templates/blobstore/blobstore.Service.yaml
index 81493aac..f5ca88cd 100644
--- a/charts/sourcegraph/templates/blobstore/blobstore.Service.yaml
+++ b/charts/sourcegraph/templates/blobstore/blobstore.Service.yaml
@@ -16,9 +16,9 @@ metadata:
   name: blobstore
 spec:
   ports:
-  - name: blobstore
+  - name: http
     port: 9000
-    targetPort: blobstore
+    targetPort: http
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: blobstore
diff --git a/charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml b/charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml
index fe3b65ad..40508fc6 100644
--- a/charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml
+++ b/charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml
@@ -22,9 +22,9 @@ spec:
     metadata:
       annotations:
         description: Collects and exports container metrics.
+        kubectl.kubernetes.io/default-container: cadvisor
         prometheus.io/port: "48080"
         sourcegraph.prometheus/scrape: "true"
-        kubectl.kubernetes.io/default-container: cadvisor
       {{- if .Values.sourcegraph.podAnnotations }}
       {{- toYaml .Values.sourcegraph.podAnnotations | nindent 8 }}
       {{- end }}
diff --git a/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.Service.yaml b/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.Service.yaml
index 8ad06da0..e071a6af 100644
--- a/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.Service.yaml
+++ b/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.Service.yaml
@@ -18,6 +18,9 @@ metadata:
   name: codeinsights-db
 spec:
   ports:
+  - name: http-metrics
+    port: 9187
+    targetPort: http-metrics
   - name: codeinsights-db
     port: 5432
     targetPort: codeinsights-db
diff --git a/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.StatefulSet.yaml b/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.StatefulSet.yaml
index eda2bcd6..d56a02a8 100644
--- a/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.StatefulSet.yaml
+++ b/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.StatefulSet.yaml
@@ -79,8 +79,8 @@ spec:
           value: "/conf"
         terminationMessagePolicy: FallbackToLogsOnError
         ports:
-        - containerPort: 5432
-          name: codeinsights-db
+        - name: codeinsights-db
+          containerPort: 5432
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.codeInsightsDB.resources | nindent 10 }}
@@ -97,7 +97,8 @@ spec:
         {{- if .Values.codeInsightsDB.extraVolumeMounts }}
         {{- toYaml .Values.codeInsightsDB.extraVolumeMounts | nindent 8 }}
         {{- end }}
-      - env:
+      - name: pgsql-exporter
+        env:
         {{- include "sourcegraph.dataSource" (list . "codeInsightsDB" ) | nindent 8 }}
         {{- range $name, $item := .Values.codeInsightsDB.postgresExporter.env}}
         - name: {{ $name }}
@@ -106,14 +107,16 @@ spec:
         - name: PG_EXPORTER_EXTEND_QUERY_PATH
           value: /config/code_insights_queries.yaml
         image: {{ include "sourcegraph.image" (list . "postgresExporter") }}
-        terminationMessagePolicy: FallbackToLogsOnError
-        name: pgsql-exporter
+        ports:
+        - name: http-metrics
+          containerPort: 9187
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.postgresExporter.resources | nindent 10 }}
         {{- end }}
         securityContext:
           {{- toYaml .Values.postgresExporter.containerSecurityContext | nindent 10 }}
+        terminationMessagePolicy: FallbackToLogsOnError
       {{- if .Values.codeInsightsDB.extraContainers }}
         {{- toYaml .Values.codeInsightsDB.extraContainers | nindent 6 }}
       {{- end }}
diff --git a/charts/sourcegraph/templates/codeintel-db/codeintel-db.Service.yaml b/charts/sourcegraph/templates/codeintel-db/codeintel-db.Service.yaml
index fbce429a..d2d9c445 100644
--- a/charts/sourcegraph/templates/codeintel-db/codeintel-db.Service.yaml
+++ b/charts/sourcegraph/templates/codeintel-db/codeintel-db.Service.yaml
@@ -18,6 +18,9 @@ metadata:
   name: codeintel-db
 spec:
   ports:
+  - name: http-metrics
+    port: 9187
+    targetPort: http-metrics
   - name: pgsql
     port: 5432
     targetPort: pgsql
diff --git a/charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml b/charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml
index 6ad34e74..accb0b3f 100644
--- a/charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml
+++ b/charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml
@@ -90,8 +90,8 @@ spec:
           failureThreshold: 360
           periodSeconds: 10
         ports:
-        - containerPort: 5432
-          name: pgsql
+        - name: pgsql
+          containerPort: 5432
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.codeIntelDB.resources | nindent 10 }}
@@ -111,7 +111,8 @@ spec:
       {{- if .Values.codeIntelDB.extraContainers }}
         {{- toYaml .Values.codeIntelDB.extraContainers | nindent 6 }}
       {{- end }}
-      - env:
+      - name: pgsql-exporter
+        env:
         {{- include "sourcegraph.dataSource" (list . "codeIntelDB" ) | nindent 8 }}
         {{- range $name, $item := .Values.codeIntelDB.postgresExporter.env}}
         - name: {{ $name }}
@@ -120,14 +121,16 @@ spec:
         - name: PG_EXPORTER_EXTEND_QUERY_PATH
           value: /config/code_intel_queries.yaml
         image: {{ include "sourcegraph.image" (list . "postgresExporter") }}
-        terminationMessagePolicy: FallbackToLogsOnError
-        name: pgsql-exporter
+        ports:
+        - name: http-metrics
+          containerPort: 9187
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.postgresExporter.resources | nindent 10 }}
         {{- end }}
         securityContext:
           {{- toYaml .Values.postgresExporter.containerSecurityContext | nindent 10 }}
+        terminationMessagePolicy: FallbackToLogsOnError
       terminationGracePeriodSeconds: 120
       securityContext:
         {{- toYaml .Values.codeIntelDB.podSecurityContext | nindent 8 }}
diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend-internal.Service.yaml b/charts/sourcegraph/templates/frontend/sourcegraph-frontend-internal.Service.yaml
index 9da16a6b..a9368c19 100644
--- a/charts/sourcegraph/templates/frontend/sourcegraph-frontend-internal.Service.yaml
+++ b/charts/sourcegraph/templates/frontend/sourcegraph-frontend-internal.Service.yaml
@@ -15,9 +15,9 @@ metadata:
   name: sourcegraph-frontend-internal
 spec:
   ports:
-  - name: http-internal
+  - name: grpc-internal
     port: 80
-    targetPort: http-internal
+    targetPort: grpc-internal
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: sourcegraph-frontend
diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml b/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml
index e2dad382..dd8f31a7 100644
--- a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml
+++ b/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml
@@ -107,24 +107,24 @@ spec:
         livenessProbe:
           httpGet:
             path: /healthz
-            port: debug
+            port: http-debug
             scheme: HTTP
           initialDelaySeconds: 300
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /ready
-            port: debug
+            port: http-debug
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
         ports:
-        - containerPort: 3080
-          name: http
-        - containerPort: 3090
-          name: http-internal
-        - containerPort: 6060
-          name: debug
+        - name: grpc-internal
+          containerPort: 3090
+        - name: http
+          containerPort: 3080
+        - name: http-debug
+          containerPort: 6060
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.frontend.resources | nindent 10 }}
diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Service.yaml b/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Service.yaml
index 826319de..1d64e7f2 100644
--- a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Service.yaml
+++ b/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Service.yaml
@@ -20,6 +20,9 @@ spec:
   - name: http
     port: 30080
     targetPort: http
+  - name: http-debug
+    port: 6060
+    targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: sourcegraph-frontend
diff --git a/charts/sourcegraph/templates/gitserver/gitserver.Service.yaml b/charts/sourcegraph/templates/gitserver/gitserver.Service.yaml
index f4997a96..16e4aecc 100644
--- a/charts/sourcegraph/templates/gitserver/gitserver.Service.yaml
+++ b/charts/sourcegraph/templates/gitserver/gitserver.Service.yaml
@@ -21,9 +21,12 @@ metadata:
 spec:
   clusterIP: None
   ports:
-  - name: unused
-    port: 10811
-    targetPort: 10811
+  - name: grpc
+    port: 3178
+    targetPort: grpc
+  - name: http-debug
+    port: 6060
+    targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: gitserver
diff --git a/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml b/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml
index cb856118..9620df24 100644
--- a/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml
+++ b/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml
@@ -61,17 +61,19 @@ spec:
         # pod because of a failed liveness probe, we give it 2 minutes to start up.
         startupProbe:
           tcpSocket:
-            port: rpc
+            port: grpc
           failureThreshold: 120
           periodSeconds: 1
         livenessProbe:
           initialDelaySeconds: 5
           tcpSocket:
-            port: rpc
+            port: grpc
           timeoutSeconds: 5
         ports:
-        - containerPort: 3178
-          name: rpc
+        - name: grpc
+          containerPort: 3178
+        - name: http-debug
+          containerPort: 6060
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.gitserver.resources | nindent 10 }}
diff --git a/charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml b/charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml
index 4d748bd0..da569d02 100644
--- a/charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml
+++ b/charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml
@@ -60,8 +60,8 @@ spec:
           {{- $item | toYaml | nindent 10 }}
         {{- end }}
         ports:
-        - containerPort: 3370
-          name: http
+        - name: http
+          containerPort: 3370
         volumeMounts:
         - mountPath: /var/lib/grafana
           name: grafana-data
diff --git a/charts/sourcegraph/templates/indexed-search/indexed-search.IndexerService.yaml b/charts/sourcegraph/templates/indexed-search/indexed-search.IndexerService.yaml
index 98fa5cf2..7a411503 100644
--- a/charts/sourcegraph/templates/indexed-search/indexed-search.IndexerService.yaml
+++ b/charts/sourcegraph/templates/indexed-search/indexed-search.IndexerService.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     description: Headless service that provides a stable network identity for the
       indexed-search stateful set.
-    sourcegraph.prometheus/scrape: "true"
     prometheus.io/port: "6072"
+    sourcegraph.prometheus/scrape: "true"
     {{- if .Values.indexedSearch.serviceAnnotations }}
     {{- toYaml .Values.indexedSearch.serviceAnnotations | nindent 4 }}
     {{- end }}
@@ -20,8 +20,9 @@ metadata:
 spec:
   clusterIP: None
   ports:
-    - port: 6072
-      targetPort: 6072
+  - name: grpc-indexer
+    port: 6072
+    targetPort: grpc-indexer
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: indexed-search
diff --git a/charts/sourcegraph/templates/indexed-search/indexed-search.Service.yaml b/charts/sourcegraph/templates/indexed-search/indexed-search.Service.yaml
index fe6da198..16e140ec 100644
--- a/charts/sourcegraph/templates/indexed-search/indexed-search.Service.yaml
+++ b/charts/sourcegraph/templates/indexed-search/indexed-search.Service.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     description: Headless service that provides a stable network identity for the
       indexed-search stateful set.
-    sourcegraph.prometheus/scrape: "true"
     prometheus.io/port: "6070"
+    sourcegraph.prometheus/scrape: "true"
     {{- if .Values.indexedSearch.serviceAnnotations }}
     {{- toYaml .Values.indexedSearch.serviceAnnotations | nindent 4 }}
     {{- end }}
@@ -20,7 +20,9 @@ metadata:
 spec:
   clusterIP: None
   ports:
-  - port: 6070
+  - name: grpc
+    port: 6070
+    targetPort: grpc
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: indexed-search
diff --git a/charts/sourcegraph/templates/indexed-search/indexed-search.StatefulSet.yaml b/charts/sourcegraph/templates/indexed-search/indexed-search.StatefulSet.yaml
index 67933633..cd2df9c9 100644
--- a/charts/sourcegraph/templates/indexed-search/indexed-search.StatefulSet.yaml
+++ b/charts/sourcegraph/templates/indexed-search/indexed-search.StatefulSet.yaml
@@ -61,13 +61,13 @@ spec:
           value: "false"
         {{- end }}
         ports:
-        - containerPort: 6070
-          name: http
+        - name: grpc
+          containerPort: 6070
         readinessProbe:
           failureThreshold: 3
           httpGet:
             path: /healthz
-            port: http
+            port: grpc
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
@@ -98,8 +98,8 @@ spec:
           value: "false"
         {{- end }}
         ports:
-        - containerPort: 6072
-          name: index-http
+        - name: grpc-indexer
+          containerPort: 6072
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.indexedSearchIndexer.resources | nindent 10 }}
diff --git a/charts/sourcegraph/templates/jaeger/jaeger-collector.Service.yaml b/charts/sourcegraph/templates/jaeger/jaeger-collector.Service.yaml
index 192b744d..7e6ac14b 100644
--- a/charts/sourcegraph/templates/jaeger/jaeger-collector.Service.yaml
+++ b/charts/sourcegraph/templates/jaeger/jaeger-collector.Service.yaml
@@ -17,18 +17,14 @@ metadata:
   name: {{ default "jaeger-collector" .Values.jaeger.collector.name }}
 spec:
   ports:
-  - name: jaeger-collector-tchannel
-    port: 14267
-    protocol: TCP
-    targetPort: 14267
-  - name: jaeger-collector-http
+  - name: http-collector
     port: 4321
     protocol: TCP
-    targetPort: 4321
-  - name: jaeger-collector-grpc
+    targetPort: http-collector
+  - name: grpc-collector
     port: 4320
     protocol: TCP
-    targetPort: 4320
+    targetPort: grpc-collector
   selector:
     {{- include "sourcegraph.jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/sourcegraph/templates/jaeger/jaeger-query.Service.yaml b/charts/sourcegraph/templates/jaeger/jaeger-query.Service.yaml
index 5bb6701f..223e9209 100644
--- a/charts/sourcegraph/templates/jaeger/jaeger-query.Service.yaml
+++ b/charts/sourcegraph/templates/jaeger/jaeger-query.Service.yaml
@@ -17,10 +17,10 @@ metadata:
   name: {{ default "jaeger-query" .Values.jaeger.query.name }}
 spec:
   ports:
-  - name: query-http
+  - name: http
     port: 16686
     protocol: TCP
-    targetPort: 16686
+    targetPort: http
   selector:
     {{- include "sourcegraph.jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml b/charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml
index 3733b57c..39a766da 100644
--- a/charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml
+++ b/charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml
@@ -27,9 +27,9 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io/scrape: "true"
-        prometheus.io/port: "16686"
         kubectl.kubernetes.io/default-container: jaeger
+        prometheus.io/port: "16686"
+        sourcegraph.prometheus/scrape: "true"
       {{- if .Values.sourcegraph.podAnnotations }}
       {{- toYaml .Values.sourcegraph.podAnnotations | nindent 8 }}
       {{- end }}
@@ -68,13 +68,16 @@ spec:
           protocol: UDP
         - containerPort: 5778
           protocol: TCP
-        - containerPort: 16686
-          protocol: TCP
         - containerPort: 14250
           protocol: TCP
-        - containerPort: 4320
+        - name: grpc-collector
+          containerPort: 4320
+          protocol: TCP
+        - name: http-collector
+          containerPort: 4321
           protocol: TCP
-        - containerPort: 4321
+        - name: http
+          containerPort: 16686
           protocol: TCP
         readinessProbe:
           httpGet:
diff --git a/charts/sourcegraph/templates/node-exporter/node-exporter.Service.yaml b/charts/sourcegraph/templates/node-exporter/node-exporter.Service.yaml
index aa33cd9d..ce747c46 100644
--- a/charts/sourcegraph/templates/node-exporter/node-exporter.Service.yaml
+++ b/charts/sourcegraph/templates/node-exporter/node-exporter.Service.yaml
@@ -4,9 +4,9 @@ kind: Service
 metadata:
   annotations:
     description: Prometheus exporter for hardware and OS metrics.
-    url: https://github.com/prometheus/node_exporter
     prometheus.io/port: "9100"
     sourcegraph.prometheus/scrape: "true"
+    url: https://github.com/prometheus/node_exporter
     {{- if .Values.nodeExporter.serviceAnnotations }}
     {{- toYaml .Values.nodeExporter.serviceAnnotations | nindent 4 }}
     {{- end }}
diff --git a/charts/sourcegraph/templates/otel-collector/otel-agent.DaemonSet.yaml b/charts/sourcegraph/templates/otel-collector/otel-agent.DaemonSet.yaml
index ca03f26f..3efd5b1c 100644
--- a/charts/sourcegraph/templates/otel-collector/otel-agent.DaemonSet.yaml
+++ b/charts/sourcegraph/templates/otel-collector/otel-agent.DaemonSet.yaml
@@ -69,15 +69,15 @@ spec:
             path: /
             port: 13133
         ports:
-          - containerPort: 55679
-            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.zpages }}
-            name: zpages
-          - containerPort: 4317
-            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.otlpGrpc }}
-            name: otlp-grpc
-          - containerPort: 4318
-            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.otlpHttp }}
-            name: otlp-http
+          - name: grpc-otlp
+            containerPort: 4317
+            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.grpcOtlp }}
+          - name: http-otlp
+            containerPort: 4318
+            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.httpOtlp }}
+          - name: http-zpages
+            containerPort: 55679
+            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.httpZpages }}
         volumeMounts:
           - name: config
             mountPath: /etc/otel-agent
diff --git a/charts/sourcegraph/templates/otel-collector/otel-collector.Deployment.yaml b/charts/sourcegraph/templates/otel-collector/otel-collector.Deployment.yaml
index 9b3f6da2..47896c1b 100644
--- a/charts/sourcegraph/templates/otel-collector/otel-collector.Deployment.yaml
+++ b/charts/sourcegraph/templates/otel-collector/otel-collector.Deployment.yaml
@@ -85,14 +85,14 @@ spec:
             path: /
             port: 13133
         ports:
-          - containerPort: 55679
-            name: zpages
-          - containerPort: 4317
-            name: otlp-grpc
-          - containerPort: 4318
-            name: otlp-http
-          - containerPort: 8888
-            name: metrics
+          - name: grpc-otlp
+            containerPort: 4317
+          - name: http-otlp
+            containerPort: 4318
+          - name: http-metrics
+            containerPort: 8888
+          - name: http-zpages
+            containerPort: 55679
         volumeMounts:
           {{- if .Values.openTelemetry.gateway.config.traces.exporters }}
           - name: config
diff --git a/charts/sourcegraph/templates/otel-collector/otel-collector.Service.yaml b/charts/sourcegraph/templates/otel-collector/otel-collector.Service.yaml
index 27d503c7..bed2bd0f 100644
--- a/charts/sourcegraph/templates/otel-collector/otel-collector.Service.yaml
+++ b/charts/sourcegraph/templates/otel-collector/otel-collector.Service.yaml
@@ -4,11 +4,11 @@ kind: Service
 metadata:
   name: otel-collector
   annotations:
+    prometheus.io/port: "8888"
+    sourcegraph.prometheus/scrape: "true"
     {{- if .Values.openTelemetry.gateway.serviceAnnotations }}
     {{- toYaml .Values.openTelemetry.gateway.serviceAnnotations | nindent 4 }}
     {{- end }}
-    sourcegraph.prometheus/scrape: "true"
-    prometheus.io/port: "8888"
   labels:
     {{- include "sourcegraph.labels" . | nindent 4 }}
     {{- if .Values.openTelemetry.gateway.serviceLabels }}
@@ -18,16 +18,17 @@ metadata:
     app.kubernetes.io/component: otel-collector
 spec:
   ports:
-    - name: otlp-grpc
+    - name: grpc-otlp
       port: 4317
       protocol: TCP
-      targetPort: 4317
-    - name: otlp-http
+      targetPort: grpc-otlp
+    - name: http-metrics
+      port: 8888
+      targetPort: http-metrics
+    - name: http-otlp
       port: 4318
       protocol: TCP
-      targetPort: 4318
-    - name: metrics # Default endpoint for querying metrics.
-      port: 8888
+      targetPort: http-otlp
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: otel-collector
diff --git a/charts/sourcegraph/templates/pgsql/pgsql.Service.yaml b/charts/sourcegraph/templates/pgsql/pgsql.Service.yaml
index 139b7a08..284d0348 100644
--- a/charts/sourcegraph/templates/pgsql/pgsql.Service.yaml
+++ b/charts/sourcegraph/templates/pgsql/pgsql.Service.yaml
@@ -18,6 +18,9 @@ metadata:
   name: pgsql
 spec:
   ports:
+  - name: http-metrics
+    port: 9187
+    targetPort: http-metrics
   - name: pgsql
     port: 5432
     targetPort: pgsql
diff --git a/charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml b/charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml
index 48a1f0f1..2e6727af 100644
--- a/charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml
+++ b/charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml
@@ -90,8 +90,8 @@ spec:
           {{- $item | toYaml | nindent 10 }}
         {{- end }}
         ports:
-        - containerPort: 5432
-          name: pgsql
+        - name: pgsql
+          containerPort: 5432
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.pgsql.resources | nindent 10 }}
@@ -113,7 +113,8 @@ spec:
       {{- if .Values.pgsql.extraContainers }}
         {{- toYaml .Values.pgsql.extraContainers | nindent 6 }}
       {{- end }}
-      - env:
+      - name: pgsql-exporter
+        env:
         {{- include "sourcegraph.dataSource" (list . "pgsql" ) | nindent 8 }}
         {{- range $name, $item := .Values.pgsql.postgresExporter.env}}
         - name: {{ $name }}
@@ -122,14 +123,16 @@ spec:
         - name: PG_EXPORTER_EXTEND_QUERY_PATH
           value: /config/queries.yaml
         image: {{ include "sourcegraph.image" (list . "postgresExporter") }}
-        terminationMessagePolicy: FallbackToLogsOnError
-        name: pgsql-exporter
+        ports:
+        - name: http-metrics
+          containerPort: 9187
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.postgresExporter.resources | nindent 10 }}
         {{- end }}
         securityContext:
           {{- toYaml .Values.postgresExporter.containerSecurityContext | nindent 10 }}
+        terminationMessagePolicy: FallbackToLogsOnError
       terminationGracePeriodSeconds: 120
       securityContext:
         {{- toYaml .Values.pgsql.podSecurityContext | nindent 8 }}
diff --git a/charts/sourcegraph/templates/precise-code-intel/worker.Deployment.yaml b/charts/sourcegraph/templates/precise-code-intel/worker.Deployment.yaml
index 8815c85a..18cba342 100644
--- a/charts/sourcegraph/templates/precise-code-intel/worker.Deployment.yaml
+++ b/charts/sourcegraph/templates/precise-code-intel/worker.Deployment.yaml
@@ -73,22 +73,22 @@ spec:
         livenessProbe:
           httpGet:
             path: /healthz
-            port: debug
+            port: http-debug
             scheme: HTTP
           initialDelaySeconds: 60
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /ready
-            port: debug
+            port: http-debug
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
         ports:
-        - containerPort: 3188
-          name: http
-        - containerPort: 6060
-          name: debug
+        - name: http
+          containerPort: 3188
+        - name: http-debug
+          containerPort: 6060
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.preciseCodeIntel.resources | nindent 10 }}
diff --git a/charts/sourcegraph/templates/precise-code-intel/worker.Service.yaml b/charts/sourcegraph/templates/precise-code-intel/worker.Service.yaml
index 836158fb..12572c2e 100644
--- a/charts/sourcegraph/templates/precise-code-intel/worker.Service.yaml
+++ b/charts/sourcegraph/templates/precise-code-intel/worker.Service.yaml
@@ -20,9 +20,9 @@ spec:
   - name: http
     port: 3188
     targetPort: http
-  - name: debug
+  - name: http-debug
     port: 6060
-    targetPort: debug
+    targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: precise-code-intel-worker
diff --git a/charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml b/charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml
index 027024e6..c35fa2d2 100644
--- a/charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml
+++ b/charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml
@@ -60,13 +60,13 @@ spec:
         readinessProbe:
           httpGet:
             path: /-/ready
-            port: 9090
+            port: http
           timeoutSeconds: 3
           failureThreshold: 120
           periodSeconds: 5
         ports:
-        - containerPort: 9090
-          name: http
+        - name: http
+          containerPort: 9090
         volumeMounts:
         - mountPath: /prometheus
           name: data
diff --git a/charts/sourcegraph/templates/redis/redis-cache.Deployment.yaml b/charts/sourcegraph/templates/redis/redis-cache.Deployment.yaml
index da11dbcd..fc00f487 100644
--- a/charts/sourcegraph/templates/redis/redis-cache.Deployment.yaml
+++ b/charts/sourcegraph/templates/redis/redis-cache.Deployment.yaml
@@ -86,8 +86,8 @@ spec:
           {{- $item | toYaml | nindent 10 }}
         {{- end }}
         ports:
-        - containerPort: 6379
-          name: redis
+        - name: redis
+          containerPort: 6379
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.redisCache.resources | nindent 10 }}
@@ -110,8 +110,8 @@ spec:
           {{- $item | toYaml | nindent 10 }}
         {{- end }}
         ports:
-        - containerPort: 9121
-          name: redisexp
+        - name: http-metrics
+          containerPort: 9121
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.redisExporter.resources | nindent 10 }}
diff --git a/charts/sourcegraph/templates/redis/redis-cache.Service.yaml b/charts/sourcegraph/templates/redis/redis-cache.Service.yaml
index d8ca9e4f..301034b5 100644
--- a/charts/sourcegraph/templates/redis/redis-cache.Service.yaml
+++ b/charts/sourcegraph/templates/redis/redis-cache.Service.yaml
@@ -18,6 +18,9 @@ metadata:
   name: redis-cache
 spec:
   ports:
+  - name: http-metrics
+    port: 9121
+    targetPort: http-metrics
   - name: redis
     port: 6379
     targetPort: redis
diff --git a/charts/sourcegraph/templates/redis/redis-store.Deployment.yaml b/charts/sourcegraph/templates/redis/redis-store.Deployment.yaml
index f9ff22a7..d1697741 100644
--- a/charts/sourcegraph/templates/redis/redis-store.Deployment.yaml
+++ b/charts/sourcegraph/templates/redis/redis-store.Deployment.yaml
@@ -85,8 +85,8 @@ spec:
                 exit 1
               fi
         ports:
-        - containerPort: 6379
-          name: redis
+        - name: redis
+          containerPort: 6379
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.redisStore.resources | nindent 10 }}
@@ -109,8 +109,8 @@ spec:
           {{- $item | toYaml | nindent 10 }}
         {{- end }}
         ports:
-        - containerPort: 9121
-          name: redisexp
+        - name: http-metrics
+          containerPort: 9121
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.redisExporter.resources | nindent 10 }}
diff --git a/charts/sourcegraph/templates/redis/redis-store.Service.yaml b/charts/sourcegraph/templates/redis/redis-store.Service.yaml
index db72b306..eef4feea 100644
--- a/charts/sourcegraph/templates/redis/redis-store.Service.yaml
+++ b/charts/sourcegraph/templates/redis/redis-store.Service.yaml
@@ -18,6 +18,9 @@ metadata:
   name: redis-store
 spec:
   ports:
+  - name: http-metrics
+    port: 9121
+    targetPort: http-metrics
   - name: redis
     port: 6379
     targetPort: redis
diff --git a/charts/sourcegraph/templates/searcher/searcher.Service.yaml b/charts/sourcegraph/templates/searcher/searcher.Service.yaml
index fa4a0828..185307a4 100644
--- a/charts/sourcegraph/templates/searcher/searcher.Service.yaml
+++ b/charts/sourcegraph/templates/searcher/searcher.Service.yaml
@@ -18,12 +18,12 @@ metadata:
 spec:
   clusterIP: None
   ports:
-  - name: http
+  - name: grpc
     port: 3181
-    targetPort: http
-  - name: debug
+    targetPort: grpc
+  - name: http-debug
     port: 6060
-    targetPort: debug
+    targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: searcher
diff --git a/charts/sourcegraph/templates/searcher/searcher.StatefulSet.yaml b/charts/sourcegraph/templates/searcher/searcher.StatefulSet.yaml
index 327aefc9..6770c804 100644
--- a/charts/sourcegraph/templates/searcher/searcher.StatefulSet.yaml
+++ b/charts/sourcegraph/templates/searcher/searcher.StatefulSet.yaml
@@ -84,15 +84,15 @@ spec:
         imagePullPolicy: {{ .Values.sourcegraph.image.pullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         ports:
-        - containerPort: 3181
-          name: http
-        - containerPort: 6060
-          name: debug
+        - name: grpc
+          containerPort: 3181
+        - name: http-debug
+          containerPort: 6060
         readinessProbe:
           failureThreshold: 3
           httpGet:
             path: /healthz
-            port: http
+            port: grpc
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
diff --git a/charts/sourcegraph/templates/syntactic-code-intel/worker.Deployment.yaml b/charts/sourcegraph/templates/syntactic-code-intel/worker.Deployment.yaml
index 88b08fd4..a32afdaf 100644
--- a/charts/sourcegraph/templates/syntactic-code-intel/worker.Deployment.yaml
+++ b/charts/sourcegraph/templates/syntactic-code-intel/worker.Deployment.yaml
@@ -83,15 +83,15 @@ spec:
         readinessProbe:
           httpGet:
             path: /ready
-            port: debug
+            port: http-debug
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5
         ports:
-        - containerPort: {{ .Values.syntacticCodeIntel.properties.workerPort }}
-          name: http
-        - containerPort: 6060
-          name: debug
+        - name: http
+          containerPort: {{ .Values.syntacticCodeIntel.properties.workerPort }}
+        - name: http-debug
+          containerPort: 6060
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.syntacticCodeIntel.resources | nindent 10 }}
diff --git a/charts/sourcegraph/templates/syntactic-code-intel/worker.Service.yaml b/charts/sourcegraph/templates/syntactic-code-intel/worker.Service.yaml
index 82ff0d9f..14b51336 100644
--- a/charts/sourcegraph/templates/syntactic-code-intel/worker.Service.yaml
+++ b/charts/sourcegraph/templates/syntactic-code-intel/worker.Service.yaml
@@ -21,9 +21,9 @@ spec:
   - name: http
     port: {{ .Values.syntacticCodeIntel.properties.workerPort }}
     targetPort: http
-  - name: debug
+  - name: http-debug
     port: 6060
-    targetPort: debug
+    targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: syntactic-code-intel-worker
diff --git a/charts/sourcegraph/templates/syntect-server/syntect-server.Deployment.yaml b/charts/sourcegraph/templates/syntect-server/syntect-server.Deployment.yaml
index c21ba7e6..7d6e0712 100644
--- a/charts/sourcegraph/templates/syntect-server/syntect-server.Deployment.yaml
+++ b/charts/sourcegraph/templates/syntect-server/syntect-server.Deployment.yaml
@@ -67,8 +67,10 @@ spec:
           initialDelaySeconds: 5
           timeoutSeconds: 5
         ports:
-        - containerPort: 9238
-          name: http
+        - name: http
+          containerPort: 9238
+        - name: http-debug
+          containerPort: 6060
         readinessProbe:
           tcpSocket:
             port: http
diff --git a/charts/sourcegraph/templates/syntect-server/syntect-server.Service.yaml b/charts/sourcegraph/templates/syntect-server/syntect-server.Service.yaml
index 14222ccd..9cc5b9fa 100644
--- a/charts/sourcegraph/templates/syntect-server/syntect-server.Service.yaml
+++ b/charts/sourcegraph/templates/syntect-server/syntect-server.Service.yaml
@@ -20,6 +20,9 @@ spec:
   - name: http
     port: 9238
     targetPort: http
+  - name: http-debug
+    port: 6060
+    targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: syntect-server
diff --git a/charts/sourcegraph/templates/worker/worker-executors.Service.yaml b/charts/sourcegraph/templates/worker/worker-executors.Service.yaml
index 2fa4f079..688faa88 100644
--- a/charts/sourcegraph/templates/worker/worker-executors.Service.yaml
+++ b/charts/sourcegraph/templates/worker/worker-executors.Service.yaml
@@ -17,9 +17,9 @@ metadata:
   name: worker-executors
 spec:
   ports:
-  - name: prom
+  - name: http-debug-exec
     port: 6996
-    targetPort: prom
+    targetPort: http-debug-exec
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: worker
diff --git a/charts/sourcegraph/templates/worker/worker.Service.yaml b/charts/sourcegraph/templates/worker/worker.Service.yaml
index d3e86c3f..9f4b8a29 100644
--- a/charts/sourcegraph/templates/worker/worker.Service.yaml
+++ b/charts/sourcegraph/templates/worker/worker.Service.yaml
@@ -20,9 +20,9 @@ spec:
   - name: http
     port: 3189
     targetPort: http
-  - name: debug
+  - name: http-debug
     port: 6060
-    targetPort: debug
+    targetPort: http-debug
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: worker
diff --git a/charts/sourcegraph/tests/otelAgentHostPort_test.yaml b/charts/sourcegraph/tests/otelAgentHostPort_test.yaml
index 06cdd0d3..0d4b0056 100644
--- a/charts/sourcegraph/tests/otelAgentHostPort_test.yaml
+++ b/charts/sourcegraph/tests/otelAgentHostPort_test.yaml
@@ -9,19 +9,19 @@ tests:
           content:
             containerPort: 55679
             hostPort: 55679
-            name: zpages
+            name: http-zpages
       - contains:
           path: spec.template.spec.containers[0].ports
           content:
             containerPort: 4317
             hostPort: 4317
-            name: otlp-grpc
+            name: grpc-otlp
       - contains:
           path: spec.template.spec.containers[0].ports
           content:
             containerPort: 4318
             hostPort: 4318
-            name: otlp-http
+            name: http-otlp
   - it: should render the agent endpoint with the default gRPC host port
     template: searcher/searcher.StatefulSet.yaml
     asserts:
@@ -36,37 +36,37 @@ tests:
       openTelemetry:
         agent:
           hostPorts:
-            otlpGrpc: 4319
-            otlpHttp: 4320
-            zpages: 55680
+            grpcOtlp: 4319
+            httpOtlp: 4320
+            httpZpages: 55680
     asserts:
       - contains:
           path: spec.template.spec.containers[0].ports
           content:
             containerPort: 55679
             hostPort: 55680
-            name: zpages
+            name: http-zpages
       - contains:
           path: spec.template.spec.containers[0].ports
           content:
             containerPort: 4317
             hostPort: 4319
-            name: otlp-grpc
+            name: grpc-otlp
       - contains:
           path: spec.template.spec.containers[0].ports
           content:
             containerPort: 4318
             hostPort: 4320
-            name: otlp-http
+            name: http-otlp
   - it: should render the agent endpoint with the custom gRPC host port
     template: searcher/searcher.StatefulSet.yaml
     set:
       openTelemetry:
         agent:
           hostPorts:
-            otlpGrpc: 4319
-            otlpHttp: 4320
-            zpages: 55680
+            grpcOtlp: 4319
+            httpOtlp: 4320
+            httpZpages: 55680
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
diff --git a/charts/sourcegraph/values.yaml b/charts/sourcegraph/values.yaml
index 84bfb841..f11ca539 100644
--- a/charts/sourcegraph/values.yaml
+++ b/charts/sourcegraph/values.yaml
@@ -85,7 +85,8 @@ sourcegraph:
 #   # Toggle deployment of applications on/off. Applies to databases and third-party applications
 #   enabled: true
 
-alpine: # Used in init containers
+alpine:
+  # Used in init containers
   image:
     # -- Docker image tag for the `alpine` image
     defaultTag: 6.0.0@sha256:c4705ccf969e262ee3916719ecc7c0fb5e606dd954278ac07ac1d052e4e490df
@@ -167,7 +168,7 @@ codeInsightsDB:
     # -- Sets codeinsights-db port
     port: "5432"
     # -- Sets codeinsights-db SSL mode
-    sslmode: "disable"  # set to "require" to enable SSL
+    sslmode: "disable" # set to "require" to enable SSL
   # -- Environment variables for the `codeinsights-db` container
   env: {}
   # -- Name of existing ConfigMap for `codeinsights-db`. It must contain a `postgresql.conf` key.
@@ -242,7 +243,7 @@ codeIntelDB:
     # -- Sets codeintel-db port
     port: "5432"
     # -- Sets codeintel-db SSL mode
-    sslmode: "disable"  # set to "require" to enable SSL
+    sslmode: "disable" # set to "require" to enable SSL
   # -- Name of existing ConfigMap for `codeintel-db`. It must contain a `postgresql.conf` key
   existingConfig: ""
   # -- Additional PostgreSQL configuration. This will override or extend our default configuration.
@@ -643,9 +644,9 @@ openTelemetry:
     # -- Resource requests & limits for the `otel-agent` container,
     # learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
     hostPorts:
-      otlpGrpc: 4317
-      otlpHttp: 4318
-      zpages: 55679
+      grpcOtlp: 4317
+      httpOtlp: 4318
+      httpZpages: 55679
     resources:
       limits:
         cpu: "500m"
@@ -730,9 +731,9 @@ pgsql:
     # -- Sets postgres port
     port: "5432"
     # -- Sets postgres SSL mode
-    sslmode: "disable"  # set to "require" to enable SSL
+    sslmode: "disable" # set to "require" to enable SSL
   # -- Name of existing ConfigMap for `pgsql`. It must contain a `postgresql.conf` key
-  existingConfig: ""  # Name of an existing configmap
+  existingConfig: "" # Name of an existing configmap
   # -- Additional PostgreSQL configuration. This will override or extend our default configuration.
   # Notes: This is expecting a multiline string.
   # Learn more from our [recommended PostgreSQL configuration](https://docs.sourcegraph.com/admin/config/postgres-conf) and [PostgreSQL documentation](https://www.postgresql.org/docs/12/config-setting.html)