diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 5eb09fc651..97a8c3962e 100644
--- a/charts/tempo-distributed/Chart.yaml
+++ b/charts/tempo-distributed/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.52.3
+version: 1.53.0
 appVersion: 2.9.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
index 3609e61023..cfd8f6f433 100644
--- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
+++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
@@ -118,7 +118,7 @@ spec:
             {{- end }}
         {{- if .Values.queryFrontend.query.enabled }}
         - args:
-            - -config=/conf/tempo.yaml
+            - -config=/conf/tempo-query.yaml
             {{- with .Values.queryFrontend.query.extraArgs }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
@@ -129,10 +129,8 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: tempo-query
           ports:
-            - containerPort: {{ .Values.queryFrontend.service.port }}
-              name: jaeger-ui
-            - containerPort: 16687
-              name: jaeger-metrics
+            - containerPort: 7777
+              name: tempo-query
           {{- with .Values.queryFrontend.query.extraEnv }}
           env:
             {{- toYaml . | nindent 12 }}
diff --git a/charts/tempo-distributed/templates/query-frontend/ingress-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/ingress-query-frontend.yaml
index 8701471d40..92d7758bd5 100644
--- a/charts/tempo-distributed/templates/query-frontend/ingress-query-frontend.yaml
+++ b/charts/tempo-distributed/templates/query-frontend/ingress-query-frontend.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.queryFrontend.query.enabled .Values.queryFrontend.ingress.enabled -}}
+{{- if .Values.queryFrontend.ingress.enabled -}}
 {{ $dict := dict "ctx" . "component" "query-frontend"  }}
 {{- $ingressApiIsStable := eq (include "tempo.ingress.isStable" .) "true" -}}
 {{- $ingressSupportsIngressClassName := eq (include "tempo.ingress.supportsIngressClassName" .) "true" -}}
diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml
index f776695e74..1d0772f109 100644
--- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml
+++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml
@@ -34,12 +34,11 @@ spec:
       appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }}
       {{- end }}
     {{- if .Values.queryFrontend.query.enabled }}
-    - name: tempo-query-jaeger-ui
-      port: {{ .Values.queryFrontend.service.port }}
-      targetPort: {{ .Values.queryFrontend.service.port }}
-    - name: tempo-query-metrics
-      port: 16687
-      targetPort: jaeger-metrics
+    - name: tempo-query
+      port: 7777
+      targetPort: tempo-query
+      protocol: TCP
+      appProtocol: grpc
     {{- end }}
   publishNotReadyAddresses: true
   selector:
diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml
index f2831e9b48..bb1f7179d9 100644
--- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml
+++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml
@@ -28,12 +28,11 @@ spec:
       appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }}
       {{- end }}
     {{- if .Values.queryFrontend.query.enabled }}
-    - name: tempo-query-jaeger-ui
-      port: {{ .Values.queryFrontend.service.port }}
-      targetPort: {{ .Values.queryFrontend.service.port }}
-    - name: tempo-query-metrics
-      port: 16687
-      targetPort: jaeger-metrics
+    - name: tempo-query
+      port: 7777
+      targetPort: tempo-query
+      protocol: TCP
+      appProtocol: grpc
     {{- end }}
   {{- if .Values.queryFrontend.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.queryFrontend.service.loadBalancerIP  }}
diff --git a/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml b/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml
deleted file mode 100644
index 5d8fa1a59a..0000000000
--- a/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{- include "tempo.lib.serviceMonitor" (dict "ctx" $ "component" "tempo-query") }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 6261616d1e..1f7779e284 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -1006,7 +1006,7 @@ queryFrontend:
     tag: null
   service:
     # -- Port of the query-frontend service
-    port: 16686
+    port: 3200
     # -- Annotations for queryFrontend service
     annotations: {}
     # -- Labels for queryFrontend service