diff --git a/charts/enterprise/clusterissuer/Chart.yaml b/charts/enterprise/clusterissuer/Chart.yaml
index c7bfb437293..4a71e88037c 100644
--- a/charts/enterprise/clusterissuer/Chart.yaml
+++ b/charts/enterprise/clusterissuer/Chart.yaml
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/enterprise/clusterissuer
   - https://cert-manager.io/
 type: application
-version: 4.2.1
+version: 4.2.2
 annotations:
   truecharts.org/category: core
   truecharts.org/SCALE-support: "true"
diff --git a/charts/enterprise/clusterissuer/questions.yaml b/charts/enterprise/clusterissuer/questions.yaml
index e0a2c8266ea..5bda9a8ee51 100644
--- a/charts/enterprise/clusterissuer/questions.yaml
+++ b/charts/enterprise/clusterissuer/questions.yaml
@@ -343,38 +343,44 @@ questions:
             type: list
             default: []
             items:
-              - variable: enabled
-                label: Enabled
+              - variable: CertEntry
+                label: 'Certificate Entry'
                 schema:
-                  type: boolean
-                  default: true
-              - variable: name
-                label: Certificate Name
-                schema:
-                  type: string
-                  required: true
-                  default: ""
-              - variable: certificateIssuer
-                label: Cert-Manager clusterIssuer
-                description: "One of the Cert-Manager clusterIssuers defined above"
-                schema:
-                  type: string
-                  required: true
-                  valid_chars: '^[a-z]+(-?[a-z]){0,63}-?[a-z]+$'
-                  default: "selfsigned"
-              - variable: hosts
-                label: Certificate Hosts
-                description: "NOTE: Creation of wildcard certificates with an ACME issuer requires a DNSO1 solver to be set up."
-                schema:
-                  type: list
-                  default: []
-                  items:
-                    - variable: host
-                      label: Host
+                  additional_attrs: true
+                  type: dict
+                  attrs:
+                    - variable: enabled
+                      label: Enabled
+                      schema:
+                        type: boolean
+                        default: true
+                    - variable: name
+                      label: Certificate Name
                       schema:
                         type: string
-                        default: ""
                         required: true
+                        default: ""
+                    - variable: certificateIssuer
+                      label: Cert-Manager clusterIssuer
+                      description: "One of the Cert-Manager clusterIssuers defined above"
+                      schema:
+                        type: string
+                        required: true
+                        valid_chars: '^[a-z]+(-?[a-z]){0,63}-?[a-z]+$'
+                        default: "selfsigned"
+                    - variable: hosts
+                      label: Certificate Hosts
+                      description: "NOTE: Creation of wildcard certificates with an ACME issuer requires a DNSO1 solver to be set up."
+                      schema:
+                        type: list
+                        default: []
+                        items:
+                          - variable: host
+                            label: Host
+                            schema:
+                              type: string
+                              default: ""
+                              required: true
 
   - variable: customMetrics
     group: Metrics