diff --git a/charts/jaeger/templates/collector-svc.yaml b/charts/jaeger/templates/collector-svc.yaml
index 3c2aa660..0647e24f 100644
--- a/charts/jaeger/templates/collector-svc.yaml
+++ b/charts/jaeger/templates/collector-svc.yaml
@@ -60,9 +60,9 @@ spec:
     protocol: TCP
     targetPort: {{ .Values.collector.service.otlp.http.name }}
 {{- end }}
-  - name: {{ .Values.collector.service.portName | default "admin" }}
-    port: 14269
-    targetPort: {{ .Values.collector.service.targetPortName | default "admin" }}
+  - name: {{ .Values.collector.service.admin.name }}
+    port: {{ .Values.collector.service.admin.port }}
+    targetPort: {{ .Values.collector.service.admin.targetPort }}
   selector:
     {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: collector
diff --git a/charts/jaeger/templates/query-svc.yaml b/charts/jaeger/templates/query-svc.yaml
index aaa6290c..37f7d160 100644
--- a/charts/jaeger/templates/query-svc.yaml
+++ b/charts/jaeger/templates/query-svc.yaml
@@ -23,10 +23,10 @@ spec:
     port: 16685
     protocol: TCP
     targetPort: grpc
-  - name: {{ .Values.query.service.portName | default "admin" }}
+  - name: {{ .Values.query.service.admin.name }}
     port: 16687
     protocol: TCP
-    targetPort: {{ .Values.query.service.targetPortName | default "admin" }}
+    targetPort: {{ .Values.query.service.admin.targetPort }}
   selector:
     {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: query
diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml
index 836835a9..dcc98d85 100644
--- a/charts/jaeger/values.yaml
+++ b/charts/jaeger/values.yaml
@@ -510,6 +510,11 @@ collector:
         # name: otlp-http
         # port: 4318
         # nodePort:
+    admin:
+        {}
+#      name: "admin"
+#      port: 14269
+#      targetPort: "admin"
   ingress:
     enabled: false
     # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
@@ -693,6 +698,10 @@ query:
     # targetPort: 8080
     # Specify a specific node port when type is NodePort
     # nodePort: 32500
+    admin:
+       {}
+#      name: admin
+#      targetPort: admin
   ingress:
     enabled: false
     # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName