diff --git a/charts/base-cluster/Chart.lock b/charts/base-cluster/Chart.lock
index f8b965512..2692931b1 100644
--- a/charts/base-cluster/Chart.lock
+++ b/charts/base-cluster/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
-  repository: https://charts.bitnami.com/bitnami
-  version: 2.19.1
-digest: sha256:4f539b1fbde383dd5bc020d77d70655108ed4c188b7329c1639df3f1e65de2e0
-generated: "2024-03-27T14:49:47.564987318Z"
+  repository: oci://ghcr.io/teutonet/teutonet-helm-charts
+  version: 1.0.0
+digest: sha256:acfa022eb3ff1b32622813ee173a127c23c729abb6fe8235795b668bb496ed2e
+generated: "2024-04-12T13:36:20.75023109+02:00"
diff --git a/charts/base-cluster/Chart.yaml b/charts/base-cluster/Chart.yaml
index 79b20ed37..593161bb2 100644
--- a/charts/base-cluster/Chart.yaml
+++ b/charts/base-cluster/Chart.yaml
@@ -16,8 +16,8 @@ home: https://teuto.net
 description: A common base for every kubernetes cluster
 dependencies:
   - name: common
-    version: 2.19.1
-    repository: https://charts.bitnami.com/bitnami
+    version: 1.0.0
+    repository: oci://ghcr.io/teutonet/teutonet-helm-charts
 annotations:
   artifacthub.io/images: |
     - image: docker.io/bats/bats:1.8.2                                                                                                                #  loki/HelmRelease/loki/null/Pod/loki-loki-stack-test.yaml
diff --git a/charts/base-cluster/templates/_helmRelease.yaml b/charts/base-cluster/templates/_helmRelease.yaml
index 86c110096..6cc684d13 100644
--- a/charts/base-cluster/templates/_helmRelease.yaml
+++ b/charts/base-cluster/templates/_helmRelease.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .namespace | default .context.Release.Namespace }}
   labels: {{- include "common.labels.standard" .context | nindent 4 }}
     {{- with .additionalLabels }}
-    {{- . | toYaml | nindent 4 }}
+      {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   chart:
@@ -21,10 +21,10 @@ spec:
     {{- end }}
   values:
     {{- if eq .render nil }}
-    static: {{ .resource | toYaml | indent 6 }}
+    static: {{ toYaml .resource | indent 6 }}
     {{- else if .render }}
     static: {{ include "common.tplvalues.render" (dict "value" .resource "context" .context) | indent 6 }}
     {{- else }}
-    static: {{ .resource | toYaml | replace "{{" "{{ `{{` }}" | indent 6 }}
+    static: {{ toYaml .resource | replace "{{" "{{ `{{` }}" | indent 6 }}
     {{- end }}
 {{- end -}}
diff --git a/charts/base-cluster/templates/_helpers.tpl b/charts/base-cluster/templates/_helpers.tpl
index b375ac26a..1253c9ca9 100644
--- a/charts/base-cluster/templates/_helpers.tpl
+++ b/charts/base-cluster/templates/_helpers.tpl
@@ -1,38 +1,25 @@
 {{- define "common.networkPolicy.type" -}}
-{{- if eq .Values.global.networkPolicy.type "auto" -}}
-{{- if .Capabilities.APIVersions.Has "cilium.io/v2/CiliumNetworkPolicy" -}}
-cilium
-{{- else -}}
-none
-{{- end -}}
-{{- else -}}
-{{- .Values.global.networkPolicy.type -}}
-{{- end -}}
+  {{- if eq .Values.global.networkPolicy.type "auto" -}}
+    {{- if .Capabilities.APIVersions.Has "cilium.io/v2/CiliumNetworkPolicy" -}}
+      cilium
+    {{- else -}}
+      none
+    {{- end -}}
+  {{- else -}}
+    {{- .Values.global.networkPolicy.type -}}
+  {{- end -}}
 {{- end -}}
 
 {{- define "common.dict.filterEmptyValues" -}}
-{{- $out := dict -}}
-{{- range $key, $value := . -}}
-{{- if $value -}}
-{{- $out = set $out $key $value -}}
-{{- end -}}
-{{- end -}}
-{{- $out | toYaml -}}
-{{- end -}}
-
-{{- define "base-cluster.helm.labels" -}}
-{{- include "common.labels.standard" (dict "Release" (dict "Name" "{{ .Release.Name }}" "Service" "{{ .Release.Service }}") "Chart" (dict "Name" "{{ .Chart.Name }}" "Version" "{{ .Chart.Version }}") "Values" (dict)) -}}
-{{- end -}}
-
-{{- define "base-cluster.helm.chartVersion" -}}
-{{- dig .repo "charts" .chart nil .context.Values.global.helmRepositories | required (printf "The repo '%s' is either missing or doesn't contain the chart '%s'" .repo .chart) -}}
+  {{- $out := dict -}}
+  {{- range $key, $value := . -}}
+    {{- if $value -}}
+      {{- $out = set $out $key $value -}}
+    {{- end -}}
+  {{- end -}}
+  {{- toYaml $out -}}
 {{- end -}}
 
 {{- define "base-cluster.helm.chartSpec" -}}
-chart: {{ .chart | quote }}
-version: {{ include "base-cluster.helm.chartVersion" (dict "repo" .repo "chart" .chart "context" .context) | quote }}
-sourceRef:
-  kind: HelmRepository
-  name: {{ .repo | quote }}
-  namespace: {{ .context.Release.Namespace }}
-{{- end -}}
\ No newline at end of file
+  {{- include "common.helm.chartSpec" (dict "context" .context "repo" .repo "chart" .chart "prependReleaseName" false) -}}
+{{- end -}}
diff --git a/charts/base-cluster/templates/_images.tpl b/charts/base-cluster/templates/_images.tpl
index c1266a7d0..e9ebebfd0 100644
--- a/charts/base-cluster/templates/_images.tpl
+++ b/charts/base-cluster/templates/_images.tpl
@@ -1,17 +1,17 @@
 {{- define "base-cluster.kubectl.image" -}}
-{{- include "common.images.image" (dict "imageRoot" .Values.global.kubectl.image "global" .Values.global) -}}
+  {{- include "common.images.image" (dict "imageRoot" .Values.global.kubectl.image "global" .Values.global) -}}
 {{- end -}}
 
 {{- define "base-cluster.curl.image" -}}
-{{- include "common.images.image" (dict "imageRoot" .Values.global.curl.image "global" .Values.global) -}}
+  {{- include "common.images.image" (dict "imageRoot" .Values.global.curl.image "global" .Values.global) -}}
 {{- end -}}
 
 {{- define "base-cluster.flux.image" -}}
-{{- include "common.images.image" (dict "imageRoot" .Values.global.flux.image "global" .Values.global) -}}
+  {{- include "common.images.image" (dict "imageRoot" .Values.global.flux.image "global" .Values.global) -}}
 {{- end -}}
 
 {{- define "base-cluster.gpg.image" -}}
-{{- include "common.images.image" (dict "imageRoot" .Values.global.gpg.image "global" .Values.global) -}}
+  {{- include "common.images.image" (dict "imageRoot" .Values.global.gpg.image "global" .Values.global) -}}
 {{- end -}}
 
 {{- define "base-cluster.defaultRegistry" -}}
diff --git a/charts/base-cluster/templates/_ingress.tpl b/charts/base-cluster/templates/_ingress.tpl
index 01b53ccb5..0156e7b61 100644
--- a/charts/base-cluster/templates/_ingress.tpl
+++ b/charts/base-cluster/templates/_ingress.tpl
@@ -1,7 +1,7 @@
 {{- define "base-cluster.certificate" -}}
-{{- if and .context.Values.dns.provider (not .customDomain) -}}
-cluster-wildcard-certificate
-{{- else -}}
-{{- printf "%s-certificate" .name -}}
-{{- end -}}
+  {{- if and .context.Values.dns.provider (not .customDomain) -}}
+    cluster-wildcard-certificate
+  {{- else -}}
+    {{- printf "%s-certificate" .name -}}
+  {{- end -}}
 {{- end -}}
diff --git a/charts/base-cluster/templates/_labels.tpl b/charts/base-cluster/templates/_labels.tpl
deleted file mode 100644
index 74b712e50..000000000
--- a/charts/base-cluster/templates/_labels.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Kubernetes secret labels
-*/}}
-{{- define "common.labels.stable" -}}
-{{- omit (include "common.labels.standard" . | fromYaml) "helm.sh/chart" | toYaml -}}
-{{- end -}}
diff --git a/charts/base-cluster/templates/backup/velero.yaml b/charts/base-cluster/templates/backup/velero.yaml
index c34fe0116..57c938a53 100644
--- a/charts/base-cluster/templates/backup/velero.yaml
+++ b/charts/base-cluster/templates/backup/velero.yaml
@@ -50,11 +50,11 @@ spec:
       allowPrivilegeEscalation: false
       seccompProfile:
         type: RuntimeDefault
