diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
index c51108aa52f8..9908237b2560 100644
--- a/charts/kube-prometheus-stack/Chart.yaml
+++ b/charts/kube-prometheus-stack/Chart.yaml
@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 65.1.0
+version: 65.2.0
 appVersion: v0.77.1
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
diff --git a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
index 2705e83070a8..3a0e6b8259f4 100644
--- a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
+++ b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
@@ -39,9 +39,9 @@ spec:
 {{- else }}
   externalUrl: http://{{ template "kube-prometheus-stack.fullname" . }}-alertmanager.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.alertmanager.service.port }}
 {{- end }}
-{{- if .Values.alertmanager.alertmanagerSpec.nodeSelector }}
+{{- with .Values.alertmanager.alertmanagerSpec.nodeSelector }}
   nodeSelector:
-{{ toYaml .Values.alertmanager.alertmanagerSpec.nodeSelector | indent 4 }}
+{{ tpl (toYaml .) $ | indent 4 }}
 {{- end }}
   paused: {{ .Values.alertmanager.alertmanagerSpec.paused }}
   logFormat: {{ .Values.alertmanager.alertmanagerSpec.logFormat | quote  }}
@@ -130,9 +130,9 @@ spec:
               - {key: app.kubernetes.io/name, operator: In, values: [alertmanager]}
               - {key: alertmanager, operator: In, values: [{{ template "kube-prometheus-stack.alertmanager.crname" . }}]}
 {{- end }}
-{{- if .Values.alertmanager.alertmanagerSpec.tolerations }}
+{{- with .Values.alertmanager.alertmanagerSpec.tolerations }}
   tolerations:
-{{ toYaml .Values.alertmanager.alertmanagerSpec.tolerations | indent 4 }}
+{{ tpl (toYaml .) $ | indent 4 }}
 {{- end }}
 {{- if .Values.alertmanager.alertmanagerSpec.topologySpreadConstraints }}
   topologySpreadConstraints:
diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml
index e3f3261d954c..0c11fa098300 100644
--- a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml
+++ b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml
@@ -217,7 +217,7 @@ spec:
 {{- end }}
     {{- with .Values.prometheusOperator.nodeSelector }}
       nodeSelector:
-{{ toYaml . | indent 8 }}
+{{ tpl (toYaml .) $ | indent 8 }}
     {{- end }}
     {{- with .Values.prometheusOperator.affinity }}
       affinity:
@@ -225,6 +225,6 @@ spec:
     {{- end }}
     {{- with .Values.prometheusOperator.tolerations }}
       tolerations:
-{{ toYaml . | indent 8 }}
+{{ tpl (toYaml .) $ | indent 8 }}
     {{- end }}
 {{- end }}
diff --git a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
index 3d02aa92ea98..1e2aeaa975bf 100644
--- a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
+++ b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
@@ -85,9 +85,9 @@ spec:
 {{- else }}
   externalUrl: http://{{ template "kube-prometheus-stack.fullname" . }}-prometheus.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.prometheus.service.port }}
 {{- end }}
-{{- if .Values.prometheus.prometheusSpec.nodeSelector }}
+{{- with .Values.prometheus.prometheusSpec.nodeSelector }}
   nodeSelector:
-{{ toYaml .Values.prometheus.prometheusSpec.nodeSelector | indent 4 }}
+{{ tpl (toYaml .) $ | indent 4 }}
 {{- end }}
   paused: {{ .Values.prometheus.prometheusSpec.paused }}
   replicas: {{ .Values.prometheus.prometheusSpec.replicas }}
@@ -303,9 +303,9 @@ spec:
               - {key: prometheus, operator: In, values: [{{ template "kube-prometheus-stack.prometheus.crname" . }}]}
 {{- end }}
 {{- end }}
-{{- if .Values.prometheus.prometheusSpec.tolerations }}
+{{- with .Values.prometheus.prometheusSpec.tolerations }}
   tolerations:
-{{ toYaml .Values.prometheus.prometheusSpec.tolerations | indent 4 }}
+{{ tpl (toYaml .) $ | indent 4 }}
 {{- end }}
 {{- if .Values.prometheus.prometheusSpec.topologySpreadConstraints }}
   topologySpreadConstraints: