diff --git a/charts/base-cluster/templates/global/priorityClasses.yaml b/charts/base-cluster/templates/global/priorityClasses.yaml
index 2b68bb75d..68896893d 100644
--- a/charts/base-cluster/templates/global/priorityClasses.yaml
+++ b/charts/base-cluster/templates/global/priorityClasses.yaml
@@ -1,5 +1,5 @@
 {{- $defaultClasses := dict "cluster-components" (dict "value" 500000000) "monitoring-components" (dict "value" 250000000) -}}
-{{- $priorityClasses := merge $defaultClasses .Values.global.priorityClasses -}}
+{{- $priorityClasses := mustMerge $defaultClasses .Values.global.priorityClasses -}}
   {{- range $priorityClassName, $priorityClass := $priorityClasses }}
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/grafana-secret.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/grafana-secret.yaml
index d73525145..bc3ed6e24 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/grafana-secret.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/grafana-secret.yaml
@@ -12,5 +12,5 @@ type: Opaque
 data:
   username: {{ "admin" | b64enc }}
   # This might change on every `template` call, this can be ignored
-  password: {{ include "common.secrets.passwords.manage" (dict "secret" $name "length" 40 "strong" false "key" "password" "providedValues" (list "monitoring.grafana.adminPassword") "context" (dict "Values" .Values "Release" ((dict "IsUpgrade" false "IsInstall" true "Namespace" "monitoring") | mergeOverwrite (deepCopy .Release)))) }}
+  password: {{ include "common.secrets.passwords.manage" (dict "secret" $name "length" 40 "strong" false "key" "password" "providedValues" (list "monitoring.grafana.adminPassword") "context" (dict "Values" .Values "Release" ((dict "IsUpgrade" false "IsInstall" true "Namespace" "monitoring") | mustMergeOverwrite (deepCopy .Release)))) }}
 {{- end }}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy-secret.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy-secret.yaml
index 0f1c51793..5a6e2f1e8 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy-secret.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy-secret.yaml
@@ -11,7 +11,7 @@ metadata:
 type: Opaque
 data:
   # This might change on every `template` call, this can be ignored
-  cookie-secret: {{ include "common.secrets.passwords.manage" (dict "secret" $name "key" "cookie-secret" "length" 32 "strong" true "providedValues" (list "global.authentication.oauthProxy.cookieSecret") "context" (dict "Values" .Values "Release" ((dict "IsUpgrade" false "IsInstall" true "Namespace" "monitoring") | mergeOverwrite (deepCopy .Release)))) }}
+  cookie-secret: {{ include "common.secrets.passwords.manage" (dict "secret" $name "key" "cookie-secret" "length" 32 "strong" true "providedValues" (list "global.authentication.oauthProxy.cookieSecret") "context" (dict "Values" .Values "Release" ((dict "IsUpgrade" false "IsInstall" true "Namespace" "monitoring") | mustMergeOverwrite (deepCopy .Release)))) }}
   client-id: {{ $.Values.global.authentication.config.clientId | b64enc | quote }}
   client-secret: {{ $.Values.global.authentication.config.clientSecret | b64enc | quote }}
 {{- end }}