-    resources: {{- .Values.backup.resources | toYaml | nindent 6 }}
+    resources: {{- include "common.resources" .Values.backup | nindent 6 }}
     priorityClassName: system-cluster-critical
     deployNodeAgent: true # enable FSB
     nodeAgent:
-      resources: {{- .Values.backup.nodeAgent.resources | toYaml | nindent 8 }}
+      resources: {{- include "common.resources" .Values.backup.nodeAgent | nindent 8 }}
       priorityClassName: system-cluster-critical
     configuration:
       defaultBackupStorageLocation: {{ .Values.backup.defaultLocation | quote }}
@@ -90,5 +90,5 @@ spec:
       uploaderType: restic
     metrics:
       serviceMonitor:
-        additionalLabels: {{- .Values.monitoring.labels | toYaml | nindent 10 }}
+        additionalLabels: {{- toYaml .Values.monitoring.labels | nindent 10 }}
 {{- end }}
diff --git a/charts/base-cluster/templates/cert-manager/cert-manager.yaml b/charts/base-cluster/templates/cert-manager/cert-manager.yaml
index 1212bd83d..2768fadfd 100644
--- a/charts/base-cluster/templates/cert-manager/cert-manager.yaml
+++ b/charts/base-cluster/templates/cert-manager/cert-manager.yaml
@@ -40,7 +40,7 @@ spec:
     extraArgs:
       - --dns01-recursive-nameservers={{- $nameservers | sortAlpha | join "," }}
     {{- end }}
-    resources: {{- $.Values.certManager.resources | toYaml | nindent 6 }}
+    resources: {{- include "common.resources" $.Values.certManager | nindent 6 }}
     replicaCount: 1
     securityContext: &securityContext
       runAsNonRoot: true
@@ -48,14 +48,14 @@ spec:
       runAsGroup: 1001
       fsGroup: 1001
     cainjector:
-      resources: {{- $.Values.certManager.caInjector.resources | toYaml | nindent 8 }}
+      resources: {{- include "common.resources" $.Values.certManager.caInjector | nindent 8 }}
       securityContext: *securityContext
       {{- if .Values.global.imageRegistry }}
       image:
         repository: {{ printf "%s/jetstack/cert-manager-cainjector" $.Values.global.imageRegistry }}
       {{- end }}
     webhook:
-      resources: {{- $.Values.certManager.webhook.resources | toYaml | nindent 8 }}
+      resources: {{- include "common.resources" $.Values.certManager.webhook | nindent 8 }}
       securityContext: *securityContext
       {{- if .Values.global.imageRegistry }}
       image:
@@ -65,4 +65,4 @@ spec:
       enabled: {{ .Values.monitoring.prometheus.enabled }}
       servicemonitor:
         enabled: {{ .Values.monitoring.prometheus.enabled }}
-        labels: {{- .Values.monitoring.labels | toYaml | nindent 10 }}
+        labels: {{- toYaml .Values.monitoring.labels | nindent 10 }}
diff --git a/charts/base-cluster/templates/cert-manager/clusterissuer.yaml b/charts/base-cluster/templates/cert-manager/clusterissuer.yaml
index 0a0e8364e..067f77cd5 100644
--- a/charts/base-cluster/templates/cert-manager/clusterissuer.yaml
+++ b/charts/base-cluster/templates/cert-manager/clusterissuer.yaml
@@ -9,7 +9,7 @@ apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
   name: letsencrypt-{{ .name }}
