diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml
index c3717c22ca4..696b88735a3 100644
--- a/charts/enterprise/traefik/Chart.yaml
+++ b/charts/enterprise/traefik/Chart.yaml
@@ -23,7 +23,7 @@ sources:
   - https://github.com/traefik/traefik-helm-chart
   - https://traefik.io/
 type: application
-version: 18.0.2
+version: 18.0.3
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/enterprise/traefik/templates/_portalhook.tpl b/charts/enterprise/traefik/templates/_portalhook.tpl
index d6f939e9fdd..b19aa9ec1b3 100644
--- a/charts/enterprise/traefik/templates/_portalhook.tpl
+++ b/charts/enterprise/traefik/templates/_portalhook.tpl
@@ -6,7 +6,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: portalhook{{ if $.Values.ingressClass.enabled }}-{{ .Release.Name }}{{ end }}
+  name: {{ ternary "portalhook" (printf "portalhook-%v" .Release.Name ) $.Values.ingressClass.enabled }}
   namespace: tc-system
 data:
   {{- $ports := dict }}
diff --git a/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml b/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml
index 0bf3774872a..3b010c207f6 100644
--- a/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   addPrefix:
diff --git a/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml b/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml
index d531e76e469..dedc490442f 100644
--- a/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml
@@ -1,10 +1,9 @@
 {{- $values := .Values }}
-
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+  name: {{ ternary (printf "%v-compress" .Release.Name) "compress" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   compress: {}
@@ -14,7 +13,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
+  name: {{ ternary (printf "%v-basic-ratelimit" .Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   rateLimit:
@@ -24,7 +23,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-secure-headers
+  name: {{ ternary (printf "%v-basic-secure-headers" .Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   headers:
@@ -49,11 +48,11 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}chain-basic
+  name: {{ ternary (printf "%v-chain-basic" .Release.Name) "chain-basic" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   chain:
     middlewares:
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-secure-headers
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - name: {{ ternary (printf "%v-basic-ratelimit" .Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }}
+    - name: {{ ternary (printf "%v-basic-secure-headers" .Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }}
+    - name: {{ ternary (printf "%v-compress" .Release.Name) "compress" $.Values.ingressClass.enabled }}
diff --git a/charts/enterprise/traefik/templates/middlewares/basicauth.yaml b/charts/enterprise/traefik/templates/middlewares/basicauth.yaml
index 8f23b4276e4..c4bf7575c18 100644
--- a/charts/enterprise/traefik/templates/middlewares/basicauth.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/basicauth.yaml
@@ -3,9 +3,9 @@
 {{ range $index, $middlewareData := .Values.middlewares.basicAuth }}
 ---
 {{- $users := list }}
-{{ range $index, $userdata := $middlewareData.users }}
-    {{ $users = append $users ( htpasswd $userdata.username $userdata.password ) }}
-{{ end }}
+{{- range $index, $userdata := $middlewareData.users }}
+  {{- $users = append $users (htpasswd $userdata.username $userdata.password) }}
+{{- end }}
 
 apiVersion: v1
 kind: Secret
@@ -23,9 +23,9 @@ stringData:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   basicAuth:
-    secret: {{printf "%v-%v" $middlewareData.name "secret" }}
+    secret: {{ printf "%v-%v" $middlewareData.name "secret" }}
 {{ end }}
diff --git a/charts/enterprise/traefik/templates/middlewares/chain.yaml b/charts/enterprise/traefik/templates/middlewares/chain.yaml
index 67dc06fe38b..14a1bee7eec 100644
--- a/charts/enterprise/traefik/templates/middlewares/chain.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/chain.yaml
@@ -10,7 +10,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   chain:
diff --git a/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml b/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml
index e51a88874d4..62efb45da10 100644
--- a/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml
@@ -5,7 +5,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   forwardAuth:
diff --git a/charts/enterprise/traefik/templates/middlewares/geoblock.yaml b/charts/enterprise/traefik/templates/middlewares/geoblock.yaml
index e5a9630161b..0cefca3ee76 100644
--- a/charts/enterprise/traefik/templates/middlewares/geoblock.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/geoblock.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   plugin:
diff --git a/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml b/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml
index fd0a4e33a56..2d643596094 100644
--- a/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   ipWhiteList:
diff --git a/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml b/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml
index ab27923d0ee..e1d5f80cb20 100644
--- a/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   rateLimit:
diff --git a/charts/enterprise/traefik/templates/middlewares/real-ip.yaml b/charts/enterprise/traefik/templates/middlewares/real-ip.yaml
index 0b21cce1bf8..badb3d66ece 100644
--- a/charts/enterprise/traefik/templates/middlewares/real-ip.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/real-ip.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   plugin:
diff --git a/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml b/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml
index 3140bd39f78..4d4a029fe86 100644
--- a/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   redirectScheme:
diff --git a/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml b/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml
index 4ecb9baf8e8..665fbf54c11 100644
--- a/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   redirectRegex:
diff --git a/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml b/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml
index ff3d979559d..91a3702c5eb 100644
--- a/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   stripPrefixRegex:
diff --git a/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml b/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml
index fdf7fe3d4b0..eab9c0ad33c 100644
--- a/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml
@@ -4,23 +4,23 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-chain
+  name: {{ ternary (printf "%v-%v" .Release.Name "tc-opencors-chain") "tc-opencors-chain" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   chain:
     middlewares:
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-headers
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - name: {{ ternary (printf "%v-%v" .Release.Name "basic-ratelimit") "basic-ratelimit" $.Values.ingressClass.enabled }}
+    - name: {{ ternary (printf "%v-%v" .Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }}
+    - name: {{ ternary (printf "%v-%v" .Release.Name "compress") "compress" $.Values.ingressClass.enabled }}
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-chain
+  name: {{ ternary (printf "%v-%v" .Release.Name "tc-closedcors-chain") "tc-closedcors-chain" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   chain:
     middlewares:
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-headers
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - name: {{ ternary (printf "%v-%v" .Release.Name "basic-ratelimit") "basic-ratelimit" $.Values.ingressClass.enabled }}
+    - name: {{ ternary (printf "%v-%v" .Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }}
+    - name: {{ ternary (printf "%v-%v" .Release.Name "compress") "compress" $.Values.ingressClass.enabled }}
diff --git a/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml b/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml
index 6f37e0c5792..92795070f7f 100644
--- a/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml
@@ -4,7 +4,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-headers
+  name: {{ ternary (printf "%v-%v" .Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   headers:
@@ -34,7 +34,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-headers
+  name: {{ ternary (printf "%v-%v" .Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   headers:
diff --git a/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml b/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml
index 778a6da9cbf..991a4344a4f 100644
--- a/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml
@@ -4,7 +4,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-redirectregex-dav
+  name: {{ ternary (printf "%v-%v" .Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   redirectRegex:
@@ -14,9 +14,9 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-chain
+  name: {{ ternary (printf "%v-%v" .Release.Name "tc-nextcloud-chain") "tc-nextcloud-chain" $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   chain:
     middlewares:
-    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-redirectregex-dav
+    - name: {{ ternary (printf "%v-%v" .Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }}
diff --git a/charts/enterprise/traefik/templates/middlewares/theme-park.yaml b/charts/enterprise/traefik/templates/middlewares/theme-park.yaml
index bf0c78b4208..7be7ecfe84d 100644
--- a/charts/enterprise/traefik/templates/middlewares/theme-park.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/theme-park.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }}
   namespace: tc-system
 spec:
   plugin: