diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml
index c3c80902df5..97a91f57274 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: 21.0.4
+version: 21.0.5
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/templates/questions/traefik/customRequestHeadersMiddleware.yaml b/templates/questions/traefik/customRequestHeadersMiddleware.yaml
index f0a1256cdb2..7baa729c9cb 100644
--- a/templates/questions/traefik/customRequestHeadersMiddleware.yaml
+++ b/templates/questions/traefik/customRequestHeadersMiddleware.yaml
@@ -21,18 +21,24 @@
                         type: list
                         default: []
                         items:
-                          - variable: name
-                            label: Header Name
-                            description: Name of custom header to be added to requests, eg. X-Custom-Header
+                          - variable: headersEntry
+                            label: ""
                             schema:
-                              valid_chars: ^[a-zA-Z0-9_\-]*$
-                              type: string
-                              required: true
-                              default: ""
-                          - variable: value
-                            label: Header Value
-                            description: The value of the header. If the value is empty, the header will be removed.
-                            schema:
-                              type: string
-                              required: true
-                              default: ""
+                              additional_attrs: true
+                              type: dict
+                              attrs:
+                                - variable: name
+                                  label: Header Name
+                                  description: Name of custom header to be added to requests, eg. X-Custom-Header
+                                  schema:
+                                    valid_chars: ^[a-zA-Z0-9_\-]*$
+                                    type: string
+                                    required: true
+                                    default: ""
+                                - variable: value
+                                  label: Header Value
+                                  description: The value of the header. If the value is empty, the header will be removed.
+                                  schema:
+                                    type: string
+                                    required: true
+                                    default: ""
diff --git a/templates/questions/traefik/customResponseHeadersMiddleware.yaml b/templates/questions/traefik/customResponseHeadersMiddleware.yaml
index c5c462865fb..459fcdf7179 100644
--- a/templates/questions/traefik/customResponseHeadersMiddleware.yaml
+++ b/templates/questions/traefik/customResponseHeadersMiddleware.yaml
@@ -21,18 +21,24 @@
                         type: list
                         default: []
                         items:
-                          - variable: name
-                            label: Header Name
-                            description: Name of custom header to be added to responses, eg. X-Custom-Header
+                          - variable: headersEntry
+                            label: ""
                             schema:
-                              valid_chars: ^[a-zA-Z0-9_\-]*$
-                              type: string
-                              required: true
-                              default: ""
-                          - variable: value
-                            label: Header Value
-                            description: The value of the header. If the value is empty, the header will be removed.
-                            schema:
-                              type: string
-                              required: true
-                              default: ""
+                              additional_attrs: true
+                              type: dict
+                              attrs:
+                                - variable: name
+                                  label: Header Name
+                                  description: Name of custom header to be added to responses, eg. X-Custom-Header
+                                  schema:
+                                    valid_chars: ^[a-zA-Z0-9_\-]*$
+                                    type: string
+                                    required: true
+                                    default: ""
+                                - variable: value
+                                  label: Header Value
+                                  description: The value of the header. If the value is empty, the header will be removed.
+                                  schema:
+                                    type: string
+                                    required: true
+                                    default: ""