-  labels: {{- include "base-cluster.helm.labels" (dict) | nindent 4 }}
+  labels: {{- include "common.helm.labels" (dict) | nindent 4 }}
     app.kubernetes.io/component: {{ .name }}
     app.kubernetes.io/part-of: cert-manager
 spec:
@@ -27,7 +27,7 @@ spec:
           {{- end }}
         {{- with .context.Values.dns.domains }}
         selector:
-          dnsZones: {{- . | toYaml | nindent 12 }}
+          dnsZones: {{- toYaml . | nindent 12 }}
         {{- end }}
       {{- end }}
       - http01:
@@ -37,4 +37,4 @@ spec:
     privateKeySecretRef:
       name: letsencrypt-{{ .name }}-account
     server: {{ .url | quote }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/base-cluster/templates/cert-manager/rules/certificate-expiration.yaml b/charts/base-cluster/templates/cert-manager/rules/certificate-expiration.yaml
index 4ed344fbe..a1e9ac4cb 100644
--- a/charts/base-cluster/templates/cert-manager/rules/certificate-expiration.yaml
+++ b/charts/base-cluster/templates/cert-manager/rules/certificate-expiration.yaml
@@ -9,7 +9,7 @@ metadata:
   name: certificate-expiration
   namespace: cert-manager
   labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- .Values.monitoring.labels | toYaml | nindent 4 }}
+    {{- toYaml .Values.monitoring.labels | nindent 4 }}
     app.kubernetes.io/component: prometheus
     app.kubernetes.io/part-of: cert-manager
 spec:
diff --git a/charts/base-cluster/templates/descheduler/descheduler.yaml b/charts/base-cluster/templates/descheduler/descheduler.yaml
index 99e1b60c7..32058ab5a 100644
--- a/charts/base-cluster/templates/descheduler/descheduler.yaml
+++ b/charts/base-cluster/templates/descheduler/descheduler.yaml
@@ -10,7 +10,7 @@ metadata:
   namespace: kube-system
   labels: {{- include "common.labels.standard" $ | nindent 4 }}
     app.kubernetes.io/component: descheduler
-    {{- if not (eq $selectedVersion $latestVersion) }}
+    {{- if ne $selectedVersion $latestVersion }}
     helmrelease-metrics/ignore: "true"
     {{- end }}
 spec:
@@ -43,7 +43,7 @@ spec:
     {{- end }}
     deschedulerPolicy:
       evictLocalStoragePods: true
-      strategies: {{- .Values.descheduler.strategies | toYaml | nindent 8 }}
+      strategies: {{- toYaml .Values.descheduler.strategies | nindent 8 }}
     {{- if .Values.global.imageRegistry }}
     image:
       repository: {{ printf "%s/descheduler/descheduler" .Values.global.imageRegistry }}
diff --git a/charts/base-cluster/templates/dns/_dns-secret-template.yaml b/charts/base-cluster/templates/dns/_dns-secret-template.yaml
index 4bcc71299..3e3dd52d5 100644
--- a/charts/base-cluster/templates/dns/_dns-secret-template.yaml
+++ b/charts/base-cluster/templates/dns/_dns-secret-template.yaml
@@ -4,7 +4,7 @@ kind: Secret
 metadata:
   name: {{ .name }}
   namespace: {{ .namespace }}
-  labels: {{- include "common.labels.stable" .context | nindent 4 }}
+  labels: {{- include "common.labels.standard" .context | nindent 4 }}
     app.kubernetes.io/component: dns
     app.kubernetes.io/part-of: {{ .name }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/base-cluster/templates/dns/external-dns.yaml b/charts/base-cluster/templates/dns/external-dns.yaml
index 0c3776516..26eefd781 100644
--- a/charts/base-cluster/templates/dns/external-dns.yaml
+++ b/charts/base-cluster/templates/dns/external-dns.yaml
@@ -66,10 +66,10 @@ spec:
       allowPrivilegeEscalation: false
       seccompProfile:
         type: RuntimeDefault
-    resources: {{- .Values.externalDNS.resources | toYaml | nindent 6 }}
+    resources: {{- include "common.resources" .Values.externalDNS | nindent 6 }}
     metrics:
       enabled: {{ .Values.monitoring.prometheus.enabled }}
       serviceMonitor:
         enabled: {{ .Values.monitoring.prometheus.enabled }}
-        labels: {{- .Values.monitoring.labels | toYaml | nindent 10 }}
+        labels: {{- toYaml .Values.monitoring.labels | nindent 10 }}
 {{- end -}}
diff --git a/charts/base-cluster/templates/flux/flux.yaml b/charts/base-cluster/templates/flux/flux.yaml
index e061ada75..2d2ff7e78 100644
--- a/charts/base-cluster/templates/flux/flux.yaml
+++ b/charts/base-cluster/templates/flux/flux.yaml
@@ -51,7 +51,7 @@ metadata:
 spec:
   interval: {{ $instance.gitInterval | default "1m" | quote }}
   url: {{ $instance.url | quote }}
-  {{- if not (eq $authenticationMethod "none") }}
+  {{- if ne $authenticationMethod "none" }}
   secretRef:
     name: {{ $authenticationSecretName }}
   {{- end -}}
diff --git a/charts/base-cluster/templates/flux/podMonitor.yaml b/charts/base-cluster/templates/flux/podMonitor.yaml
index 84d90787f..3f9c40df8 100644
--- a/charts/base-cluster/templates/flux/podMonitor.yaml
+++ b/charts/base-cluster/templates/flux/podMonitor.yaml
@@ -9,7 +9,7 @@ metadata:
   name: flux
   namespace: {{ .Release.Namespace }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- .Values.monitoring.labels | toYaml | nindent 4 }}
+    {{- toYaml .Values.monitoring.labels | nindent 4 }}
     app.kubernetes.io/component: prometheus
     app.kubernetes.io/part-of: flux
 spec:
diff --git a/charts/base-cluster/templates/flux/rules/flux-status.yaml b/charts/base-cluster/templates/flux/rules/flux-status.yaml
index 29eae7adf..3e43a7e30 100644
--- a/charts/base-cluster/templates/flux/rules/flux-status.yaml
+++ b/charts/base-cluster/templates/flux/rules/flux-status.yaml
@@ -9,7 +9,7 @@ metadata:
   name: flux-status
   namespace: {{ .Release.Namespace }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- .Values.monitoring.labels | toYaml | nindent 4 }}
