diff --git a/templates/questions/ingress/ingressAdvanced.yaml b/templates/questions/ingress/ingressAdvanced.yaml
index 370ab92447a..848554bde23 100644
--- a/templates/questions/ingress/ingressAdvanced.yaml
+++ b/templates/questions/ingress/ingressAdvanced.yaml
@@ -56,12 +56,12 @@
                                   schema:
                                     type: string
                                     default: ""
-                                - variable: 'clusterCertificate (Advanced)'
-                                  label:  Cluster Certificate
+                                - variable: clusterCertificate
+                                  label:  'Cluster Certificate (Advanced)'
                                   description: 'Add the name of your cluster-wide certificate, that you set up in the ClusterIssuer chart.'
                                   schema:
                                     type: string
-                                    show_if: [["clusterIssuer", "=", ""]]
+                                    show_if: [["certificateIssuer", "=", ""]]
                                     default: ""
                                 - variable: secretName
                                   label: 'Use Custom Certificate Secret (Advanced)'
diff --git a/templates/questions/ingress/ingressList.yaml b/templates/questions/ingress/ingressList.yaml
index ebc1f295d44..1bdd738353f 100644
--- a/templates/questions/ingress/ingressList.yaml
+++ b/templates/questions/ingress/ingressList.yaml
@@ -90,8 +90,8 @@
                                               label: Service Port
                                               schema:
                                                 type: int
-              - variable: clusterIssuer
-                label: clusterIssuer
+              - variable: certificateIssuer
+                label: certificateIssuer
                 description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below'
                 schema:
                   type: string
@@ -121,7 +121,7 @@
                                     type: string
                                     default: ""
                                     required: true
-                          - variable: clusterIssuer
+                          - variable: certificateIssuer
                             label: Use Cert-Manager clusterIssuer
                             description: 'add the name of your Cert-Manager clusterIssuer here for automatic tls certificates.'
                             schema:
@@ -135,8 +135,8 @@
                               $ref:
                                 - "definitions/certificate"
                           - variable: clusterCertificate
-                            label:  Cluster Certificate (Experimental)
-                            description: 'Add the name of your cluster-wide certificate, that you set up in the ClusterIssuer chart. NOTE: This is an experimental feature'
+                            label:  'Cluster Certificate (Advanced)'
+                            description: 'Add the name of your cluster-wide certificate, that you set up in the ClusterIssuer chart.'
                             schema:
                               type: string
                               show_if: [["clusterIssuer", "=", ""]]