diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml
index aa858c930b6..b75ae1165e6 100644
--- a/charts/stable/traefik/Chart.yaml
+++ b/charts/stable/traefik/Chart.yaml
@@ -22,4 +22,4 @@ sources:
 - https://github.com/traefik/traefik-helm-chart
 - https://traefik.io/
 type: application
-version: 9.0.3
+version: 9.0.4
diff --git a/charts/stable/traefik/templates/middlewares/forwardauth.yaml b/charts/stable/traefik/templates/middlewares/forwardauth.yaml
index 53f4ef5cc18..7a3e32fdbf7 100644
--- a/charts/stable/traefik/templates/middlewares/forwardauth.yaml
+++ b/charts/stable/traefik/templates/middlewares/forwardauth.yaml
@@ -13,11 +13,13 @@ metadata:
 spec:
   forwardAuth:
     address: {{ $middlewareData.address }}
-    {{- if $middlewareData.authResponseHeaders }}
-    authResponseHeaders: {{ $middlewareData.authResponseHeaders }}
+    {{- with $middlewareData.authResponseHeaders }}
+    authResponseHeaders:
+    {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- if $middlewareData.authRequestHeaders }}
-    authRequestHeaders: {{ $middlewareData.authRequestHeaders }}
+    {{- with $middlewareData.authRequestHeaders }}
+    authRequestHeaders:
+    {{- toYaml . | nindent 4 }}
     {{- end }}
     {{- if $middlewareData.authResponseHeadersRegex }}
     authResponseHeadersRegex: {{ $middlewareData.authResponseHeadersRegex }}