+    {{- toYaml .Values.monitoring.labels | nindent 4 }}
     app.kubernetes.io/component: prometheus
     app.kubernetes.io/part-of: flux
 spec:
diff --git a/charts/base-cluster/templates/global/_namespaces.tpl b/charts/base-cluster/templates/global/_namespaces.tpl
index d7d2fb58f..258f5aedd 100644
--- a/charts/base-cluster/templates/global/_namespaces.tpl
+++ b/charts/base-cluster/templates/global/_namespaces.tpl
@@ -13,5 +13,5 @@
     {{- $namespaces := set $namespaces $name (omit $namespace "condition") -}}
   {{- end -}}
 {{- end -}}
-{{- $namespaces | toYaml -}}
-{{- end -}}
\ No newline at end of file
+{{- toYaml $namespaces -}}
+{{- end -}}
diff --git a/charts/base-cluster/templates/global/certificates.yaml b/charts/base-cluster/templates/global/certificates.yaml
index 378d23207..bcd8871cc 100644
--- a/charts/base-cluster/templates/global/certificates.yaml
+++ b/charts/base-cluster/templates/global/certificates.yaml
@@ -27,7 +27,7 @@
       {{- $certs = set $certs $name $cert -}}
     {{- end -}}
   {{- end -}}
-  {{- $certs | toYaml -}}
+  {{- toYaml $certs -}}
 {{- end -}}
 
 {{- define "base-cluster.cert-manager.custom-certificates-yaml" -}}
@@ -37,13 +37,13 @@ kind: Certificate
 metadata:
   name: {{ $name | quote }}
   namespace: {{ $.context.Release.Namespace }}
-  labels: {{- include "base-cluster.helm.labels" (dict) | nindent 4 }}
+  labels: {{- include "common.helm.labels" (dict) | nindent 4 }}
 spec:
   issuerRef:
     group: cert-manager.io
     kind: ClusterIssuer
     name: letsencrypt-production
-  dnsNames: {{- $cert.dnsNames | toYaml | nindent 4 }}
+  dnsNames: {{- toYaml $cert.dnsNames | nindent 4 }}
   secretName: {{ printf "%s-certificate" $name | quote }}
   {{- if include "base-cluster.reflector.enabled" (dict "context" $.context) }}
   secretTemplate:
diff --git a/charts/base-cluster/templates/global/namespaces.yaml b/charts/base-cluster/templates/global/namespaces.yaml
index b4bff157d..a7cb4f0a8 100644
--- a/charts/base-cluster/templates/global/namespaces.yaml
+++ b/charts/base-cluster/templates/global/namespaces.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ $name }}
   labels: {{- include "common.labels.standard" $ | nindent 4 -}}
   {{- with $namespace.additionalLabels -}}
-    {{- . | toYaml | nindent 4 -}}
+    {{- toYaml . | nindent 4 -}}
   {{- end }}
 ---
 apiVersion: v1
@@ -52,9 +52,9 @@ spec:
     {{- range $resource, $quota := . -}}
       {{- $quotas = set $quotas $resource (include "common.tplvalues.render" (dict "value" $quota "context" $)) -}}
     {{- end }}
-  hard: {{- $quotas | toYaml | nindent 4 }}
+  hard: {{- toYaml $quotas | nindent 4 }}
   {{- end }}
 {{- end }}
 {{- end }}
 ---
-{{ end -}}
\ No newline at end of file
+{{ end -}}
diff --git a/charts/base-cluster/templates/ingress/nginx.yaml b/charts/base-cluster/templates/ingress/nginx.yaml
index 624782297..3bf82fbce 100644
--- a/charts/base-cluster/templates/ingress/nginx.yaml
+++ b/charts/base-cluster/templates/ingress/nginx.yaml
@@ -26,7 +26,7 @@ spec:
         enabled: {{ .Values.monitoring.prometheus.enabled }}
         serviceMonitor:
           enabled: {{ .Values.monitoring.prometheus.enabled }}
-          additionalLabels: {{- .Values.monitoring.labels | toYaml | nindent 12 }}
+          additionalLabels: {{- toYaml .Values.monitoring.labels | nindent 12 }}
       {{- if .Values.monitoring.tracing.enabled }}
       opentelemetry:
         enabled: true
@@ -57,7 +57,7 @@ spec:
         loadBalancerIP: {{ .Values.ingress.IP | quote }}
       {{- end }}
       replicaCount: {{ .Values.ingress.replicas }}
-      resources: {{- .Values.ingress.resources | toYaml | nindent 8 }}
+      resources: {{- include "common.resources" .Values.ingress | nindent 8 }}
       podSecurityContext:
         runAsNonRoot: true
         runAsGroup: 101
diff --git a/charts/base-cluster/templates/ingress/validation.tpl b/charts/base-cluster/templates/ingress/validation.tpl
index 0ae5ee755..e30bb6d05 100644
--- a/charts/base-cluster/templates/ingress/validation.tpl
+++ b/charts/base-cluster/templates/ingress/validation.tpl
@@ -20,7 +20,7 @@
       {{- end -}}
     {{- end -}}
   {{- end -}}
