diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml
index 18d8938b99..db62a6c854 100644
--- a/bitnami/thanos/Chart.yaml
+++ b/bitnami/thanos/Chart.yaml
@@ -35,4 +35,4 @@ maintainers:
 name: thanos
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/thanos
-version: 12.17.0
\ No newline at end of file
+version: 12.18.0
diff --git a/bitnami/thanos/templates/bucketweb/ingress.yaml b/bitnami/thanos/templates/bucketweb/ingress.yaml
index 29c6bb6457..a45354641c 100644
--- a/bitnami/thanos/templates/bucketweb/ingress.yaml
+++ b/bitnami/thanos/templates/bucketweb/ingress.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.bucketweb.ingress.hostname }}
-    - host: {{ .Values.bucketweb.ingress.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.bucketweb.ingress.hostname "context" $ ) }}
       http:
         paths:
           - path: {{ .Values.bucketweb.ingress.path }}
@@ -51,7 +51,7 @@ spec:
       secretName: {{ printf "%s-tls" .Values.bucketweb.ingress.hostname }}
     {{- end }}
     {{- if .Values.bucketweb.ingress.extraTls }}
-    {{- toYaml .Values.bucketweb.ingress.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.bucketweb.ingress.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/compactor/ingress.yaml b/bitnami/thanos/templates/compactor/ingress.yaml
index bb4b0d91ec..ec1eb05479 100644
--- a/bitnami/thanos/templates/compactor/ingress.yaml
+++ b/bitnami/thanos/templates/compactor/ingress.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.compactor.ingress.hostname }}
-    - host: {{ .Values.compactor.ingress.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.compactor.ingress.hostname "context" $ ) }}
       http:
         paths:
           - path: {{ .Values.compactor.ingress.path }}
@@ -51,7 +51,7 @@ spec:
       secretName: {{ printf "%s-tls" .Values.compactor.ingress.hostname }}
     {{- end }}
     {{- if .Values.compactor.ingress.extraTls }}
-    {{- toYaml .Values.compactor.ingress.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.compactor.ingress.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/query-frontend/ingress.yaml b/bitnami/thanos/templates/query-frontend/ingress.yaml
index 3d7cd2623a..cc9cf68396 100644
--- a/bitnami/thanos/templates/query-frontend/ingress.yaml
+++ b/bitnami/thanos/templates/query-frontend/ingress.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.queryFrontend.ingress.hostname }}
-    - host: {{ .Values.queryFrontend.ingress.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.queryFrontend.ingress.hostname "context" $ ) }}
       http:
         paths:
           - path: {{ .Values.queryFrontend.ingress.path }}
@@ -51,7 +51,7 @@ spec:
       secretName: {{ printf "%s-query-frontend" (include "common.names.fullname" .) }}
     {{- end }}
     {{- if .Values.queryFrontend.ingress.extraTls }}
-    {{- toYaml .Values.queryFrontend.ingress.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.ingress.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/query/ingress-grpc.yaml b/bitnami/thanos/templates/query/ingress-grpc.yaml
index e73c278725..493e742248 100644
--- a/bitnami/thanos/templates/query/ingress-grpc.yaml
+++ b/bitnami/thanos/templates/query/ingress-grpc.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.query.ingress.grpc.hostname }}
-    - host: {{ .Values.query.ingress.grpc.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.query.ingress.grpc.hostname "context" $ ) }}
       http:
         paths:
           - path: {{ .Values.query.ingress.grpc.path }}
@@ -51,7 +51,7 @@ spec:
       secretName: {{ .Values.query.ingress.grpc.secretName | default (printf "%s-tls" .Values.query.ingress.grpc.hostname) }}
     {{- end }}
     {{- if .Values.query.ingress.grpc.extraTls }}
-    {{- toYaml .Values.query.ingress.grpc.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.query.ingress.grpc.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/query/ingress.yaml b/bitnami/thanos/templates/query/ingress.yaml
index bfc2909a34..cbb4cc78a9 100644
--- a/bitnami/thanos/templates/query/ingress.yaml
+++ b/bitnami/thanos/templates/query/ingress.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.query.ingress.hostname }}
-    - host: {{ .Values.query.ingress.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.query.ingress.hostname "context" $ ) }}
       http:
         paths:
           - path: {{ .Values.query.ingress.path }}
