diff --git a/bitnami/thanos/CHANGELOG.md b/bitnami/thanos/CHANGELOG.md
index 2622ecc877db82..bf58b4a4ce7bf2 100644
--- a/bitnami/thanos/CHANGELOG.md
+++ b/bitnami/thanos/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 17.3.1 (2025-08-13)
+## 17.3.3 (2025-10-21)
 
-* [bitnami/thanos] :zap: :arrow_up: Update dependency references ([#35837](https://github.com/bitnami/charts/pull/35837))
+* bitnami/thanos template extraFlags in sharded statefulset storegateway like the template for non-sharded statefulset storegateway ([#36360](https://github.com/bitnami/charts/pull/36360))
+
+## <small>17.3.1 (2025-08-13)</small>
+
+* [bitnami/thanos] :zap: :arrow_up: Update dependency references (#35837) ([45fdbef](https://github.com/bitnami/charts/commit/45fdbef14937e342e0af545ca3c9fade84de8346)), closes [#35837](https://github.com/bitnami/charts/issues/35837)
 
 ## 17.3.0 (2025-08-13)
 
@@ -1526,7 +1530,7 @@
 
 ## <small>3.8.6 (2021-02-15)</small>
 
-* [bitnami/thanos] fix query TLS client in a modular way (#5437) (#5457) ([bbbf490](https://github.com/bitnami/charts/commit/bbbf490439643e885529c1c4f25aeb7c9c29dc93)), closes [#5437](https://github.com/bitnami/charts/issues/5437) [#5457](https://github.com/bitnami/charts/issues/5457) [#5437](https://github.com/bitnami/charts/issues/5437) [#3988](https://github.com/bitnami/charts/issues/3988)
+* [bitnami/thanos] fix query TLS client in a modular way (#5437) (#5457) ([bbbf490](https://github.com/bitnami/charts/commit/bbbf490439643e885529c1c4f25aeb7c9c29dc93)), closes [#5437](https://github.com/bitnami/charts/issues/5437) [#5457](https://github.com/bitnami/charts/issues/5457) [#5437](https://github.com/bitnami/charts/issues/5437)
 
 ## <small>3.8.5 (2021-02-12)</small>
 
diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml
index c3cd51ebf4caf7..c89030211158c6 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.3.2
+version: 17.3.3
diff --git a/bitnami/thanos/templates/storegateway/statefulset-sharded.yaml b/bitnami/thanos/templates/storegateway/statefulset-sharded.yaml
index dc55e966f25384..c1e6c177c344f7 100644
--- a/bitnami/thanos/templates/storegateway/statefulset-sharded.yaml
+++ b/bitnami/thanos/templates/storegateway/statefulset-sharded.yaml
@@ -205,7 +205,7 @@ spec:
             {{- end }}
             {{- end }}
             {{- if $.Values.storegateway.extraFlags }}
-            {{- $.Values.storegateway.extraFlags | toYaml | nindent 12 }}
+            {{- include "common.tplvalues.render" (dict "value" $.Values.storegateway.extraFlags "context" $) | nindent 12 }}
             {{- end }}
             {{- end }}
           {{- if $.Values.storegateway.extraEnvVars }}