-  {{- if and $loadBalancerIP (not (eq $loadBalancerIP .Values.ingress.IP)) -}}
+  {{- if and $loadBalancerIP (ne $loadBalancerIP .Values.ingress.IP) -}}
       {{- fail "You cannot change the LoadBalancerIP on an existing service, if you really want to, please delete the service 'ingress-nginx/ingress-nginx-controller' beforehand" -}}
   {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/base-cluster/templates/kyverno/kyverno.yaml b/charts/base-cluster/templates/kyverno/kyverno.yaml
index 725518a9d..7014f9728 100644
--- a/charts/base-cluster/templates/kyverno/kyverno.yaml
+++ b/charts/base-cluster/templates/kyverno/kyverno.yaml
@@ -43,7 +43,7 @@ spec:
       {{- end }}
     serviceMonitor:
       enabled: {{ .Values.monitoring.prometheus.enabled }}
-      additionalLabels: {{- .Values.monitoring.labels | toYaml | nindent 8 }}
+      additionalLabels: {{- toYaml .Values.monitoring.labels | nindent 8 }}
     priorityClassName: system-cluster-critical
     # this only works in version 3
     admissionController:
diff --git a/charts/base-cluster/templates/kyverno/policies/_policyTemplate.yaml b/charts/base-cluster/templates/kyverno/policies/_policyTemplate.yaml
index 271759e43..5505b2366 100644
--- a/charts/base-cluster/templates/kyverno/policies/_policyTemplate.yaml
+++ b/charts/base-cluster/templates/kyverno/policies/_policyTemplate.yaml
@@ -10,11 +10,11 @@ apiVersion: kyverno.io/v1
 kind: ClusterPolicy
 metadata:
   name: {{ .name }}
-  labels: {{- include "base-cluster.helm.labels" (dict) | nindent 4 }}
+  labels: {{- include "common.helm.labels" (dict) | nindent 4 }}
     app.kubernetes.io/component: {{ .name }}
     app.kubernetes.io/part-of: kyverno-policies
   {{- with (dig "metadata" "annotations" nil $policy) }}
-  annotations: {{- . | toYaml | nindent 4 }}
+  annotations: {{- toYaml . | nindent 4 }}
   {{- end }}
 spec: {{- get $policy "spec" | toYaml | replace "{{" "{{ `{{` }}" | nindent 2 }}
 {{- end -}}
diff --git a/charts/base-cluster/templates/kyverno/policies/kyverno-base-policies/kyverno-policies.yaml b/charts/base-cluster/templates/kyverno/policies/kyverno-base-policies/kyverno-policies.yaml
index 3250047f1..1a0f0bec6 100644
--- a/charts/base-cluster/templates/kyverno/policies/kyverno-base-policies/kyverno-policies.yaml
+++ b/charts/base-cluster/templates/kyverno/policies/kyverno-base-policies/kyverno-policies.yaml
@@ -65,38 +65,38 @@ spec:
     policyExclude:
     {{- if $disallowHostPath }}
       disallow-host-path:
-        any: {{- $disallowHostPath | toYaml | nindent 10 }}
+        any: {{- toYaml $disallowHostPath | nindent 10 }}
       restrict-volume-types:
-        any: {{- $disallowHostPath | toYaml | nindent 10 }}
+        any: {{- toYaml $disallowHostPath | nindent 10 }}
     {{- end -}}
     {{- if $disallowHostPorts }}
       disallow-host-ports:
-        any: {{- $disallowHostPorts | toYaml | nindent 10 }}
+        any: {{- toYaml $disallowHostPorts | nindent 10 }}
     {{- end -}}
     {{- if $disallowHostNamespaces }}
       disallow-host-namespaces:
-        any: {{- $disallowHostNamespaces | toYaml | nindent 10 }}
+        any: {{- toYaml $disallowHostNamespaces | nindent 10 }}
     {{- end -}}
     {{- if $runAsNonRoot }}
       require-run-as-non-root-user:
-        any: {{- $runAsNonRoot | toYaml | nindent 10 }}
+        any: {{- toYaml $runAsNonRoot | nindent 10 }}
       require-run-as-nonroot:
-        any: {{- $runAsNonRoot | toYaml | nindent 10 }}
+        any: {{- toYaml $runAsNonRoot | nindent 10 }}
     {{- end -}}
     {{- if $restrictSeccomp }}
       restrict-seccomp:
-        any: {{- $restrictSeccomp | toYaml | nindent 10 }}
+        any: {{- toYaml $restrictSeccomp | nindent 10 }}
       restrict-seccomp-strict:
-        any: {{- $restrictSeccomp | toYaml | nindent 10 }}
+        any: {{- toYaml $restrictSeccomp | nindent 10 }}
     {{- end -}}
     {{- if $disallowPrivilegeEscalation }}
       disallow-privilege-escalation:
-        any: {{- $disallowPrivilegeEscalation | toYaml | nindent 10 }}
+        any: {{- toYaml $disallowPrivilegeEscalation | nindent 10 }}
     {{- end -}}
     {{- if $disallowCapabilities }}
       disallow-capabilities:
-        any: {{- $disallowCapabilities | toYaml | nindent 10 }}
+        any: {{- toYaml $disallowCapabilities | nindent 10 }}
       disallow-capabilities-strict:
-        any: {{- $disallowCapabilities | toYaml | nindent 10 }}
+        any: {{- toYaml $disallowCapabilities | nindent 10 }}
     {{- end -}}
 {{- end }}
diff --git a/charts/base-cluster/templates/monitoring/deadMansSwitch/hook-secret.yaml b/charts/base-cluster/templates/monitoring/deadMansSwitch/hook-secret.yaml
index 2dc07a0c7..ec5c2de56 100644
--- a/charts/base-cluster/templates/monitoring/deadMansSwitch/hook-secret.yaml
+++ b/charts/base-cluster/templates/monitoring/deadMansSwitch/hook-secret.yaml
@@ -11,5 +11,5 @@
       )
       $secret
    -}}
-  {{- $secret | toYaml -}}
+  {{- toYaml $secret -}}
 {{- end -}}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
index e34a68b4d..b0f7dec14 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
@@ -27,7 +27,7 @@ alertmanagerSpec:
           requests:
             storage: {{ .Values.monitoring.prometheus.alertmanager.persistence.size }}
   alertmanagerConfigSelector:
-    matchLabels: {{- .Values.monitoring.labels | toYaml | nindent 6 }}
+    matchLabels: {{- toYaml .Values.monitoring.labels | nindent 6 }}
 config:
   {{- if .Values.monitoring.prometheus.alertmanager.receivers.pagerduty.enabled }}
   global:
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
index b8606943d..266c195cb 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
@@ -12,10 +12,10 @@ securityContext:
   seccompProfile:
     type: RuntimeDefault
 containerSecurityContext: {{- include "base-cluster.prometheus-stack.containerSecurityContext" (dict) | nindent 2 }}
-resources: {{- .Values.monitoring.grafana.resources | toYaml | nindent 2 }}
+resources: {{- include "common.resources" .Values.monitoring.grafana | nindent 2 }}
 serviceMonitor:
   interval: "30s"
