diff --git a/templates/questions/controllerExpert.yaml b/templates/questions/controllerExpert.yaml
index 63f1998e506..959c975eaec 100644
--- a/templates/questions/controllerExpert.yaml
+++ b/templates/questions/controllerExpert.yaml
@@ -1,64 +1,64 @@
-              - variable: expert
-                label: "Show Expert Configuration Options"
+        - variable: expert
+          label: "Show Expert Configuration Options"
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: extraArgs
+                label: "Extra Args"
                 schema:
-                  type: boolean
-                  default: false
-                  show_subquestions_if: true
-                  subquestions:
-                    - variable: extraArgs
-                      label: "Extra Args"
+                  type: list
+                  default: []
+                  items:
+                    - variable: argItem
+                      label: "Arg"
                       schema:
-                        type: list
-                        default: []
-                        items:
-                          - variable: argItem
-                            label: "Arg"
+                        type: dict
+                        attrs:
+                          - variable: name
+                            label: "Name"
                             schema:
-                              type: dict
-                              attrs:
-                                - variable: name
-                                  label: "Name"
-                                  schema:
-                                    type: string
-                                - variable: value
-                                  label: "Value"
-                                  schema:
-                                    type: string
-                    - variable: labelsList
-                      label: "Controller Labels"
+                              type: string
+                          - variable: value
+                            label: "Value"
+                            schema:
+                              type: string
+              - variable: labelsList
+                label: "Controller Labels"
+                schema:
+                  type: list
+                  default: []
+                  items:
+                    - variable: labelItem
+                      label: "Label"
                       schema:
-                        type: list
-                        default: []
-                        items:
-                          - variable: labelItem
-                            label: "Label"
+                        type: dict
+                        attrs:
+                          - variable: name
+                            label: "Name"
                             schema:
-                              type: dict
-                              attrs:
-                                - variable: name
-                                  label: "Name"
-                                  schema:
-                                    type: string
-                                - variable: value
-                                  label: "Value"
-                                  schema:
-                                    type: string
-                    - variable: annotationsList
-                      label: " Controller Annotations"
+                              type: string
+                          - variable: value
+                            label: "Value"
+                            schema:
+                              type: string
+              - variable: annotationsList
+                label: " Controller Annotations"
+                schema:
+                  type: list
+                  default: []
+                  items:
+                    - variable: annotationItem
+                      label: "Label"
                       schema:
-                        type: list
-                        default: []
-                        items:
-                          - variable: annotationItem
-                            label: "Label"
+                        type: dict
+                        attrs:
+                          - variable: name
+                            label: "Name"
                             schema:
-                              type: dict
-                              attrs:
-                                - variable: name
-                                  label: "Name"
-                                  schema:
-                                    type: string
-                                - variable: value
-                                  label: "Value"
-                                  schema:
-                                    type: string
+                              type: string
+                          - variable: value
+                            label: "Value"
+                            schema:
+                              type: string