diff --git a/charts/core/prometheus/Chart.yaml b/charts/core/prometheus/Chart.yaml
index 8b20c75f0b8..487bcebc499 100644
--- a/charts/core/prometheus/Chart.yaml
+++ b/charts/core/prometheus/Chart.yaml
@@ -28,7 +28,7 @@ sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 1.1.35
+version: 1.1.36
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/core/prometheus/templates/prometheus/clusterrole.yaml b/charts/core/prometheus/templates/prometheus/clusterrole.yaml
index c77a446b85c..ae96e2d45f8 100644
--- a/charts/core/prometheus/templates/prometheus/clusterrole.yaml
+++ b/charts/core/prometheus/templates/prometheus/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.prometheus.enabled -}}
+{{- if .Values.prometheus.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
diff --git a/charts/core/prometheus/templates/prometheus/clusterrolebinding.yaml b/charts/core/prometheus/templates/prometheus/clusterrolebinding.yaml
index 154b209a6f1..7ca10743f4a 100644
--- a/charts/core/prometheus/templates/prometheus/clusterrolebinding.yaml
+++ b/charts/core/prometheus/templates/prometheus/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.prometheus.enabled }}
+{{- if .Values.prometheus.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
diff --git a/charts/core/traefik/Chart.yaml b/charts/core/traefik/Chart.yaml
index 312b012819a..708dc61a9ce 100644
--- a/charts/core/traefik/Chart.yaml
+++ b/charts/core/traefik/Chart.yaml
@@ -22,7 +22,7 @@ sources:
 - https://github.com/traefik/traefik-helm-chart
 - https://traefik.io/
 type: application
-version: 10.0.33
+version: 10.0.34
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/core/traefik/templates/_args.tpl b/charts/core/traefik/templates/_args.tpl
index e3a069a06d7..fd8f62c1442 100644
--- a/charts/core/traefik/templates/_args.tpl
+++ b/charts/core/traefik/templates/_args.tpl
@@ -48,7 +48,7 @@ args:
   {{- end }}
   {{- if .Values.providers.kubernetesIngress.enabled }}
   - "--providers.kubernetesingress"
-  {{- if and .Values.providers.kubernetesIngress.publishedService.enabled }}
+  {{- if .Values.providers.kubernetesIngress.publishedService.enabled }}
   - "--providers.kubernetesingress.ingressendpoint.publishedservice={{ template "providers.kubernetesIngress.publishedServicePath" . }}"
   {{- end }}
   {{- if .Values.providers.kubernetesIngress.labelSelector }}
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index b53de33cf7b..f620a7d2f6b 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.10.2
+version: 8.10.3
diff --git a/charts/library/common/templates/addons/vpn/wireguard/_container.tpl b/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
index 6689f70ba9e..1445f3f0015 100644
--- a/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
+++ b/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
@@ -53,7 +53,7 @@ env:
 volumeMounts:
   - mountPath: {{ .Values.persistence.shared.mountPath }}
     name: shared
-{{- if or .Values.addons.vpn.configFile }}
+{{- if .Values.addons.vpn.configFile }}
   - name: vpnconfig
     mountPath: /etc/wireguard/wg0.conf
 {{- end }}
diff --git a/charts/library/common/templates/configmaps/_portal.tpl b/charts/library/common/templates/configmaps/_portal.tpl
index d05f214b496..4d55d68f991 100644
--- a/charts/library/common/templates/configmaps/_portal.tpl
+++ b/charts/library/common/templates/configmaps/_portal.tpl
@@ -69,7 +69,7 @@
   {{- $host = .Values.portal.host }}
 {{- end }}
 
-{{- if and ( .Values.portal.path ) }}
+{{- if .Values.portal.path }}
   {{- $path = .Values.portal.path }}
 {{- end }}
 
diff --git a/charts/stable/authelia/Chart.yaml b/charts/stable/authelia/Chart.yaml
index ba5d5c2fe44..ca64a7c0b4e 100644
--- a/charts/stable/authelia/Chart.yaml
+++ b/charts/stable/authelia/Chart.yaml
@@ -38,7 +38,7 @@ sources:
 - https://github.com/authelia/chartrepo
 - https://github.com/authelia/authelia
 type: application
-version: 8.0.23
+version: 8.0.24
 annotations:
   truecharts.org/catagories: |
     - security
diff --git a/charts/stable/authelia/templates/_configmap.tpl b/charts/stable/authelia/templates/_configmap.tpl
index 5341a457401..57d75320032 100644
--- a/charts/stable/authelia/templates/_configmap.tpl
+++ b/charts/stable/authelia/templates/_configmap.tpl
@@ -18,7 +18,7 @@ data:
   AUTHELIA_NOTIFIER_SMTP_PASSWORD_FILE: "/secrets/SMTP_PASSWORD"
   {{- end }}
   AUTHELIA_SESSION_REDIS_PASSWORD_FILE: "/secrets/REDIS_PASSWORD"
-  {{- if and .Values.redisProvider.high_availability.enabled}}
+  {{- if .Values.redisProvider.high_availability.enabled }}
   AUTHELIA_SESSION_REDIS_HIGH_AVAILABILITY_SENTINEL_PASSWORD_FILE: "/secrets/REDIS_SENTINEL_PASSWORD"
   {{- end }}
   {{- if .Values.duo_api.enabled }}