-  labels: {{- .Values.monitoring.labels | toYaml | nindent 4 }}
+  labels: {{- toYaml .Values.monitoring.labels | nindent 4 }}
 podAnnotations:
   # This might change on every `template` call, this can be ignored
   checksum/secret: {{ include "common.utils.checksumTemplate" (dict "path" "/monitoring/kube-prometheus-stack/grafana-secret.yaml" "context" $) }}
@@ -26,7 +26,7 @@ admin:
 plugins:
   - grafana-piechart-panel
   {{- with .Values.monitoring.grafana.additionalPlugins }}
-  {{- . | toYaml | nindent 2 }}
+  {{- toYaml . | nindent 2 }}
   {{- end }}
 defaultDashboardsEnabled: true
   {{- if .Values.monitoring.grafana.notifiers }}
@@ -35,7 +35,7 @@ extraEmptyDirMounts:
     mountPath: /etc/grafana/provisioning/notifiers
 notifiers:
   notifiers.yaml:
-    notifiers: {{- .Values.monitoring.grafana.notifiers | toYaml | nindent 6 }}
+    notifiers: {{- toYaml .Values.monitoring.grafana.notifiers | nindent 6 }}
   {{- end }}
 dashboardProviders:
   dashboardproviders.yaml:
@@ -58,7 +58,7 @@ sidecar:
     enabled: true
     resource: configmap
     searchNamespace: ALL
-  resources: {{- .Values.monitoring.grafana.sidecar.resources | toYaml | nindent 4 }}
+  resources: {{- include "common.resources" .Values.monitoring.grafana.sidecar | nindent 4 }}
   securityContext: {{- include "base-cluster.prometheus-stack.containerSecurityContext" (dict) | nindent 4 }}
 dashboards:
   custom:
@@ -133,7 +133,7 @@ dashboards:
       revision: 9
     {{- end }}
   {{- with .Values.monitoring.grafana.additionalDashboards }}
-  {{ . | toYaml | nindent 4 }}
+  {{ toYaml . | nindent 4 }}
   {{- end }}
 {{- include "base-cluster.monitoring.ingress" (dict "name" "grafana" "context" $) | nindent 0 }}
 {{- if and .Values.ingress.enabled .Values.monitoring.grafana.ingress.enabled .Values.certManager.email (or .Values.global.baseDomain .Values.monitoring.grafana.ingress.customDomain) }}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_helpers.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_helpers.yaml
index 11a2365fd..51ce23289 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_helpers.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_helpers.yaml
@@ -27,7 +27,7 @@ privileged: false
 {{- end -}}
 
 {{- define "base-cluster.alertmanager.ingress" -}}
-  {{- .Values.monitoring.prometheus.alertmanager.ingress | toYaml -}}
+  {{- toYaml .Values.monitoring.prometheus.alertmanager.ingress -}}
 {{- end -}}
 
 {{- define "base-cluster.monitoring.ingress.config" -}}
@@ -36,7 +36,7 @@ privileged: false
   {{- if not $ingress -}}
     {{- $ingress = include (printf "base-cluster.%s.ingress" .name) .context | fromYaml -}}
   {{- end -}}
-  {{- $ingress | toYaml -}}
+  {{- toYaml $ingress -}}
 {{- end -}}
 
 {{- define "base-cluster.monitoring.ingress.enabled" -}}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml
index c654e783b..ee9ab1be6 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml
@@ -3,7 +3,7 @@
 image:
   registry: {{ .Values.global.imageRegistry }}
   {{- end }}
-resources: {{- .Values.monitoring.prometheus.kubeStateMetrics.resources | toYaml | nindent 2 }}
+resources: {{- include "common.resources" .Values.monitoring.prometheus.kubeStateMetrics | nindent 2 }}
   {{- $metricLabelsAllowList := list -}}
   {{- range $resource, $labels := .Values.monitoring.prometheus.kubeStateMetrics.metricLabelsAllowList -}}
     {{- $metricLabelsAllowList = append $metricLabelsAllowList (printf "%s=[%s]" $resource ($labels | join ",") ) -}}
@@ -19,5 +19,5 @@ securityContext:
 containerSecurityContext: {{- include "base-cluster.prometheus-stack.containerSecurityContext" (dict) | nindent 2 }}
 prometheus:
   monitor:
-    additionalLabels: {{- .Values.monitoring.labels | toYaml | nindent 6 }}
+    additionalLabels: {{- toYaml .Values.monitoring.labels | nindent 6 }}
 {{- end -}}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_node-exporter-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_node-exporter-config.yaml
index 0e3932f26..933d30cf2 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_node-exporter-config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_node-exporter-config.yaml
@@ -3,7 +3,7 @@
 image:
   registry: {{ .Values.global.imageRegistry }}
   {{- end }}
-resources: {{- .Values.monitoring.prometheus.nodeExporter.resources | toYaml | nindent 2 }}
+resources: {{- include "common.resources" .Values.monitoring.prometheus.nodeExporter | nindent 2 }}
 priorityClassName: monitoring-components
 securityContext:
   seccompProfile:
@@ -11,5 +11,5 @@ securityContext:
 containerSecurityContext: {{- include "base-cluster.prometheus-stack.containerSecurityContext" (dict) | nindent 2 }}
 prometheus:
   monitor:
-    additionalLabels: {{- .Values.monitoring.labels | toYaml | nindent 6 }}
+    additionalLabels: {{- toYaml .Values.monitoring.labels | nindent 6 }}
 {{- end -}}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_prometheus-stack-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_prometheus-stack-config.yaml
index 7fc8372ec..b68e5eaba 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_prometheus-stack-config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_prometheus-stack-config.yaml
@@ -5,7 +5,7 @@ global:
   {{- end }}
 prometheusOperator:
   secretFieldSelector: 'type!=helm.sh/release.v1'
-  resources: {{- .Values.monitoring.prometheus.operator.resources | toYaml | nindent 4 }}
+  resources: {{- include "common.resources" .Values.monitoring.prometheus.operator | nindent 4 }}
   priorityClassName: monitoring-components
   securityContext:
     seccompProfile:
@@ -20,7 +20,7 @@ defaultRules:
 kubelet:
   serviceMonitor:
     resource: false
