diff --git a/bitnami/thanos/CHANGELOG.md b/bitnami/thanos/CHANGELOG.md
index 8b863ad51f..9873807864 100644
--- a/bitnami/thanos/CHANGELOG.md
+++ b/bitnami/thanos/CHANGELOG.md
@@ -1,8 +1,16 @@
 # Changelog
 
+## 17.5.2 (2026-05-20)
+
+* [bitnami/thanos] Fix `containerPorts` in query deployment ([#36533](https://github.com/bitnami/charts/pull/36533))
+
+## <small>17.5.1 (2026-05-19)</small>
+
+* [bitnami/thanos] Change hpa bucketweb component label to bucketweb (#36531) ([242f0b8](https://github.com/bitnami/charts/commit/242f0b8106575d3853509806fe23d4bad067846c)), closes [#36531](https://github.com/bitnami/charts/issues/36531)
+
 ## 17.5.0 (2026-05-19)
 
-* [bitnami/thanos] Add Thanos httproute ([#36529](https://github.com/bitnami/charts/pull/36529))
+* [bitnami/thanos] Add Thanos httproute (#36529) ([73c0faa](https://github.com/bitnami/charts/commit/73c0faa841fdb2f6b604bb6662dafa29a074df18)), closes [#36529](https://github.com/bitnami/charts/issues/36529)
 
 ## <small>17.4.1 (2026-04-17)</small>
 
diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml
index 2d7a261d5d..26b2c2c16b 100644
--- a/bitnami/thanos/Chart.yaml
+++ b/bitnami/thanos/Chart.yaml
@@ -37,4 +37,4 @@ maintainers:
 name: thanos
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/thanos
-version: 17.5.1
+version: 17.5.2
diff --git a/bitnami/thanos/templates/query/deployment.yaml b/bitnami/thanos/templates/query/deployment.yaml
index 3d56a72c6e..e6bc1b3d61 100644
--- a/bitnami/thanos/templates/query/deployment.yaml
+++ b/bitnami/thanos/templates/query/deployment.yaml
@@ -104,8 +104,8 @@ spec:
             - query
             - --log.level={{ .Values.query.logLevel }}
             - --log.format={{ .Values.query.logFormat }}
-            - --grpc-address=0.0.0.0:10901
-            - --http-address=0.0.0.0:10902
+            - --grpc-address=0.0.0.0:{{ .Values.query.containerPorts.grpc }}
+            - --http-address=0.0.0.0:{{ .Values.query.containerPorts.http }}
             {{- if (include "thanos.httpConfigEnabled" .) }}
             - --http.config=/conf/http/http-config.yml
             {{- end }}
@@ -201,10 +201,10 @@ spec:
           {{- end }}
           ports:
             - name: http
-              containerPort: 10902
+              containerPort: {{ .Values.query.containerPorts.http }}
               protocol: TCP
             - name: grpc
-              containerPort: 10901
+              containerPort: {{ .Values.query.containerPorts.grpc }}
               protocol: TCP
           {{- if .Values.query.customLivenessProbe }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.query.customLivenessProbe "context" $) | nindent 12 }}