diff --git a/bitnami/grafana-tempo/CHANGELOG.md b/bitnami/grafana-tempo/CHANGELOG.md
index e222aac640..c5232bcbb8 100644
--- a/bitnami/grafana-tempo/CHANGELOG.md
+++ b/bitnami/grafana-tempo/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 3.5.5 (2024-06-18)
+## 3.6.0 (2024-06-20)
 
-* [bitnami/grafana-tempo] Release 3.5.5 ([#27352](https://github.com/bitnami/charts/pull/27352))
+* [bitnami/grafana-tempo] Add option to disable tempo-query sidecar ([#27447](https://github.com/bitnami/charts/pull/27447))
+
+## <small>3.5.5 (2024-06-18)</small>
+
+* [bitnami/grafana-tempo] Release 3.5.5 (#27352) ([bda5da9](https://github.com/bitnami/charts/commit/bda5da981a74094a9802d419ec77e87995177250)), closes [#27352](https://github.com/bitnami/charts/issues/27352)
 
 ## <small>3.5.4 (2024-06-17)</small>
 
diff --git a/bitnami/grafana-tempo/Chart.yaml b/bitnami/grafana-tempo/Chart.yaml
index ddb7ed18f6..c9d96e9dbd 100644
--- a/bitnami/grafana-tempo/Chart.yaml
+++ b/bitnami/grafana-tempo/Chart.yaml
@@ -39,4 +39,4 @@ maintainers:
 name: grafana-tempo
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/grafana-tempo
-version: 3.5.5
+version: 3.6.0
diff --git a/bitnami/grafana-tempo/README.md b/bitnami/grafana-tempo/README.md
index 44c5a9a01b..e3fbd08a6c 100644
--- a/bitnami/grafana-tempo/README.md
+++ b/bitnami/grafana-tempo/README.md
@@ -812,6 +812,7 @@ The [Bitnami grafana-tempo](https://github.com/bitnami/containers/tree/main/bitn
 | `queryFrontend.pdb.minAvailable`                                        | Minimum number/percentage of pods that should remain scheduled                                                                                                                                                                                            | `""`                                  |
 | `queryFrontend.pdb.maxUnavailable`                                      | Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `queryFrontend.pdb.minAvailable` and `queryFrontend.pdb.maxUnavailable` are empty.                                                                                | `""`                                  |
 | `queryFrontend.enableServiceLinks`                                      | Whether information about services should be injected into pod's environment variable                                                                                                                                                                     | `true`                                |
+| `queryFrontend.query.enabled`                                           | Whether to enable the query container for legacy Grafana compatibility with jaeger-ui.  Only required for grafana version <7.5                                                                                                                            | `false`                               |
 | `queryFrontend.query.image.registry`                                    | Grafana Tempo Query image registry                                                                                                                                                                                                                        | `REGISTRY_NAME`                       |
 | `queryFrontend.query.image.repository`                                  | Grafana Tempo Query image repository                                                                                                                                                                                                                      | `REPOSITORY_NAME/grafana-tempo-query` |
 | `queryFrontend.query.image.digest`                                      | Grafana Tempo Query image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag                                                                                                                                       | `""`                                  |
diff --git a/bitnami/grafana-tempo/templates/query-frontend/deployment.yaml b/bitnami/grafana-tempo/templates/query-frontend/deployment.yaml
index 6b1070049c..95a1660306 100644
--- a/bitnami/grafana-tempo/templates/query-frontend/deployment.yaml
+++ b/bitnami/grafana-tempo/templates/query-frontend/deployment.yaml
@@ -159,6 +159,7 @@ spec:
           {{- if .Values.queryFrontend.extraVolumeMounts }}
           {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.extraVolumeMounts "context" $) | nindent 12 }}
           {{- end }}
+        {{- if .Values.queryFrontend.query.enabled }}
         - name: grafana-tempo-query
           image: {{ template "grafana-tempo.queryImage" . }}
           imagePullPolicy: {{ .Values.queryFrontend.query.image.pullPolicy }}
@@ -240,6 +241,7 @@ spec:
           {{- if .Values.queryFrontend.query.extraVolumeMounts }}
           {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.query.extraVolumeMounts "context" $) | nindent 12 }}
           {{- end }}
+        {{- end }}
         {{- if .Values.queryFrontend.sidecars }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.queryFrontend.sidecars "context" $) | nindent 8 }}
         {{- end }}
diff --git a/bitnami/grafana-tempo/values.yaml b/bitnami/grafana-tempo/values.yaml
index 2c789c0f7c..ca49e56d8f 100644
--- a/bitnami/grafana-tempo/values.yaml
+++ b/bitnami/grafana-tempo/values.yaml
@@ -2424,6 +2424,8 @@ queryFrontend:
   ## Query sidecar settings
   ##
   query:
+    ## @param queryFrontend.query.enabled Whether to enable the query container for legacy Grafana compatibility with jaeger-ui.  Only required for grafana version <7.5
+    enabled: false
     ## Bitnami Grafana Tempo Query image
     ## ref: https://hub.docker.com/r/bitnami/grafana-tempo-query/tags/
     ## @param queryFrontend.query.image.registry [default: REGISTRY_NAME] Grafana Tempo Query image registry