-commonLabels: {{- .Values.monitoring.labels | toYaml | nindent 2 }}
+commonLabels: {{- toYaml .Values.monitoring.labels | nindent 2 }}
 grafana: {{- include "base-cluster.prometheus-stack.grafana.config" . | nindent 2 }}
 kube-state-metrics: {{- include "base-cluster.prometheus-stack.kube-state-metrics.config" . | nindent 2 }}
 prometheus-node-exporter: {{- include "base-cluster.prometheus-stack.node-exporter.config" . | nindent 2 }}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_prometheus_config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_prometheus_config.yaml
index 5d244c7e6..2a9a9bb25 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_prometheus_config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_prometheus_config.yaml
@@ -12,7 +12,7 @@ prometheusSpec:
   {{- if include "base-cluster.monitoring.authenticated-ingress.enabled" (dict "name" "prometheus" "context" .) }}
   externalUrl: {{ printf "https://%s" (include "base-cluster.prometheus.host" $) }}
   {{- end }}
-  resources: {{- .Values.monitoring.prometheus.resources | toYaml | nindent 4 }}
+  resources: {{- include "common.resources" .Values.monitoring.prometheus | nindent 4 }}
   priorityClassName: monitoring-components
   securityContext:
     seccompProfile:
@@ -33,13 +33,13 @@ prometheusSpec:
             storage: {{ .Values.monitoring.prometheus.persistence.size }}
   replicas: {{ .Values.monitoring.prometheus.replicas }}
   ruleSelector:
-    matchLabels: {{- .Values.monitoring.labels | toYaml | nindent 6 }}
+    matchLabels: {{- toYaml .Values.monitoring.labels | nindent 6 }}
   serviceMonitorSelector:
-    matchLabels: {{- .Values.monitoring.labels | toYaml | nindent 6 }}
+    matchLabels: {{- toYaml .Values.monitoring.labels | nindent 6 }}
   podMonitorSelector:
-    matchLabels: {{- .Values.monitoring.labels | toYaml | nindent 6 }}
+    matchLabels: {{- toYaml .Values.monitoring.labels | nindent 6 }}
   probeSelector:
-    matchLabels: {{- .Values.monitoring.labels | toYaml | nindent 6 }}
+    matchLabels: {{- toYaml .Values.monitoring.labels | nindent 6 }}
   additionalAlertRelabelConfigs:
     {{- if not .Values.monitoring.monitorAllNamespaces }}
       {{- $namespaces := list .Release.Namespace "kube-node-lease" "kube-public" "kube-system" -}}
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 4c9c161f9..d73525145 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
@@ -5,7 +5,7 @@ kind: Secret
 metadata:
   name: {{ $name }}
   namespace: monitoring
