diff --git a/bitnami/aspnet-core/Chart.yaml b/bitnami/aspnet-core/Chart.yaml
index 4326bd6f92..76e350e417 100644
--- a/bitnami/aspnet-core/Chart.yaml
+++ b/bitnami/aspnet-core/Chart.yaml
@@ -22,4 +22,4 @@ name: aspnet-core
 sources:
   - https://github.com/bitnami/bitnami-docker-aspnet-core
   - https://dotnet.microsoft.com/apps/aspnet
-version: 1.2.2
+version: 1.2.3
diff --git a/bitnami/aspnet-core/templates/tls-secret.yaml b/bitnami/aspnet-core/templates/tls-secret.yaml
index f587824cf2..39784f1332 100644
--- a/bitnami/aspnet-core/templates/tls-secret.yaml
+++ b/bitnami/aspnet-core/templates/tls-secret.yaml
@@ -5,11 +5,11 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .name }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
+    {{- if $.Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- if $.Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 type: kubernetes.io/tls
diff --git a/bitnami/consul/Chart.yaml b/bitnami/consul/Chart.yaml
index 0b6e3289cc..8164372994 100644
--- a/bitnami/consul/Chart.yaml
+++ b/bitnami/consul/Chart.yaml
@@ -23,4 +23,4 @@ name: consul
 sources:
   - https://github.com/bitnami/bitnami-docker-consul
   - https://www.consul.io/
-version: 9.2.2
+version: 9.2.3
diff --git a/bitnami/consul/templates/tls-secrets.yaml b/bitnami/consul/templates/tls-secrets.yaml
index 5fcef4b6da..068f684f4b 100644
--- a/bitnami/consul/templates/tls-secrets.yaml
+++ b/bitnami/consul/templates/tls-secrets.yaml
@@ -6,11 +6,11 @@ kind: Secret
 metadata:
   name: {{ .name }}
   namespace: {{ $.Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
+    {{- if $.Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- if $.Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 type: kubernetes.io/tls
diff --git a/bitnami/logstash/Chart.yaml b/bitnami/logstash/Chart.yaml
index c5b510b8a8..e0ddb70085 100644
--- a/bitnami/logstash/Chart.yaml
+++ b/bitnami/logstash/Chart.yaml
@@ -23,4 +23,4 @@ name: logstash
 sources:
   - https://github.com/bitnami/bitnami-docker-logstash
   - https://www.elastic.co/products/logstash
-version: 3.1.0
+version: 3.1.1
diff --git a/bitnami/logstash/templates/tls-secret.yaml b/bitnami/logstash/templates/tls-secret.yaml
index e68378423e..35b4b82459 100644
--- a/bitnami/logstash/templates/tls-secret.yaml
+++ b/bitnami/logstash/templates/tls-secret.yaml
@@ -5,11 +5,11 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .name }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
+    {{- if $.Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- if $.Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 type: kubernetes.io/tls
diff --git a/bitnami/odoo/Chart.yaml b/bitnami/odoo/Chart.yaml
index 035f9d6866..21ab5da0d7 100644
--- a/bitnami/odoo/Chart.yaml
+++ b/bitnami/odoo/Chart.yaml
@@ -27,4 +27,4 @@ name: odoo
 sources:
   - https://github.com/bitnami/bitnami-docker-odoo
   - https://www.odoo.com/
-version: 18.2.0
+version: 18.2.1
diff --git a/bitnami/odoo/templates/tls-secrets.yaml b/bitnami/odoo/templates/tls-secrets.yaml
index e758128788..bbaebcb490 100644
--- a/bitnami/odoo/templates/tls-secrets.yaml
+++ b/bitnami/odoo/templates/tls-secrets.yaml
@@ -4,11 +4,11 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .name }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
+    {{- if $.Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- if $.Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 type: kubernetes.io/tls
diff --git a/bitnami/redmine/Chart.yaml b/bitnami/redmine/Chart.yaml
index 6205ad20bb..406a536501 100644
--- a/bitnami/redmine/Chart.yaml
+++ b/bitnami/redmine/Chart.yaml
@@ -36,4 +36,4 @@ name: redmine
 sources:
   - https://github.com/bitnami/bitnami-docker-redmine
   - http://www.redmine.org/
-version: 15.2.1
+version: 15.2.2
diff --git a/bitnami/redmine/templates/tls-secrets.yaml b/bitnami/redmine/templates/tls-secrets.yaml
index d29b6d1e7d..5640919086 100644
--- a/bitnami/redmine/templates/tls-secrets.yaml
+++ b/bitnami/redmine/templates/tls-secrets.yaml
@@ -4,12 +4,12 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .name }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
     app.kubernetes.io/component: redmine
-    {{- if .Values.commonLabels }}
+    {{- if $.Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- if $.Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 type: kubernetes.io/tls
diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml
index 9f395ad2ed..47cd9ff148 100644
--- a/bitnami/thanos/Chart.yaml
+++ b/bitnami/thanos/Chart.yaml
@@ -28,4 +28,4 @@ name: thanos
 sources:
   - https://github.com/bitnami/bitnami-docker-thanos
   - https://thanos.io
-version: 3.8.0
+version: 3.8.1
diff --git a/bitnami/thanos/templates/bucketweb/tls-secrets.yaml b/bitnami/thanos/templates/bucketweb/tls-secrets.yaml
index f30049fe8a..02251d733c 100644
--- a/bitnami/thanos/templates/bucketweb/tls-secrets.yaml
+++ b/bitnami/thanos/templates/bucketweb/tls-secrets.yaml
@@ -3,8 +3,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common.names.fullname" . }}-bucketweb
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  name: {{ include "common.names.fullname" $ }}-bucketweb
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
 type: kubernetes.io/tls
 data:
   tls.crt: {{ .certificate | b64enc }}
diff --git a/bitnami/thanos/templates/query-frontend/tls-secrets.yaml b/bitnami/thanos/templates/query-frontend/tls-secrets.yaml
index 806c4a6278..d9a5090001 100644
--- a/bitnami/thanos/templates/query-frontend/tls-secrets.yaml
+++ b/bitnami/thanos/templates/query-frontend/tls-secrets.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "common.names.fullname" . }}-query-frontend
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
 type: kubernetes.io/tls
 data:
   tls.crt: {{ .certificate | b64enc }}
diff --git a/bitnami/thanos/templates/query/tls-secrets.yaml b/bitnami/thanos/templates/query/tls-secrets.yaml
index f1bf6d6405..2176fbf672 100644
--- a/bitnami/thanos/templates/query/tls-secrets.yaml
+++ b/bitnami/thanos/templates/query/tls-secrets.yaml
@@ -4,8 +4,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common.names.fullname" . }}-query
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  name: {{ include "common.names.fullname" $ }}-query
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
 type: kubernetes.io/tls
 data:
   tls.crt: {{ .certificate | b64enc }}
diff --git a/bitnami/thanos/templates/receive/tls-secrets.yaml b/bitnami/thanos/templates/receive/tls-secrets.yaml
index 92c9dae6ae..7a950f3be5 100644
--- a/bitnami/thanos/templates/receive/tls-secrets.yaml
+++ b/bitnami/thanos/templates/receive/tls-secrets.yaml
@@ -3,8 +3,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common.names.fullname" . }}-receive
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  name: {{ include "common.names.fullname" $ }}-receive
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
 type: kubernetes.io/tls
 data:
   tls.crt: {{ .certificate | b64enc }}