@@ -51,7 +51,7 @@ spec:
       secretName: {{ .Values.query.ingress.secretName | default (printf "%s-tls" .Values.query.ingress.hostname) }}
     {{- end }}
     {{- if .Values.query.ingress.extraTls }}
-    {{- toYaml .Values.query.ingress.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.query.ingress.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/receive/ingress.yaml b/bitnami/thanos/templates/receive/ingress.yaml
index 97d6274a3c..fc87418aec 100644
--- a/bitnami/thanos/templates/receive/ingress.yaml
+++ b/bitnami/thanos/templates/receive/ingress.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.receive.ingress.hostname }}
-    - host: {{ .Values.receive.ingress.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.receive.ingress.hostname "context" $ ) }}
       http:
         paths:
           - path: /api/v1/receive
@@ -60,7 +60,7 @@ spec:
       secretName: {{ printf "%s-tls" .Values.receive.ingress.hostname }}
     {{- end }}
     {{- if .Values.receive.ingress.extraTls }}
-    {{- toYaml .Values.receive.ingress.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.receive.ingress.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/ruler/ingress.yaml b/bitnami/thanos/templates/ruler/ingress.yaml
index f302561d7c..a0515b155f 100644
--- a/bitnami/thanos/templates/ruler/ingress.yaml
+++ b/bitnami/thanos/templates/ruler/ingress.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.ruler.ingress.hostname }}
-    - host: {{ .Values.ruler.ingress.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.ruler.ingress.hostname "context" $ ) }}
       http:
         paths:
           - path: {{ .Values.ruler.ingress.path }}
@@ -51,7 +51,7 @@ spec:
       secretName: {{ printf "%s-tls" .Values.ruler.ingress.hostname }}
     {{- end }}
     {{- if .Values.ruler.ingress.extraTls }}
-    {{- toYaml .Values.ruler.ingress.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.ruler.ingress.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/storegateway/ingress-grpc.yaml b/bitnami/thanos/templates/storegateway/ingress-grpc.yaml
index 43bd5d6ed5..6b8bcebb76 100644
--- a/bitnami/thanos/templates/storegateway/ingress-grpc.yaml
+++ b/bitnami/thanos/templates/storegateway/ingress-grpc.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.storegateway.ingress.grpc.hostname }}
-    - host: {{ .Values.storegateway.ingress.grpc.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.storegateway.ingress.grpc.hostname "context" $ ) }}
       http:
         paths:
           - path: {{ .Values.storegateway.ingress.grpc.path }}
@@ -51,7 +51,7 @@ spec:
       secretName: {{ printf "%s-tls" .Values.storegateway.ingress.grpc.hostname }}
     {{- end }}
     {{- if .Values.storegateway.ingress.grpc.extraTls }}
-    {{- toYaml .Values.storegateway.ingress.grpc.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.storegateway.ingress.grpc.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/storegateway/ingress.yaml b/bitnami/thanos/templates/storegateway/ingress.yaml
index 9cd5d9154b..2f50309198 100644
--- a/bitnami/thanos/templates/storegateway/ingress.yaml
+++ b/bitnami/thanos/templates/storegateway/ingress.yaml
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.storegateway.ingress.hostname }}
-    - host: {{ .Values.storegateway.ingress.hostname }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.storegateway.ingress.hostname "context" $ ) }}
       http:
         paths:
           - path: {{ .Values.storegateway.ingress.path }}
@@ -51,7 +51,7 @@ spec:
       secretName: {{ printf "%s-tls" .Values.storegateway.ingress.hostname }}
     {{- end }}
     {{- if .Values.storegateway.ingress.extraTls }}
-    {{- toYaml .Values.storegateway.ingress.extraTls | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.storegateway.ingress.extraTls "context" $) | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}