-  labels: {{- include "common.labels.stable" $ | nindent 4 }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
     app.kubernetes.io/component: grafana
     app.kubernetes.io/part-of: monitoring
 type: Opaque
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 0c162605b..0f1c51793 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
@@ -5,7 +5,7 @@ kind: Secret
 metadata:
   name: {{ $name }}
   namespace: monitoring
-  labels: {{- include "common.labels.stable" $ | nindent 4 }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
     app.kubernetes.io/component: oauth-proxy
     app.kubernetes.io/part-of: monitoring
 type: Opaque
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy.yaml
index 42a47c6a3..dc39e2e53 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy.yaml
@@ -47,7 +47,7 @@ spec:
       enabled: true
     containerSecurityContext:
       enabled: true
-    resources: {{- toYaml $.Values.global.authentication.oauthProxy.resources | nindent 6 }}
+    resources: {{- include "common.resources" $.Values.global.authentication.oauthProxy | nindent 6 }}
     configuration:
       existingSecret: {{ include "common.secrets.name" (dict "defaultNameSuffix" "oauth-proxy" "context" $) }}
       content: |-
diff --git a/charts/base-cluster/templates/monitoring/loki/loki.yaml b/charts/base-cluster/templates/monitoring/loki/loki.yaml
index 5e09be99a..07bba4863 100644
--- a/charts/base-cluster/templates/monitoring/loki/loki.yaml
+++ b/charts/base-cluster/templates/monitoring/loki/loki.yaml
@@ -31,7 +31,7 @@ spec:
       url: {{ `http://{{ (include "loki.serviceName" .) }}.{{ .Release.Namespace }}:{{ .Values.loki.service.port }}` }}
       image:
         repository: {{ printf "%s/grafana/loki" ($.Values.global.imageRegistry | default (include "base-cluster.defaultRegistry" (dict))) }}
-      resources: {{- .Values.monitoring.loki.resources | toYaml | nindent 8 }}
+      resources: {{- include "common.resources" .Values.monitoring.loki | nindent 8 }}
       replicas: {{ .Values.monitoring.loki.replicas }}
       persistence: {{- include "common.storage.class" (dict "persistence" .Values.monitoring.loki.persistence "global" $.Values.global) | nindent 8 }}
         enabled: true
@@ -46,7 +46,7 @@ spec:
             - ALL
       serviceMonitor:
         enabled: true
-        additionalLabels: {{- .Values.monitoring.labels | toYaml | nindent 10 }}
+        additionalLabels: {{- toYaml .Values.monitoring.labels | nindent 10 }}
       config:
         table_manager:
           retention_deletes_enabled: true
@@ -83,14 +83,14 @@ spec:
       image:
         registry: {{ $.Values.global.imageRegistry }}
       {{- end }}
-      resources: {{- .Values.monitoring.loki.promtail.resources | toYaml | nindent 8 }}
+      resources: {{- include "common.resources" .Values.monitoring.loki.promtail | nindent 8 }}
       containerSecurityContext:
         seccompProfile:
           type: RuntimeDefault
       priorityClassName: monitoring-components
       serviceMonitor:
         enabled: true
-        labels: {{- .Values.monitoring.labels | toYaml | nindent 10 }}
+        labels: {{- toYaml .Values.monitoring.labels | nindent 10 }}
     grafana:
       enabled: false
       sidecar:
diff --git a/charts/base-cluster/templates/monitoring/security/trivy.yaml b/charts/base-cluster/templates/monitoring/security/trivy.yaml
index 9ea723ac2..fa37640d5 100644
--- a/charts/base-cluster/templates/monitoring/security/trivy.yaml
+++ b/charts/base-cluster/templates/monitoring/security/trivy.yaml
@@ -65,5 +65,5 @@ spec:
     excludeNamespaces: ""
     serviceMonitor:
       enabled: {{ .Values.monitoring.prometheus.enabled }}
-      labels: {{- .Values.monitoring.labels | toYaml | nindent 8 }}
+      labels: {{- toYaml .Values.monitoring.labels | nindent 8 }}
 {{- end }}
diff --git a/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml b/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
index 7e65befd5..734bac602 100644
--- a/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
+++ b/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
@@ -21,9 +21,7 @@ spec:
     global:
       imageRegistry: {{ $.Values.global.imageRegistry }}
     {{- end }}
-    ingester:
-      resourcesPreset: {{ .Values.monitoring.tracing.ingester.resourcesPreset }}
-      resources: {{- toYaml .Values.monitoring.tracing.ingester.resources | nindent 8 }}
+    ingester: {{- include "common.resourcesWithPreset" .Values.monitoring.tracing.ingester | nindent 6 }}
     tempo:
       traces:
         jaeger:
@@ -35,7 +33,7 @@ spec:
       enabled: true
       serviceMonitor:
         enabled: true
-        labels: {{- .Values.monitoring.labels | toYaml | nindent 10 }}
+        labels: {{- toYaml .Values.monitoring.labels | nindent 10 }}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/charts/base-cluster/templates/monitoring/tracing/opentelemetry-collector.yaml b/charts/base-cluster/templates/monitoring/tracing/opentelemetry-collector.yaml
index 89a07b742..ce9e780ca 100644
--- a/charts/base-cluster/templates/monitoring/tracing/opentelemetry-collector.yaml
+++ b/charts/base-cluster/templates/monitoring/tracing/opentelemetry-collector.yaml
@@ -49,7 +49,7 @@ spec:
         enabled: true
     podMonitor:
       enabled: true
-      extraLabels: {{- .Values.monitoring.labels | toYaml | nindent 8 }}
+      extraLabels: {{- toYaml .Values.monitoring.labels | nindent 8 }}
     prometheusRule:
       enabled: true
       defaultRules:
diff --git a/charts/base-cluster/templates/nfs-server-provisioner/nfs-server-provisioner.yaml b/charts/base-cluster/templates/nfs-server-provisioner/nfs-server-provisioner.yaml
index 145c78385..cb1ce237f 100644
--- a/charts/base-cluster/templates/nfs-server-provisioner/nfs-server-provisioner.yaml
+++ b/charts/base-cluster/templates/nfs-server-provisioner/nfs-server-provisioner.yaml
@@ -20,7 +20,7 @@ spec:
       enabled: true
       size: {{ .Values.storage.readWriteMany.persistence.size }}
     {{- $storageClass := include "common.storage.class" (dict "persistence" .Values.storage.readWriteMany.persistence "global" $.Values.global) | fromYaml -}}
-    {{- if not (eq $storageClass.storageClassName nil) }}
+    {{- if ne $storageClass.storageClassName nil }}
       storageClass: {{ $storageClass.storageClassName | quote }}
     {{- end }}
     {{- if .Values.global.imageRegistry }}
diff --git a/charts/base-cluster/templates/nfs-server-provisioner/rules/storage-size.yaml b/charts/base-cluster/templates/nfs-server-provisioner/rules/storage-size.yaml
index 19e933132..d31939892 100644
--- a/charts/base-cluster/templates/nfs-server-provisioner/rules/storage-size.yaml
+++ b/charts/base-cluster/templates/nfs-server-provisioner/rules/storage-size.yaml
@@ -9,7 +9,7 @@ metadata:
   name: storage-size
   namespace: nfs-server-provisioner
   labels: {{- include "common.labels.standard" $ | nindent 4 }}
-    {{- .Values.monitoring.labels | toYaml | nindent 4 }}
+    {{- toYaml .Values.monitoring.labels | nindent 4 }}
     app.kubernetes.io/component: prometheus
     app.kubernetes.io/part-of: nfs-server-provisioner
 spec:
diff --git a/charts/base-cluster/templates/rbac/_rbac.tpl b/charts/base-cluster/templates/rbac/_rbac.tpl
index a9b175c0e..095e1438a 100644
--- a/charts/base-cluster/templates/rbac/_rbac.tpl
+++ b/charts/base-cluster/templates/rbac/_rbac.tpl
@@ -34,5 +34,5 @@
     {{- $roles = set $roles $roleName $existingRole -}}
   {{- end -}}
 {{- end -}}
-{{- $roles | toYaml -}}
-{{- end -}}
\ No newline at end of file
+{{- toYaml $roles -}}
+{{- end -}}
diff --git a/charts/base-cluster/templates/rbac/roles.yaml b/charts/base-cluster/templates/rbac/roles.yaml
index 76d583b25..6daa64111 100644
--- a/charts/base-cluster/templates/rbac/roles.yaml
+++ b/charts/base-cluster/templates/rbac/roles.yaml
@@ -11,5 +11,5 @@ metadata:
   name: {{ printf "%s-%s" (include "common.names.fullname" $) $name }}
   labels: {{- include "common.labels.standard" $ | nindent 4 }}
     app.kubernetes.io/component: rbac
-rules: {{- $spec | toYaml | nindent 2 }}
-{{- end -}}
\ No newline at end of file
+rules: {{- toYaml $spec | nindent 2 }}
+{{- end -}}
diff --git a/charts/base-cluster/templates/validation.yaml b/charts/base-cluster/templates/validation.yaml
index 951e1d38a..77566ae41 100644
--- a/charts/base-cluster/templates/validation.yaml
+++ b/charts/base-cluster/templates/validation.yaml
@@ -1,5 +1,5 @@
 {{/* Don't fail in namespace default -> this allows artifacthub to check for images */}}
-{{- if not (eq .Release.Namespace "default") -}}
+{{- if ne .Release.Namespace "default" -}}
   {{- if not .Values.global.clusterName }}
     {{- fail "You need to specify a .Values.global.clusterName" -}}
   {{- end -}}
@@ -13,4 +13,4 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: Please don't install me in `default`
-{{- end -}}
\ No newline at end of file
+{{- end -}}