diff --git a/charts/stable/custom-app/Chart.yaml b/charts/stable/custom-app/Chart.yaml
index b70dacd5f66..c23b1f9ad1e 100644
--- a/charts/stable/custom-app/Chart.yaml
+++ b/charts/stable/custom-app/Chart.yaml
@@ -19,7 +19,7 @@ name: custom-app
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/custom-app
 type: application
-version: 5.1.31
+version: 5.1.32
 annotations:
   truecharts.org/catagories: |
     - custom
diff --git a/charts/stable/custom-app/questions.yaml b/charts/stable/custom-app/questions.yaml
index 974a18ef763..cfae79db1ce 100644
--- a/charts/stable/custom-app/questions.yaml
+++ b/charts/stable/custom-app/questions.yaml
@@ -41,8 +41,8 @@ questions:
 # Include{replica1}
 # Include{strategy}
 # Include{recreate}
-# Include{controllerExpertCommand}
 # Include{controllerExpert}
+# Include{controllerExpertCommand}
 # Include{containerConfig}
   - variable: probes
     group: "Container Configuration"
diff --git a/templates/questions/controller/controllerExpertCommand.yaml b/templates/questions/controller/controllerExpertCommand.yaml
index 29822a98989..21c32b55fcb 100644
--- a/templates/questions/controller/controllerExpertCommand.yaml
+++ b/templates/questions/controller/controllerExpertCommand.yaml
@@ -1,17 +1,19 @@
-        - variable: customcommand
-          label: Show Custom Command Options
+  - variable: customcommand
+    group: Controller
+    label: "Custom Command"
+    description: "Do not click this unless you know what you are doing"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: command
+          label: Command
           schema:
-            type: boolean
-            default: false
-            show_subquestions_if: true
-            subquestions:
-              - variable: command
-                label: Command
+            type: list
+            default: []
+            items:
+              - variable: param
+                label: Param
                 schema:
-                  type: list
-                  default: []
-                  items:
-                    - variable: param
-                      label: Param
-                      schema:
-                        type: string
+                  type: string