diff --git a/.github/scripts/build-catalog.sh b/.github/scripts/build-catalog.sh
index d63fc9e6534..ac938a12541 100755
--- a/.github/scripts/build-catalog.sh
+++ b/.github/scripts/build-catalog.sh
@@ -31,6 +31,11 @@ include_questions(){
     /# Include{controllerExpert}/ { for (i=0;i<n;++i) print a[i]; next }
     1' templates/questions/controllerExpert.yaml ${target}/questions.yaml > "tmp${chartname}" && mv "tmp${chartname}" ${target}/questions.yaml
 
+     # Replace # Include{controllerExpertCommand} with the standard controllerExpertCommand codesnippet
+    awk 'NR==FNR { a[n++]=$0; next }
+    /# Include{controllerExpertCommand}/ { for (i=0;i<n;++i) print a[i]; next }
+    1' templates/questions/controllerExpertCommand.yaml ${target}/questions.yaml > "tmp${chartname}" && mv "tmp${chartname}" ${target}/questions.yaml
+
     # Replace # Include{containerConfig} with the standard containerConfig codesnippet
     awk 'NR==FNR { a[n++]=$0; next }
     /# Include{containerConfig}/ { for (i=0;i<n;++i) print a[i]; next }
diff --git a/charts/stable/custom-app/Chart.yaml b/charts/stable/custom-app/Chart.yaml
index de58349caf3..c8ef190eca8 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/apps/tree/master/charts/stable/custom-app
 type: application
-version: 5.0.16
+version: 5.1.0
 annotations:
   truecharts.org/catagories: |
     - custom
diff --git a/charts/stable/custom-app/questions.yaml b/charts/stable/custom-app/questions.yaml
index f47bf25d26b..c0dd8ae0595 100644
--- a/charts/stable/custom-app/questions.yaml
+++ b/charts/stable/custom-app/questions.yaml
@@ -106,6 +106,7 @@ questions:
                       description: "RollingUpdate: Create new pods and then kill old ones"
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
+# Include{controllerExpertCommand}
 # Include{controllerExpert}
 
 # Include{containerConfig}
diff --git a/templates/questions/controllerExpertCommamd.yaml b/templates/questions/controllerExpertCommamd.yaml
new file mode 100644
index 00000000000..0d42d517c85
--- /dev/null
+++ b/templates/questions/controllerExpertCommamd.yaml
@@ -0,0 +1,17 @@
+        - variable: customcommand
+          label: "Show Custom Command Options"
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: command
+                label: "Command"
+                schema:
+                  type: list
+                  default: []
+                  items:
+                    - variable: param
+                      label: "param"
+                      schema:
+                        type: string
diff --git a/tools/build-release.sh b/tools/build-release.sh
index 2837896711a..82c8f51e4fd 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -130,6 +130,11 @@ include_questions(){
     /# Include{controllerExpert}/ { for (i=0;i<n;++i) print a[i]; next }
     1' templates/questions/controllerExpert.yaml ${target}/questions.yaml > "tmp${chartname}" && mv "tmp${chartname}" ${target}/questions.yaml
 
+     # Replace # Include{controllerExpertCommand} with the standard controllerExpertCommand codesnippet
+    awk 'NR==FNR { a[n++]=$0; next }
+    /# Include{controllerExpertCommand}/ { for (i=0;i<n;++i) print a[i]; next }
+    1' templates/questions/controllerExpertCommand.yaml ${target}/questions.yaml > "tmp${chartname}" && mv "tmp${chartname}" ${target}/questions.yaml
+
     # Replace # Include{containerConfig} with the standard containerConfig codesnippet
     awk 'NR==FNR { a[n++]=$0; next }
     /# Include{containerConfig}/ { for (i=0;i<n;++i) print a[i]; next }