diff --git a/.github/scripts/build-catalog.sh b/.github/scripts/build-catalog.sh
index a7a8325125a..56ecd789b71 100755
--- a/.github/scripts/build-catalog.sh
+++ b/.github/scripts/build-catalog.sh
@@ -75,7 +75,7 @@ include_questions(){
     awk 'NR==FNR { a[n++]=$0; next }
     /# Include{strategy}/ { for (i=0;i<n;++i) print a[i]; next }
     1' templates/questions/strategy/strategy.yaml ${target}/questions.yaml > "tmp${chartname}" && mv "tmp${chartname}" ${target}/questions.yaml
-	
+
      # Replace # Include{recreate} with the standard recreate codesnippet
     awk 'NR==FNR { a[n++]=$0; next }
     /# Include{recreate}/ { for (i=0;i<n;++i) print a[i]; next }
@@ -96,6 +96,11 @@ include_questions(){
     /# Include{controllerExpert}/ { for (i=0;i<n;++i) print a[i]; next }
     1' templates/questions/controller/controllerExpert.yaml ${target}/questions.yaml > "tmp${chartname}" && mv "tmp${chartname}" ${target}/questions.yaml
 
+     # Replace # Include{controllerExpertExtraArgs} with the standard controllerExpertExtraArgs codesnippet
+    awk 'NR==FNR { a[n++]=$0; next }
+    /# Include{controllerExpertExtraArgs}/ { for (i=0;i<n;++i) print a[i]; next }
+    1' templates/questions/controller/controllerExpertExtraArgs.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 }
diff --git a/charts/dependency/clickhouse/questions.yaml b/charts/dependency/clickhouse/questions.yaml
index 30793fdaa3d..c6f164c35f4 100644
--- a/charts/dependency/clickhouse/questions.yaml
+++ b/charts/dependency/clickhouse/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: clickhouseDatabase
     group: "App Configuration"
diff --git a/charts/dependency/collabora-online/questions.yaml b/charts/dependency/collabora-online/questions.yaml
index 992c1741c60..370a92c0c09 100644
--- a/charts/dependency/collabora-online/questions.yaml
+++ b/charts/dependency/collabora-online/questions.yaml
@@ -15,6 +15,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/dependency/mariadb/questions.yaml b/charts/dependency/mariadb/questions.yaml
index ee7305bfe73..f93854fbc73 100644
--- a/charts/dependency/mariadb/questions.yaml
+++ b/charts/dependency/mariadb/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: mariadbDatabase
     group: "App Configuration"
diff --git a/charts/dependency/memcached/questions.yaml b/charts/dependency/memcached/questions.yaml
index 08c58a36f16..497fafdeda2 100644
--- a/charts/dependency/memcached/questions.yaml
+++ b/charts/dependency/memcached/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: postgresqlDatabase
     group: "App Configuration"
diff --git a/charts/dependency/mongodb/questions.yaml b/charts/dependency/mongodb/questions.yaml
index 6be42788ad0..ec8f8f016c0 100644
--- a/charts/dependency/mongodb/questions.yaml
+++ b/charts/dependency/mongodb/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: mongodbDatabase
     group: "App Configuration"
diff --git a/charts/dependency/postgresql/questions.yaml b/charts/dependency/postgresql/questions.yaml
index f86d9087b0b..fdf64b68833 100644
--- a/charts/dependency/postgresql/questions.yaml
+++ b/charts/dependency/postgresql/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: postgresqlDatabase
     group: "App Configuration"
diff --git a/charts/dependency/redis/questions.yaml b/charts/dependency/redis/questions.yaml
index cec0b5701d5..78f82da2988 100644
--- a/charts/dependency/redis/questions.yaml
+++ b/charts/dependency/redis/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: redisPassword
     group: "App Configuration"
diff --git a/charts/dependency/solr/questions.yaml b/charts/dependency/solr/questions.yaml
index 59a864c6498..0a7e910d08e 100644
--- a/charts/dependency/solr/questions.yaml
+++ b/charts/dependency/solr/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: solrCores
     group: "App Configuration"
diff --git a/charts/incubator/acestream/questions.yaml b/charts/incubator/acestream/questions.yaml
index cbf55758556..07b8e800703 100644
--- a/charts/incubator/acestream/questions.yaml
+++ b/charts/incubator/acestream/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/actualserver/questions.yaml b/charts/incubator/actualserver/questions.yaml
index 6e5222a7c61..3802946cb56 100644
--- a/charts/incubator/actualserver/questions.yaml
+++ b/charts/incubator/actualserver/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/adguard-home/questions.yaml b/charts/incubator/adguard-home/questions.yaml
index deea544d360..2288dd9f0d9 100644
--- a/charts/incubator/adguard-home/questions.yaml
+++ b/charts/incubator/adguard-home/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/adguardhome-sync/questions.yaml b/charts/incubator/adguardhome-sync/questions.yaml
index 2c76863e78c..aa7c7bf26ce 100644
--- a/charts/incubator/adguardhome-sync/questions.yaml
+++ b/charts/incubator/adguardhome-sync/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/adminer/questions.yaml b/charts/incubator/adminer/questions.yaml
index 7913de468ad..c328797b24c 100644
--- a/charts/incubator/adminer/questions.yaml
+++ b/charts/incubator/adminer/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/alienswarm-reactivedrop/questions.yaml b/charts/incubator/alienswarm-reactivedrop/questions.yaml
index aef3996aec7..49dac6369c4 100644
--- a/charts/incubator/alienswarm-reactivedrop/questions.yaml
+++ b/charts/incubator/alienswarm-reactivedrop/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/alienswarm/questions.yaml b/charts/incubator/alienswarm/questions.yaml
index 4defe5b33ce..ab0ed89a068 100644
--- a/charts/incubator/alienswarm/questions.yaml
+++ b/charts/incubator/alienswarm/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/altitude/questions.yaml b/charts/incubator/altitude/questions.yaml
index 1eed03175ef..7cd0880d2ff 100644
--- a/charts/incubator/altitude/questions.yaml
+++ b/charts/incubator/altitude/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/americasarmy-pg/questions.yaml b/charts/incubator/americasarmy-pg/questions.yaml
index d5628ea0a0e..cc6bda7ea51 100644
--- a/charts/incubator/americasarmy-pg/questions.yaml
+++ b/charts/incubator/americasarmy-pg/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/amtd/questions.yaml b/charts/incubator/amtd/questions.yaml
index 66f8a8e91c0..408a5eb168f 100644
--- a/charts/incubator/amtd/questions.yaml
+++ b/charts/incubator/amtd/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/amule/questions.yaml b/charts/incubator/amule/questions.yaml
index 33c2bb717ff..bdebcc50244 100644
--- a/charts/incubator/amule/questions.yaml
+++ b/charts/incubator/amule/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/amvd/questions.yaml b/charts/incubator/amvd/questions.yaml
index 353ad63e57d..d9c8d042892 100644
--- a/charts/incubator/amvd/questions.yaml
+++ b/charts/incubator/amvd/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/android-8-0/questions.yaml b/charts/incubator/android-8-0/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/android-8-0/questions.yaml
+++ b/charts/incubator/android-8-0/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/androiddebugbridge/questions.yaml b/charts/incubator/androiddebugbridge/questions.yaml
index 75e031de328..c8a09c87d88 100644
--- a/charts/incubator/androiddebugbridge/questions.yaml
+++ b/charts/incubator/androiddebugbridge/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/anki-sync-server/questions.yaml b/charts/incubator/anki-sync-server/questions.yaml
index 3f3c0102d0b..0127548d627 100644
--- a/charts/incubator/anki-sync-server/questions.yaml
+++ b/charts/incubator/anki-sync-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/anope/questions.yaml b/charts/incubator/anope/questions.yaml
index 5299acdf989..d0a29796576 100644
--- a/charts/incubator/anope/questions.yaml
+++ b/charts/incubator/anope/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/apache-webdav/questions.yaml b/charts/incubator/apache-webdav/questions.yaml
index 434059cd1e7..b85bce1e403 100644
--- a/charts/incubator/apache-webdav/questions.yaml
+++ b/charts/incubator/apache-webdav/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/apprise-api/questions.yaml b/charts/incubator/apprise-api/questions.yaml
index 5e5f45fae08..aabc719e8ac 100644
--- a/charts/incubator/apprise-api/questions.yaml
+++ b/charts/incubator/apprise-api/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/appsmith/questions.yaml b/charts/incubator/appsmith/questions.yaml
index acafa118dbb..6019c6b2190 100644
--- a/charts/incubator/appsmith/questions.yaml
+++ b/charts/incubator/appsmith/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/apt-cacher-ng/questions.yaml b/charts/incubator/apt-cacher-ng/questions.yaml
index 4c5ad7ef50a..09f73536c95 100644
--- a/charts/incubator/apt-cacher-ng/questions.yaml
+++ b/charts/incubator/apt-cacher-ng/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/archiveteam-warrior/questions.yaml b/charts/incubator/archiveteam-warrior/questions.yaml
index d6caebf1ad6..964c4325884 100644
--- a/charts/incubator/archiveteam-warrior/questions.yaml
+++ b/charts/incubator/archiveteam-warrior/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/ariang/questions.yaml b/charts/incubator/ariang/questions.yaml
index 8108b43dc53..fa505b953ac 100644
--- a/charts/incubator/ariang/questions.yaml
+++ b/charts/incubator/ariang/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/arksurvivalevolved/questions.yaml b/charts/incubator/arksurvivalevolved/questions.yaml
index 0aeaf85cd13..ec34434b30b 100644
--- a/charts/incubator/arksurvivalevolved/questions.yaml
+++ b/charts/incubator/arksurvivalevolved/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/arma3/questions.yaml b/charts/incubator/arma3/questions.yaml
index c0d202109d1..03d7f393348 100644
--- a/charts/incubator/arma3/questions.yaml
+++ b/charts/incubator/arma3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/arma3exilemod/questions.yaml b/charts/incubator/arma3exilemod/questions.yaml
index 48b897063f4..95d149899f1 100644
--- a/charts/incubator/arma3exilemod/questions.yaml
+++ b/charts/incubator/arma3exilemod/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/artifactory-oss/questions.yaml b/charts/incubator/artifactory-oss/questions.yaml
index 6d3cf15df9b..8c78c593a20 100644
--- a/charts/incubator/artifactory-oss/questions.yaml
+++ b/charts/incubator/artifactory-oss/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/assettocorsa/questions.yaml b/charts/incubator/assettocorsa/questions.yaml
index f9fe0adffef..bfd8349d4c2 100644
--- a/charts/incubator/assettocorsa/questions.yaml
+++ b/charts/incubator/assettocorsa/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/aurora-files/questions.yaml b/charts/incubator/aurora-files/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/aurora-files/questions.yaml
+++ b/charts/incubator/aurora-files/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/authentik/questions.yaml b/charts/incubator/authentik/questions.yaml
index 2a0bd16927c..d90140af98b 100644
--- a/charts/incubator/authentik/questions.yaml
+++ b/charts/incubator/authentik/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: authentik
     group: "Container Configuration"
     label: "Authentik Configuration"
diff --git a/charts/incubator/auto-yt-dl/questions.yaml b/charts/incubator/auto-yt-dl/questions.yaml
index 826a388be1b..d4be7d83847 100644
--- a/charts/incubator/auto-yt-dl/questions.yaml
+++ b/charts/incubator/auto-yt-dl/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/autobrr/questions.yaml b/charts/incubator/autobrr/questions.yaml
index 135af1537fb..2c264858768 100644
--- a/charts/incubator/autobrr/questions.yaml
+++ b/charts/incubator/autobrr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/autoscan/questions.yaml b/charts/incubator/autoscan/questions.yaml
index a93445c4c5f..14d25b7ac96 100644
--- a/charts/incubator/autoscan/questions.yaml
+++ b/charts/incubator/autoscan/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/avorion/questions.yaml b/charts/incubator/avorion/questions.yaml
index 24ce70ccead..5a66a7bcda7 100644
--- a/charts/incubator/avorion/questions.yaml
+++ b/charts/incubator/avorion/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/awesome-ttrss/questions.yaml b/charts/incubator/awesome-ttrss/questions.yaml
index 2a31a10beee..c9fc433e962 100644
--- a/charts/incubator/awesome-ttrss/questions.yaml
+++ b/charts/incubator/awesome-ttrss/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/backuppc/questions.yaml b/charts/incubator/backuppc/questions.yaml
index 505b6d0abaf..74a54b39342 100644
--- a/charts/incubator/backuppc/questions.yaml
+++ b/charts/incubator/backuppc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/baikal/questions.yaml b/charts/incubator/baikal/questions.yaml
index 97afaa93776..a3d5e96cebb 100644
--- a/charts/incubator/baikal/questions.yaml
+++ b/charts/incubator/baikal/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/barcodebuddy/questions.yaml b/charts/incubator/barcodebuddy/questions.yaml
index 40f64600aa8..e996f2372b0 100644
--- a/charts/incubator/barcodebuddy/questions.yaml
+++ b/charts/incubator/barcodebuddy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/barotrauma/questions.yaml b/charts/incubator/barotrauma/questions.yaml
index 033ff64fb92..ab3779c80ab 100644
--- a/charts/incubator/barotrauma/questions.yaml
+++ b/charts/incubator/barotrauma/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/bitcoin-node/questions.yaml b/charts/incubator/bitcoin-node/questions.yaml
index bbdb6a9b85a..bf24c055cae 100644
--- a/charts/incubator/bitcoin-node/questions.yaml
+++ b/charts/incubator/bitcoin-node/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/bitcoind/questions.yaml b/charts/incubator/bitcoind/questions.yaml
index 5eb99e9f2e3..1359b4e732d 100644
--- a/charts/incubator/bitcoind/questions.yaml
+++ b/charts/incubator/bitcoind/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/bitcoinunlimited/questions.yaml b/charts/incubator/bitcoinunlimited/questions.yaml
index 7db5c2caf21..e6862b10cc4 100644
--- a/charts/incubator/bitcoinunlimited/questions.yaml
+++ b/charts/incubator/bitcoinunlimited/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/bitcoinwalletgui/questions.yaml b/charts/incubator/bitcoinwalletgui/questions.yaml
index 60da8ebd4ab..84dea629d99 100644
--- a/charts/incubator/bitcoinwalletgui/questions.yaml
+++ b/charts/incubator/bitcoinwalletgui/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/blender-desktop-g3/questions.yaml b/charts/incubator/blender-desktop-g3/questions.yaml
index 126035d8de4..dbb7215a919 100644
--- a/charts/incubator/blender-desktop-g3/questions.yaml
+++ b/charts/incubator/blender-desktop-g3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/blender/questions.yaml b/charts/incubator/blender/questions.yaml
index 2f0e23b80fc..8c29656b0a0 100644
--- a/charts/incubator/blender/questions.yaml
+++ b/charts/incubator/blender/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/breitbandmessung-de/questions.yaml b/charts/incubator/breitbandmessung-de/questions.yaml
index cff1a963895..d679ff9ef64 100644
--- a/charts/incubator/breitbandmessung-de/questions.yaml
+++ b/charts/incubator/breitbandmessung-de/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/btdex/questions.yaml b/charts/incubator/btdex/questions.yaml
index deb44cb9cab..e9e043ca804 100644
--- a/charts/incubator/btdex/questions.yaml
+++ b/charts/incubator/btdex/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/bwapp/questions.yaml b/charts/incubator/bwapp/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/bwapp/questions.yaml
+++ b/charts/incubator/bwapp/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/cadquery-jupyter/questions.yaml b/charts/incubator/cadquery-jupyter/questions.yaml
index 523a4a71efa..808d787387f 100644
--- a/charts/incubator/cadquery-jupyter/questions.yaml
+++ b/charts/incubator/cadquery-jupyter/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/cadquery-server/questions.yaml b/charts/incubator/cadquery-server/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/cadquery-server/questions.yaml
+++ b/charts/incubator/cadquery-server/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/chivalry-medievalwarfare/questions.yaml b/charts/incubator/chivalry-medievalwarfare/questions.yaml
index cafd33ec48f..eea616a039c 100644
--- a/charts/incubator/chivalry-medievalwarfare/questions.yaml
+++ b/charts/incubator/chivalry-medievalwarfare/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/chowdown/questions.yaml b/charts/incubator/chowdown/questions.yaml
index 6cdbb3de8b0..b90973ce0d7 100644
--- a/charts/incubator/chowdown/questions.yaml
+++ b/charts/incubator/chowdown/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/chromium-desktop-g3/questions.yaml b/charts/incubator/chromium-desktop-g3/questions.yaml
index 23057ddee42..9452549a145 100644
--- a/charts/incubator/chromium-desktop-g3/questions.yaml
+++ b/charts/incubator/chromium-desktop-g3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/chromium/questions.yaml b/charts/incubator/chromium/questions.yaml
index 4bfe57c17f1..f9e9d1c01ec 100644
--- a/charts/incubator/chromium/questions.yaml
+++ b/charts/incubator/chromium/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/chronograf/questions.yaml b/charts/incubator/chronograf/questions.yaml
index f46bef1d693..bd46aa79323 100644
--- a/charts/incubator/chronograf/questions.yaml
+++ b/charts/incubator/chronograf/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/chronos/questions.yaml b/charts/incubator/chronos/questions.yaml
index 3587f29aa3d..44f9fc2d18d 100644
--- a/charts/incubator/chronos/questions.yaml
+++ b/charts/incubator/chronos/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/ciao/questions.yaml b/charts/incubator/ciao/questions.yaml
index 2c8459d1322..78527c87f59 100644
--- a/charts/incubator/ciao/questions.yaml
+++ b/charts/incubator/ciao/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/citadel-forgedwithfire/questions.yaml b/charts/incubator/citadel-forgedwithfire/questions.yaml
index a51f698b8c6..84036c780d3 100644
--- a/charts/incubator/citadel-forgedwithfire/questions.yaml
+++ b/charts/incubator/citadel-forgedwithfire/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/cleanarr/questions.yaml b/charts/incubator/cleanarr/questions.yaml
index 6cb4326bb33..daad8805589 100644
--- a/charts/incubator/cleanarr/questions.yaml
+++ b/charts/incubator/cleanarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/cloudbeaver/questions.yaml b/charts/incubator/cloudbeaver/questions.yaml
index 19aab9cf4bc..52d8b318ab1 100644
--- a/charts/incubator/cloudbeaver/questions.yaml
+++ b/charts/incubator/cloudbeaver/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/cloudcommander/questions.yaml b/charts/incubator/cloudcommander/questions.yaml
index ec669bb101a..d51c883f3ad 100644
--- a/charts/incubator/cloudcommander/questions.yaml
+++ b/charts/incubator/cloudcommander/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/cloudreve/questions.yaml b/charts/incubator/cloudreve/questions.yaml
index ad16ad420a5..3ade20b38a4 100644
--- a/charts/incubator/cloudreve/questions.yaml
+++ b/charts/incubator/cloudreve/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/colonysurvival/questions.yaml b/charts/incubator/colonysurvival/questions.yaml
index 468035aa156..47a38db52c8 100644
--- a/charts/incubator/colonysurvival/questions.yaml
+++ b/charts/incubator/colonysurvival/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/conanexiles/questions.yaml b/charts/incubator/conanexiles/questions.yaml
index 5cee61c1691..760f8b73d13 100644
--- a/charts/incubator/conanexiles/questions.yaml
+++ b/charts/incubator/conanexiles/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/conreq/questions.yaml b/charts/incubator/conreq/questions.yaml
index 10adc35b849..a0ce656cae1 100644
--- a/charts/incubator/conreq/questions.yaml
+++ b/charts/incubator/conreq/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/convos/questions.yaml b/charts/incubator/convos/questions.yaml
index 1ac7e5c44b9..fc2e0c0c9b3 100644
--- a/charts/incubator/convos/questions.yaml
+++ b/charts/incubator/convos/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/cops/questions.yaml b/charts/incubator/cops/questions.yaml
index 37f47516c5f..41d80e4b841 100644
--- a/charts/incubator/cops/questions.yaml
+++ b/charts/incubator/cops/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/core-keeper-dedicated-server/questions.yaml b/charts/incubator/core-keeper-dedicated-server/questions.yaml
index d51d665eec1..84cb00fc85b 100644
--- a/charts/incubator/core-keeper-dedicated-server/questions.yaml
+++ b/charts/incubator/core-keeper-dedicated-server/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/corekeeper/questions.yaml b/charts/incubator/corekeeper/questions.yaml
index c8b993bb32e..e4e0defd53c 100644
--- a/charts/incubator/corekeeper/questions.yaml
+++ b/charts/incubator/corekeeper/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/counterstrike2d/questions.yaml b/charts/incubator/counterstrike2d/questions.yaml
index 44d20f62560..d01b659a253 100644
--- a/charts/incubator/counterstrike2d/questions.yaml
+++ b/charts/incubator/counterstrike2d/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/cowyo/questions.yaml b/charts/incubator/cowyo/questions.yaml
index cf6a04d84f4..cbfbbffa143 100644
--- a/charts/incubator/cowyo/questions.yaml
+++ b/charts/incubator/cowyo/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/craftopia/questions.yaml b/charts/incubator/craftopia/questions.yaml
index 92c27d62ea1..0e74451f56c 100644
--- a/charts/incubator/craftopia/questions.yaml
+++ b/charts/incubator/craftopia/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/crafty-3/questions.yaml b/charts/incubator/crafty-3/questions.yaml
index dc4c8cc95d7..7e7675b2ec2 100644
--- a/charts/incubator/crafty-3/questions.yaml
+++ b/charts/incubator/crafty-3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/crafty-4/questions.yaml b/charts/incubator/crafty-4/questions.yaml
index e8f6f44cfde..f5ec1ae846d 100644
--- a/charts/incubator/crafty-4/questions.yaml
+++ b/charts/incubator/crafty-4/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/crypto-exchanges-gateway/questions.yaml b/charts/incubator/crypto-exchanges-gateway/questions.yaml
index 2dd8f37f6a3..7bb65d1e4f2 100644
--- a/charts/incubator/crypto-exchanges-gateway/questions.yaml
+++ b/charts/incubator/crypto-exchanges-gateway/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/cryptpad/questions.yaml b/charts/incubator/cryptpad/questions.yaml
index 4e6fa4c886d..4d4846dea2e 100644
--- a/charts/incubator/cryptpad/questions.yaml
+++ b/charts/incubator/cryptpad/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/csgo/questions.yaml b/charts/incubator/csgo/questions.yaml
index ad62169b216..02e64d1d51f 100644
--- a/charts/incubator/csgo/questions.yaml
+++ b/charts/incubator/csgo/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/cssource/questions.yaml b/charts/incubator/cssource/questions.yaml
index 4ad2c4869d9..f00720ea0e2 100644
--- a/charts/incubator/cssource/questions.yaml
+++ b/charts/incubator/cssource/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/cstrike1-6/questions.yaml b/charts/incubator/cstrike1-6/questions.yaml
index c931f761a0a..8f582d02e02 100644
--- a/charts/incubator/cstrike1-6/questions.yaml
+++ b/charts/incubator/cstrike1-6/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/cstrikeconditionzero/questions.yaml b/charts/incubator/cstrikeconditionzero/questions.yaml
index 1d0c9d089cb..77500345081 100644
--- a/charts/incubator/cstrikeconditionzero/questions.yaml
+++ b/charts/incubator/cstrikeconditionzero/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/cups-server/questions.yaml b/charts/incubator/cups-server/questions.yaml
index b83cf319cc2..2cf11240f9c 100644
--- a/charts/incubator/cups-server/questions.yaml
+++ b/charts/incubator/cups-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/cura-novnc/questions.yaml b/charts/incubator/cura-novnc/questions.yaml
index 8f3ad554078..0218e4d1f15 100644
--- a/charts/incubator/cura-novnc/questions.yaml
+++ b/charts/incubator/cura-novnc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/dailynotes/questions.yaml b/charts/incubator/dailynotes/questions.yaml
index 2ded0903a95..5e0d7bb0578 100644
--- a/charts/incubator/dailynotes/questions.yaml
+++ b/charts/incubator/dailynotes/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/damselfly/questions.yaml b/charts/incubator/damselfly/questions.yaml
index 1f81a79f8f4..5f266660f2a 100644
--- a/charts/incubator/damselfly/questions.yaml
+++ b/charts/incubator/damselfly/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/dashmachine/questions.yaml b/charts/incubator/dashmachine/questions.yaml
index a7f6885776a..a5e2b6d1bcd 100644
--- a/charts/incubator/dashmachine/questions.yaml
+++ b/charts/incubator/dashmachine/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/dayofdefeatsource/questions.yaml b/charts/incubator/dayofdefeatsource/questions.yaml
index f9b4b210c72..3bcc2747d86 100644
--- a/charts/incubator/dayofdefeatsource/questions.yaml
+++ b/charts/incubator/dayofdefeatsource/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/daysofwar/questions.yaml b/charts/incubator/daysofwar/questions.yaml
index f7bae3a05e0..57d63bc19fc 100644
--- a/charts/incubator/daysofwar/questions.yaml
+++ b/charts/incubator/daysofwar/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/dayz/questions.yaml b/charts/incubator/dayz/questions.yaml
index 969d20fa260..202f0f81d8f 100644
--- a/charts/incubator/dayz/questions.yaml
+++ b/charts/incubator/dayz/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/ddns-route53/questions.yaml b/charts/incubator/ddns-route53/questions.yaml
index 4a781523d45..635bffd3f61 100644
--- a/charts/incubator/ddns-route53/questions.yaml
+++ b/charts/incubator/ddns-route53/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/debian-apt-mirror/questions.yaml b/charts/incubator/debian-apt-mirror/questions.yaml
index c1a29d1f91c..48ec9b8efe5 100644
--- a/charts/incubator/debian-apt-mirror/questions.yaml
+++ b/charts/incubator/debian-apt-mirror/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/debian-bullseye/questions.yaml b/charts/incubator/debian-bullseye/questions.yaml
index 6a9a767cbe1..de52fd1ed84 100644
--- a/charts/incubator/debian-bullseye/questions.yaml
+++ b/charts/incubator/debian-bullseye/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/dispatch/questions.yaml b/charts/incubator/dispatch/questions.yaml
index 6de98a9f0dd..6ad6b80c50b 100644
--- a/charts/incubator/dispatch/questions.yaml
+++ b/charts/incubator/dispatch/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/dns-doh-companion/questions.yaml b/charts/incubator/dns-doh-companion/questions.yaml
index ed4d9f07786..524ff0e0be4 100644
--- a/charts/incubator/dns-doh-companion/questions.yaml
+++ b/charts/incubator/dns-doh-companion/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/docker-hub-rss/questions.yaml b/charts/incubator/docker-hub-rss/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/docker-hub-rss/questions.yaml
+++ b/charts/incubator/docker-hub-rss/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/dockerregistry/questions.yaml b/charts/incubator/dockerregistry/questions.yaml
index 99382a27090..c5b12c6818d 100644
--- a/charts/incubator/dockerregistry/questions.yaml
+++ b/charts/incubator/dockerregistry/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/dontstarvetogether/questions.yaml b/charts/incubator/dontstarvetogether/questions.yaml
index a094b9b76eb..505eecbbd11 100644
--- a/charts/incubator/dontstarvetogether/questions.yaml
+++ b/charts/incubator/dontstarvetogether/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/dropbox-by-otherguy/questions.yaml b/charts/incubator/dropbox-by-otherguy/questions.yaml
index ca1da7554ca..bd614d5aa39 100644
--- a/charts/incubator/dropbox-by-otherguy/questions.yaml
+++ b/charts/incubator/dropbox-by-otherguy/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/duplicacy/questions.yaml b/charts/incubator/duplicacy/questions.yaml
index f0c639062fd..cd9c15cb67a 100644
--- a/charts/incubator/duplicacy/questions.yaml
+++ b/charts/incubator/duplicacy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/dvblink/questions.yaml b/charts/incubator/dvblink/questions.yaml
index 55c89eb5349..6d6f924907c 100644
--- a/charts/incubator/dvblink/questions.yaml
+++ b/charts/incubator/dvblink/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/eco/questions.yaml b/charts/incubator/eco/questions.yaml
index 4fecc45e767..a3c6c5a3d63 100644
--- a/charts/incubator/eco/questions.yaml
+++ b/charts/incubator/eco/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/ecodms/questions.yaml b/charts/incubator/ecodms/questions.yaml
index 3a27026384b..97c628c5bd8 100644
--- a/charts/incubator/ecodms/questions.yaml
+++ b/charts/incubator/ecodms/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/electrum/questions.yaml b/charts/incubator/electrum/questions.yaml
index fee10a21f9e..482a8e87ee6 100644
--- a/charts/incubator/electrum/questions.yaml
+++ b/charts/incubator/electrum/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/emby-sync/questions.yaml b/charts/incubator/emby-sync/questions.yaml
index 4fde915d873..169dd04fc65 100644
--- a/charts/incubator/emby-sync/questions.yaml
+++ b/charts/incubator/emby-sync/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/etesync/questions.yaml b/charts/incubator/etesync/questions.yaml
index fcde5a0aebc..dadb98d3580 100644
--- a/charts/incubator/etesync/questions.yaml
+++ b/charts/incubator/etesync/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/ethercalc/questions.yaml b/charts/incubator/ethercalc/questions.yaml
index fbb13bfdffd..7956c6ba9b0 100644
--- a/charts/incubator/ethercalc/questions.yaml
+++ b/charts/incubator/ethercalc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/euterpe/questions.yaml b/charts/incubator/euterpe/questions.yaml
index e3bd932a603..b252c768e0e 100644
--- a/charts/incubator/euterpe/questions.yaml
+++ b/charts/incubator/euterpe/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/explainshell/questions.yaml b/charts/incubator/explainshell/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/explainshell/questions.yaml
+++ b/charts/incubator/explainshell/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/external-ip/questions.yaml b/charts/incubator/external-ip/questions.yaml
index 738c478e295..b320ee28273 100644
--- a/charts/incubator/external-ip/questions.yaml
+++ b/charts/incubator/external-ip/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/factorio/questions.yaml b/charts/incubator/factorio/questions.yaml
index c03199195da..fbddd5a19cf 100644
--- a/charts/incubator/factorio/questions.yaml
+++ b/charts/incubator/factorio/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/factorioservermanager/questions.yaml b/charts/incubator/factorioservermanager/questions.yaml
index b185e983753..fff3168b423 100644
--- a/charts/incubator/factorioservermanager/questions.yaml
+++ b/charts/incubator/factorioservermanager/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/facturascripts/questions.yaml b/charts/incubator/facturascripts/questions.yaml
index a913882ce5e..e8c7feeb9ba 100644
--- a/charts/incubator/facturascripts/questions.yaml
+++ b/charts/incubator/facturascripts/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/fancyindex/questions.yaml b/charts/incubator/fancyindex/questions.yaml
index 64b2c056cbc..8d5157a789f 100644
--- a/charts/incubator/fancyindex/questions.yaml
+++ b/charts/incubator/fancyindex/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/farmos/questions.yaml b/charts/incubator/farmos/questions.yaml
index e363653cbaa..88022a70e60 100644
--- a/charts/incubator/farmos/questions.yaml
+++ b/charts/incubator/farmos/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/fastcom-mqtt/questions.yaml b/charts/incubator/fastcom-mqtt/questions.yaml
index 8cdbc1bd4c7..b2d91361f17 100644
--- a/charts/incubator/fastcom-mqtt/questions.yaml
+++ b/charts/incubator/fastcom-mqtt/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/fenrus/questions.yaml b/charts/incubator/fenrus/questions.yaml
index 8053cab1ffb..7053997c9d0 100644
--- a/charts/incubator/fenrus/questions.yaml
+++ b/charts/incubator/fenrus/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/ferdi-client/questions.yaml b/charts/incubator/ferdi-client/questions.yaml
index ceac6e4cf04..260b2c692e7 100644
--- a/charts/incubator/ferdi-client/questions.yaml
+++ b/charts/incubator/ferdi-client/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/ffmpeg-mkvdts2ac3/questions.yaml b/charts/incubator/ffmpeg-mkvdts2ac3/questions.yaml
index a4623ada2db..a8f59e9f7f8 100644
--- a/charts/incubator/ffmpeg-mkvdts2ac3/questions.yaml
+++ b/charts/incubator/ffmpeg-mkvdts2ac3/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/fileflows-node/questions.yaml b/charts/incubator/fileflows-node/questions.yaml
index c84172469c3..1142ca71311 100644
--- a/charts/incubator/fileflows-node/questions.yaml
+++ b/charts/incubator/fileflows-node/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/filegator/questions.yaml b/charts/incubator/filegator/questions.yaml
index 2731042ff21..3894d646b83 100644
--- a/charts/incubator/filegator/questions.yaml
+++ b/charts/incubator/filegator/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/filerun/questions.yaml b/charts/incubator/filerun/questions.yaml
index a88bd952828..8d4786edaf6 100644
--- a/charts/incubator/filerun/questions.yaml
+++ b/charts/incubator/filerun/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/fileshelter/questions.yaml b/charts/incubator/fileshelter/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/fileshelter/questions.yaml
+++ b/charts/incubator/fileshelter/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/filestash/questions.yaml b/charts/incubator/filestash/questions.yaml
index 8a9cd08264d..e54ad7db16b 100644
--- a/charts/incubator/filestash/questions.yaml
+++ b/charts/incubator/filestash/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/firefox-desktop-g3/questions.yaml b/charts/incubator/firefox-desktop-g3/questions.yaml
index 23057ddee42..9452549a145 100644
--- a/charts/incubator/firefox-desktop-g3/questions.yaml
+++ b/charts/incubator/firefox-desktop-g3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/fireshare/questions.yaml b/charts/incubator/fireshare/questions.yaml
index ffa31cac9f5..5512b95bd61 100644
--- a/charts/incubator/fireshare/questions.yaml
+++ b/charts/incubator/fireshare/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/fistfuloffrags/questions.yaml b/charts/incubator/fistfuloffrags/questions.yaml
index a5267209b1e..c1a3d3feddd 100644
--- a/charts/incubator/fistfuloffrags/questions.yaml
+++ b/charts/incubator/fistfuloffrags/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/fivem/questions.yaml b/charts/incubator/fivem/questions.yaml
index 3a9cf3867df..9284ac151d4 100644
--- a/charts/incubator/fivem/questions.yaml
+++ b/charts/incubator/fivem/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/flame/questions.yaml b/charts/incubator/flame/questions.yaml
index ace9a9c396b..20870744305 100644
--- a/charts/incubator/flame/questions.yaml
+++ b/charts/incubator/flame/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/flashpaper/questions.yaml b/charts/incubator/flashpaper/questions.yaml
index e4ccc0eaef8..44fc766abc4 100644
--- a/charts/incubator/flashpaper/questions.yaml
+++ b/charts/incubator/flashpaper/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/flextv/questions.yaml b/charts/incubator/flextv/questions.yaml
index b1fe3a13ced..b8cd7d80d1a 100644
--- a/charts/incubator/flextv/questions.yaml
+++ b/charts/incubator/flextv/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/fluttercoin-wallet/questions.yaml b/charts/incubator/fluttercoin-wallet/questions.yaml
index 8d6e890a235..b9a226193a9 100644
--- a/charts/incubator/fluttercoin-wallet/questions.yaml
+++ b/charts/incubator/fluttercoin-wallet/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/fmd2-wine/questions.yaml b/charts/incubator/fmd2-wine/questions.yaml
index 69a336f9af6..6a399857e70 100644
--- a/charts/incubator/fmd2-wine/questions.yaml
+++ b/charts/incubator/fmd2-wine/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/fogproject/questions.yaml b/charts/incubator/fogproject/questions.yaml
index e49d37deb04..f46c7f67e5d 100644
--- a/charts/incubator/fogproject/questions.yaml
+++ b/charts/incubator/fogproject/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/fotosho/questions.yaml b/charts/incubator/fotosho/questions.yaml
index ad821a396fc..e0eebdd8185 100644
--- a/charts/incubator/fotosho/questions.yaml
+++ b/charts/incubator/fotosho/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/freecad-desktop-g3/questions.yaml b/charts/incubator/freecad-desktop-g3/questions.yaml
index 23057ddee42..9452549a145 100644
--- a/charts/incubator/freecad-desktop-g3/questions.yaml
+++ b/charts/incubator/freecad-desktop-g3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/frigate/questions.yaml b/charts/incubator/frigate/questions.yaml
index 85892605e03..20298577b28 100644
--- a/charts/incubator/frigate/questions.yaml
+++ b/charts/incubator/frigate/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/fsm/questions.yaml b/charts/incubator/fsm/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/fsm/questions.yaml
+++ b/charts/incubator/fsm/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/funkwhale-all-in-one/questions.yaml b/charts/incubator/funkwhale-all-in-one/questions.yaml
index b35fc70bc86..b75c2d638f7 100644
--- a/charts/incubator/funkwhale-all-in-one/questions.yaml
+++ b/charts/incubator/funkwhale-all-in-one/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/funkwhale/questions.yaml b/charts/incubator/funkwhale/questions.yaml
index 8a35283a429..40b13a9365d 100644
--- a/charts/incubator/funkwhale/questions.yaml
+++ b/charts/incubator/funkwhale/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/garrysmod/questions.yaml b/charts/incubator/garrysmod/questions.yaml
index 76c1aec23c1..bfd9a177705 100644
--- a/charts/incubator/garrysmod/questions.yaml
+++ b/charts/incubator/garrysmod/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/genea/questions.yaml b/charts/incubator/genea/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/genea/questions.yaml
+++ b/charts/incubator/genea/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/ghost/questions.yaml b/charts/incubator/ghost/questions.yaml
index 33d39c8abbc..7f86be058ae 100644
--- a/charts/incubator/ghost/questions.yaml
+++ b/charts/incubator/ghost/questions.yaml
@@ -14,6 +14,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
   - variable: env
     group: "Container Configuration"
diff --git a/charts/incubator/github-backup/questions.yaml b/charts/incubator/github-backup/questions.yaml
index 03a9a746bc6..aa8f8c4a7b7 100644
--- a/charts/incubator/github-backup/questions.yaml
+++ b/charts/incubator/github-backup/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/glauth/questions.yaml b/charts/incubator/glauth/questions.yaml
index 4cb6fec58b4..d960d030f86 100644
--- a/charts/incubator/glauth/questions.yaml
+++ b/charts/incubator/glauth/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/go-auto-yt/questions.yaml b/charts/incubator/go-auto-yt/questions.yaml
index 364699d0e90..4c7ee254d5c 100644
--- a/charts/incubator/go-auto-yt/questions.yaml
+++ b/charts/incubator/go-auto-yt/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/go-playground/questions.yaml b/charts/incubator/go-playground/questions.yaml
index 0b1ca188ea0..1d7b885c497 100644
--- a/charts/incubator/go-playground/questions.yaml
+++ b/charts/incubator/go-playground/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/goaccess-npm-logs/questions.yaml b/charts/incubator/goaccess-npm-logs/questions.yaml
index 7dc159de177..d5e85ce94c9 100644
--- a/charts/incubator/goaccess-npm-logs/questions.yaml
+++ b/charts/incubator/goaccess-npm-logs/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/goaccess/questions.yaml b/charts/incubator/goaccess/questions.yaml
index 04f464a4ae6..bd9bae0b23a 100644
--- a/charts/incubator/goaccess/questions.yaml
+++ b/charts/incubator/goaccess/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/godaddy-ddns/questions.yaml b/charts/incubator/godaddy-ddns/questions.yaml
index bccfaf3f345..3732988e2e8 100644
--- a/charts/incubator/godaddy-ddns/questions.yaml
+++ b/charts/incubator/godaddy-ddns/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/gokapi/questions.yaml b/charts/incubator/gokapi/questions.yaml
index b60017794fd..ca000cbd956 100644
--- a/charts/incubator/gokapi/questions.yaml
+++ b/charts/incubator/gokapi/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/google-cloud-storage-backup/questions.yaml b/charts/incubator/google-cloud-storage-backup/questions.yaml
index 58f7ac0ca0b..808236026df 100644
--- a/charts/incubator/google-cloud-storage-backup/questions.yaml
+++ b/charts/incubator/google-cloud-storage-backup/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/googlephotossync/questions.yaml b/charts/incubator/googlephotossync/questions.yaml
index 4b442b39907..737bbcc5f99 100644
--- a/charts/incubator/googlephotossync/questions.yaml
+++ b/charts/incubator/googlephotossync/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/gpodder/questions.yaml b/charts/incubator/gpodder/questions.yaml
index 2d6f0356da5..8b6fb4b04fe 100644
--- a/charts/incubator/gpodder/questions.yaml
+++ b/charts/incubator/gpodder/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/grafana-image-renderer/questions.yaml b/charts/incubator/grafana-image-renderer/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/grafana-image-renderer/questions.yaml
+++ b/charts/incubator/grafana-image-renderer/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/gridcoinwalletgui/questions.yaml b/charts/incubator/gridcoinwalletgui/questions.yaml
index f8e91e88cbf..9689fc5f3bf 100644
--- a/charts/incubator/gridcoinwalletgui/questions.yaml
+++ b/charts/incubator/gridcoinwalletgui/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/guide2go/questions.yaml b/charts/incubator/guide2go/questions.yaml
index e9156590ecc..c9808a4834e 100644
--- a/charts/incubator/guide2go/questions.yaml
+++ b/charts/incubator/guide2go/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/h5ai/questions.yaml b/charts/incubator/h5ai/questions.yaml
index 0f490e98b00..6a17c0f7cbe 100644
--- a/charts/incubator/h5ai/questions.yaml
+++ b/charts/incubator/h5ai/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/halflife2deathmatch/questions.yaml b/charts/incubator/halflife2deathmatch/questions.yaml
index d0823b87d6c..556a2def33e 100644
--- a/charts/incubator/halflife2deathmatch/questions.yaml
+++ b/charts/incubator/halflife2deathmatch/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/hassconfigurator/questions.yaml b/charts/incubator/hassconfigurator/questions.yaml
index 61002348033..87b90435c4a 100644
--- a/charts/incubator/hassconfigurator/questions.yaml
+++ b/charts/incubator/hassconfigurator/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/hastebin/questions.yaml b/charts/incubator/hastebin/questions.yaml
index 0c425e4b49a..c7b65bcb917 100644
--- a/charts/incubator/hastebin/questions.yaml
+++ b/charts/incubator/hastebin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/healthchecksdashboard/questions.yaml b/charts/incubator/healthchecksdashboard/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/healthchecksdashboard/questions.yaml
+++ b/charts/incubator/healthchecksdashboard/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/hetzner-ddns/questions.yaml b/charts/incubator/hetzner-ddns/questions.yaml
index d23d85ae8cf..d4604c436aa 100644
--- a/charts/incubator/hetzner-ddns/questions.yaml
+++ b/charts/incubator/hetzner-ddns/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/hexchat/questions.yaml b/charts/incubator/hexchat/questions.yaml
index 2218c8c573b..8b735f0305c 100644
--- a/charts/incubator/hexchat/questions.yaml
+++ b/charts/incubator/hexchat/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/hexo-blog/questions.yaml b/charts/incubator/hexo-blog/questions.yaml
index d0069baa20f..1a563004f56 100644
--- a/charts/incubator/hexo-blog/questions.yaml
+++ b/charts/incubator/hexo-blog/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/homebridge/questions.yaml b/charts/incubator/homebridge/questions.yaml
index 94b23bd7b44..5b2513e885d 100644
--- a/charts/incubator/homebridge/questions.yaml
+++ b/charts/incubator/homebridge/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/homelablabelmaker/questions.yaml b/charts/incubator/homelablabelmaker/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/homelablabelmaker/questions.yaml
+++ b/charts/incubator/homelablabelmaker/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/hoobs/questions.yaml b/charts/incubator/hoobs/questions.yaml
index e7d42b84599..50869e63d5d 100644
--- a/charts/incubator/hoobs/questions.yaml
+++ b/charts/incubator/hoobs/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/humhub/questions.yaml b/charts/incubator/humhub/questions.yaml
index c31efc24421..475610831a1 100644
--- a/charts/incubator/humhub/questions.yaml
+++ b/charts/incubator/humhub/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/hurtworld/questions.yaml b/charts/incubator/hurtworld/questions.yaml
index 069e7c3799f..11bc4816c15 100644
--- a/charts/incubator/hurtworld/questions.yaml
+++ b/charts/incubator/hurtworld/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/icloudpd/questions.yaml b/charts/incubator/icloudpd/questions.yaml
index 097d17bb88d..9c2807cfcbc 100644
--- a/charts/incubator/icloudpd/questions.yaml
+++ b/charts/incubator/icloudpd/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/imgpush/questions.yaml b/charts/incubator/imgpush/questions.yaml
index d8d1e32c646..93ca603237f 100644
--- a/charts/incubator/imgpush/questions.yaml
+++ b/charts/incubator/imgpush/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/import-ics/questions.yaml b/charts/incubator/import-ics/questions.yaml
index 95e74b93c7b..e632c91b1ed 100644
--- a/charts/incubator/import-ics/questions.yaml
+++ b/charts/incubator/import-ics/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/inkscape-desktop-g3/questions.yaml b/charts/incubator/inkscape-desktop-g3/questions.yaml
index f699f5c141c..66f43295761 100644
--- a/charts/incubator/inkscape-desktop-g3/questions.yaml
+++ b/charts/incubator/inkscape-desktop-g3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/insurgencysandstorm/questions.yaml b/charts/incubator/insurgencysandstorm/questions.yaml
index b6a87c6d1bf..9ed847cf6b5 100644
--- a/charts/incubator/insurgencysandstorm/questions.yaml
+++ b/charts/incubator/insurgencysandstorm/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/invitarr/questions.yaml b/charts/incubator/invitarr/questions.yaml
index e9da82e79cc..b7247ef5121 100644
--- a/charts/incubator/invitarr/questions.yaml
+++ b/charts/incubator/invitarr/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/ipmi-tools/questions.yaml b/charts/incubator/ipmi-tools/questions.yaml
index af0861eb165..4e839dc1ab6 100644
--- a/charts/incubator/ipmi-tools/questions.yaml
+++ b/charts/incubator/ipmi-tools/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/jelu/questions.yaml b/charts/incubator/jelu/questions.yaml
index 535b7ad7034..7174677d61d 100644
--- a/charts/incubator/jelu/questions.yaml
+++ b/charts/incubator/jelu/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/jenkins/questions.yaml b/charts/incubator/jenkins/questions.yaml
index f581a1bb368..6d9e829b910 100644
--- a/charts/incubator/jenkins/questions.yaml
+++ b/charts/incubator/jenkins/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/jitsi/questions.yaml b/charts/incubator/jitsi/questions.yaml
index 54fb7bc94bc..82eb798a941 100644
--- a/charts/incubator/jitsi/questions.yaml
+++ b/charts/incubator/jitsi/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/jmzhomeproxy/questions.yaml b/charts/incubator/jmzhomeproxy/questions.yaml
index c1a68170415..bd9a2f53f5f 100644
--- a/charts/incubator/jmzhomeproxy/questions.yaml
+++ b/charts/incubator/jmzhomeproxy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/jump/questions.yaml b/charts/incubator/jump/questions.yaml
index 2b49bac997b..db0196fe140 100644
--- a/charts/incubator/jump/questions.yaml
+++ b/charts/incubator/jump/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/kasm/questions.yaml b/charts/incubator/kasm/questions.yaml
index 736d34bf38f..a12f5f762df 100644
--- a/charts/incubator/kasm/questions.yaml
+++ b/charts/incubator/kasm/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/kdenlive-vnc/questions.yaml b/charts/incubator/kdenlive-vnc/questions.yaml
index f89e1e026ac..9fc3b565990 100644
--- a/charts/incubator/kdenlive-vnc/questions.yaml
+++ b/charts/incubator/kdenlive-vnc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/kdenlive/questions.yaml b/charts/incubator/kdenlive/questions.yaml
index 2f0e23b80fc..8c29656b0a0 100644
--- a/charts/incubator/kdenlive/questions.yaml
+++ b/charts/incubator/kdenlive/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/keeweb/questions.yaml b/charts/incubator/keeweb/questions.yaml
index fe09188b5fd..a30a4c19e58 100644
--- a/charts/incubator/keeweb/questions.yaml
+++ b/charts/incubator/keeweb/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/kerbalspaceprogram-lmp/questions.yaml b/charts/incubator/kerbalspaceprogram-lmp/questions.yaml
index 7f1d3e1dabb..51a537e3ebb 100644
--- a/charts/incubator/kerbalspaceprogram-lmp/questions.yaml
+++ b/charts/incubator/kerbalspaceprogram-lmp/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/kerio-connect/questions.yaml b/charts/incubator/kerio-connect/questions.yaml
index f332b6d4ecd..f5407aaff36 100644
--- a/charts/incubator/kerio-connect/questions.yaml
+++ b/charts/incubator/kerio-connect/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/kitana/questions.yaml b/charts/incubator/kitana/questions.yaml
index 3bf1912b360..4ec88d33a7b 100644
--- a/charts/incubator/kitana/questions.yaml
+++ b/charts/incubator/kitana/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/kitchenowl/questions.yaml b/charts/incubator/kitchenowl/questions.yaml
index 91b4287c01a..b6c62150d0c 100644
--- a/charts/incubator/kitchenowl/questions.yaml
+++ b/charts/incubator/kitchenowl/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/kiwix-serve/questions.yaml b/charts/incubator/kiwix-serve/questions.yaml
index 8a0b9a4d043..133647a9631 100644
--- a/charts/incubator/kiwix-serve/questions.yaml
+++ b/charts/incubator/kiwix-serve/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/krusader/questions.yaml b/charts/incubator/krusader/questions.yaml
index 9f3c8354f1d..665d1763d7e 100644
--- a/charts/incubator/krusader/questions.yaml
+++ b/charts/incubator/krusader/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/lancache-dns/questions.yaml b/charts/incubator/lancache-dns/questions.yaml
index 20417df116a..08545da223e 100644
--- a/charts/incubator/lancache-dns/questions.yaml
+++ b/charts/incubator/lancache-dns/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/lancache-monolithic/questions.yaml b/charts/incubator/lancache-monolithic/questions.yaml
index dfbd5843d6c..4759fac7d2e 100644
--- a/charts/incubator/lancache-monolithic/questions.yaml
+++ b/charts/incubator/lancache-monolithic/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/lastoasis/questions.yaml b/charts/incubator/lastoasis/questions.yaml
index e324851b4e5..878312ebed7 100644
--- a/charts/incubator/lastoasis/questions.yaml
+++ b/charts/incubator/lastoasis/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/left4dead/questions.yaml b/charts/incubator/left4dead/questions.yaml
index afb11adfa5e..d95edf1ca66 100644
--- a/charts/incubator/left4dead/questions.yaml
+++ b/charts/incubator/left4dead/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/lemur-cfssl/questions.yaml b/charts/incubator/lemur-cfssl/questions.yaml
index 54e090d61f7..e7e9b1029f8 100644
--- a/charts/incubator/lemur-cfssl/questions.yaml
+++ b/charts/incubator/lemur-cfssl/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/lingva/questions.yaml b/charts/incubator/lingva/questions.yaml
index 29d71328fc6..8d72faef7c9 100644
--- a/charts/incubator/lingva/questions.yaml
+++ b/charts/incubator/lingva/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/liquid-dl/questions.yaml b/charts/incubator/liquid-dl/questions.yaml
index eabb6351011..80e1a219c88 100644
--- a/charts/incubator/liquid-dl/questions.yaml
+++ b/charts/incubator/liquid-dl/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/livebook/questions.yaml b/charts/incubator/livebook/questions.yaml
index 2eb1786ccc3..ee92710fcd3 100644
--- a/charts/incubator/livebook/questions.yaml
+++ b/charts/incubator/livebook/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/livestreamdvr/questions.yaml b/charts/incubator/livestreamdvr/questions.yaml
index 1a12da26e2c..13f36e6c85a 100644
--- a/charts/incubator/livestreamdvr/questions.yaml
+++ b/charts/incubator/livestreamdvr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/llalon-github-backup/questions.yaml b/charts/incubator/llalon-github-backup/questions.yaml
index 284842a99ed..53c4e8d4782 100644
--- a/charts/incubator/llalon-github-backup/questions.yaml
+++ b/charts/incubator/llalon-github-backup/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/longvinter/questions.yaml b/charts/incubator/longvinter/questions.yaml
index e41f4c9474c..7a5c69fd07a 100644
--- a/charts/incubator/longvinter/questions.yaml
+++ b/charts/incubator/longvinter/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/magnetico-environment/questions.yaml b/charts/incubator/magnetico-environment/questions.yaml
index 22c513df13f..20d4bb85e0b 100644
--- a/charts/incubator/magnetico-environment/questions.yaml
+++ b/charts/incubator/magnetico-environment/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/mailpile/questions.yaml b/charts/incubator/mailpile/questions.yaml
index 3a3ab514437..6f2218d6be1 100644
--- a/charts/incubator/mailpile/questions.yaml
+++ b/charts/incubator/mailpile/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/maloja/questions.yaml b/charts/incubator/maloja/questions.yaml
index 67638cfd6ce..da33c7c43cf 100644
--- a/charts/incubator/maloja/questions.yaml
+++ b/charts/incubator/maloja/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/mango/questions.yaml b/charts/incubator/mango/questions.yaml
index 7803481e598..4fa9d7dbe0e 100644
--- a/charts/incubator/mango/questions.yaml
+++ b/charts/incubator/mango/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/media-roller/questions.yaml b/charts/incubator/media-roller/questions.yaml
index 80f4f84dc14..2e8653b1467 100644
--- a/charts/incubator/media-roller/questions.yaml
+++ b/charts/incubator/media-roller/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/mediaelch/questions.yaml b/charts/incubator/mediaelch/questions.yaml
index 74a4ac47f95..3279834464a 100644
--- a/charts/incubator/mediaelch/questions.yaml
+++ b/charts/incubator/mediaelch/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/mediagoblin/questions.yaml b/charts/incubator/mediagoblin/questions.yaml
index dd517228173..775d167c3fc 100644
--- a/charts/incubator/mediagoblin/questions.yaml
+++ b/charts/incubator/mediagoblin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/megasync/questions.yaml b/charts/incubator/megasync/questions.yaml
index 9aaf351ea37..8734125a8c2 100644
--- a/charts/incubator/megasync/questions.yaml
+++ b/charts/incubator/megasync/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/memories-of-mars/questions.yaml b/charts/incubator/memories-of-mars/questions.yaml
index 41f5af72896..cd6f0e07552 100644
--- a/charts/incubator/memories-of-mars/questions.yaml
+++ b/charts/incubator/memories-of-mars/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/meshcentral/questions.yaml b/charts/incubator/meshcentral/questions.yaml
index 3b7145292ce..a254b292a38 100644
--- a/charts/incubator/meshcentral/questions.yaml
+++ b/charts/incubator/meshcentral/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/metatube/questions.yaml b/charts/incubator/metatube/questions.yaml
index e3dd6e41c44..400c73a8cab 100644
--- a/charts/incubator/metatube/questions.yaml
+++ b/charts/incubator/metatube/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/mindustry/questions.yaml b/charts/incubator/mindustry/questions.yaml
index 73a5ab06d1d..7a915c95375 100644
--- a/charts/incubator/mindustry/questions.yaml
+++ b/charts/incubator/mindustry/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/minecraft-bungeecord/questions.yaml b/charts/incubator/minecraft-bungeecord/questions.yaml
index 340324f6463..f2984f6b1e7 100644
--- a/charts/incubator/minecraft-bungeecord/questions.yaml
+++ b/charts/incubator/minecraft-bungeecord/questions.yaml
@@ -24,6 +24,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/mineos/questions.yaml b/charts/incubator/mineos/questions.yaml
index 289c4d8fc44..7c216eb178f 100644
--- a/charts/incubator/mineos/questions.yaml
+++ b/charts/incubator/mineos/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: env
     group: "Container Configuration"
diff --git a/charts/incubator/minimal-ics-hoster/questions.yaml b/charts/incubator/minimal-ics-hoster/questions.yaml
index b1208f91f3e..e32ad5e6083 100644
--- a/charts/incubator/minimal-ics-hoster/questions.yaml
+++ b/charts/incubator/minimal-ics-hoster/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/mininote/questions.yaml b/charts/incubator/mininote/questions.yaml
index a462de7b8e3..e8417b56550 100644
--- a/charts/incubator/mininote/questions.yaml
+++ b/charts/incubator/mininote/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/mocodo-mcd/questions.yaml b/charts/incubator/mocodo-mcd/questions.yaml
index 5bf51b23661..14412edd683 100644
--- a/charts/incubator/mocodo-mcd/questions.yaml
+++ b/charts/incubator/mocodo-mcd/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/mojopaste/questions.yaml b/charts/incubator/mojopaste/questions.yaml
index ef0ef0baef8..3b03ec0b529 100644
--- a/charts/incubator/mojopaste/questions.yaml
+++ b/charts/incubator/mojopaste/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/monero-node/questions.yaml b/charts/incubator/monero-node/questions.yaml
index 5bf525ed0bc..ce399e687a2 100644
--- a/charts/incubator/monero-node/questions.yaml
+++ b/charts/incubator/monero-node/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/mordhau/questions.yaml b/charts/incubator/mordhau/questions.yaml
index c96a85a820a..b0d1ee13018 100644
--- a/charts/incubator/mordhau/questions.yaml
+++ b/charts/incubator/mordhau/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/moviegrabber/questions.yaml b/charts/incubator/moviegrabber/questions.yaml
index 6a6c2926311..bf8b019d531 100644
--- a/charts/incubator/moviegrabber/questions.yaml
+++ b/charts/incubator/moviegrabber/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/multi-scrobbler/questions.yaml b/charts/incubator/multi-scrobbler/questions.yaml
index 1e7495b7cf7..b9ea927d3de 100644
--- a/charts/incubator/multi-scrobbler/questions.yaml
+++ b/charts/incubator/multi-scrobbler/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/mymediaforalexa/questions.yaml b/charts/incubator/mymediaforalexa/questions.yaml
index b2094b08fd2..3fa976d6be5 100644
--- a/charts/incubator/mymediaforalexa/questions.yaml
+++ b/charts/incubator/mymediaforalexa/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/namecheap-ddns/questions.yaml b/charts/incubator/namecheap-ddns/questions.yaml
index eb01a27a110..2966e1c55e0 100644
--- a/charts/incubator/namecheap-ddns/questions.yaml
+++ b/charts/incubator/namecheap-ddns/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/necesse/questions.yaml b/charts/incubator/necesse/questions.yaml
index b1a90d6da42..adcb35620d5 100644
--- a/charts/incubator/necesse/questions.yaml
+++ b/charts/incubator/necesse/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/neko/questions.yaml b/charts/incubator/neko/questions.yaml
index 2ae2b10a0c9..5fa231abe59 100644
--- a/charts/incubator/neko/questions.yaml
+++ b/charts/incubator/neko/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/neverwinternights-ee/questions.yaml b/charts/incubator/neverwinternights-ee/questions.yaml
index 72a166127f6..5d8a9ca4ce1 100644
--- a/charts/incubator/neverwinternights-ee/questions.yaml
+++ b/charts/incubator/neverwinternights-ee/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/newyearcountdownclock/questions.yaml b/charts/incubator/newyearcountdownclock/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/newyearcountdownclock/questions.yaml
+++ b/charts/incubator/newyearcountdownclock/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/nexus-oss/questions.yaml b/charts/incubator/nexus-oss/questions.yaml
index dfceb8281ea..41e0e9768da 100644
--- a/charts/incubator/nexus-oss/questions.yaml
+++ b/charts/incubator/nexus-oss/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/nightscout/questions.yaml b/charts/incubator/nightscout/questions.yaml
index 44e958c0262..88936323753 100644
--- a/charts/incubator/nightscout/questions.yaml
+++ b/charts/incubator/nightscout/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/nosqlclient/questions.yaml b/charts/incubator/nosqlclient/questions.yaml
index 1bc9b1d3fba..e32213aa0b3 100644
--- a/charts/incubator/nosqlclient/questions.yaml
+++ b/charts/incubator/nosqlclient/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/notarius/questions.yaml b/charts/incubator/notarius/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/notarius/questions.yaml
+++ b/charts/incubator/notarius/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/notea/questions.yaml b/charts/incubator/notea/questions.yaml
index c962f1dd97b..e7b38de8fdc 100644
--- a/charts/incubator/notea/questions.yaml
+++ b/charts/incubator/notea/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/obs-ndi/questions.yaml b/charts/incubator/obs-ndi/questions.yaml
index 8d29873cb58..3cb738db3c4 100644
--- a/charts/incubator/obs-ndi/questions.yaml
+++ b/charts/incubator/obs-ndi/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/observium/questions.yaml b/charts/incubator/observium/questions.yaml
index 3ed4ec008b3..a78f97528ed 100644
--- a/charts/incubator/observium/questions.yaml
+++ b/charts/incubator/observium/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/obsidian/questions.yaml b/charts/incubator/obsidian/questions.yaml
index 554843b3552..4bb3a341851 100644
--- a/charts/incubator/obsidian/questions.yaml
+++ b/charts/incubator/obsidian/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/onlinecheckyourserver/questions.yaml b/charts/incubator/onlinecheckyourserver/questions.yaml
index 6dc9bc170e4..6df877ed8e1 100644
--- a/charts/incubator/onlinecheckyourserver/questions.yaml
+++ b/charts/incubator/onlinecheckyourserver/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/opengl-desktop-g3/questions.yaml b/charts/incubator/opengl-desktop-g3/questions.yaml
index f699f5c141c..66f43295761 100644
--- a/charts/incubator/opengl-desktop-g3/questions.yaml
+++ b/charts/incubator/opengl-desktop-g3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/openproject/questions.yaml b/charts/incubator/openproject/questions.yaml
index 69035c0c913..1c4b1af21d1 100644
--- a/charts/incubator/openproject/questions.yaml
+++ b/charts/incubator/openproject/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/openra/questions.yaml b/charts/incubator/openra/questions.yaml
index 7fa89405d06..d0ff25c3301 100644
--- a/charts/incubator/openra/questions.yaml
+++ b/charts/incubator/openra/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/openttd/questions.yaml b/charts/incubator/openttd/questions.yaml
index 1f429a43f0d..794e4424d6d 100644
--- a/charts/incubator/openttd/questions.yaml
+++ b/charts/incubator/openttd/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/owi2plex/questions.yaml b/charts/incubator/owi2plex/questions.yaml
index fcaae3f46fb..b8496a2a565 100644
--- a/charts/incubator/owi2plex/questions.yaml
+++ b/charts/incubator/owi2plex/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/passwordpusherephemeral/questions.yaml b/charts/incubator/passwordpusherephemeral/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/passwordpusherephemeral/questions.yaml
+++ b/charts/incubator/passwordpusherephemeral/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/pasta/questions.yaml b/charts/incubator/pasta/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/pasta/questions.yaml
+++ b/charts/incubator/pasta/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/pastey/questions.yaml b/charts/incubator/pastey/questions.yaml
index 7dd6ae8ed51..4db2da45a90 100644
--- a/charts/incubator/pastey/questions.yaml
+++ b/charts/incubator/pastey/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/pavlovvr/questions.yaml b/charts/incubator/pavlovvr/questions.yaml
index c88a6779d4d..5a26d0f8a68 100644
--- a/charts/incubator/pavlovvr/questions.yaml
+++ b/charts/incubator/pavlovvr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/phoenixstats/questions.yaml b/charts/incubator/phoenixstats/questions.yaml
index 75ada5028fc..7aa6ddd2a50 100644
--- a/charts/incubator/phoenixstats/questions.yaml
+++ b/charts/incubator/phoenixstats/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/phoronix-test-suite/questions.yaml b/charts/incubator/phoronix-test-suite/questions.yaml
index 48937368c8f..98c385a4e67 100644
--- a/charts/incubator/phoronix-test-suite/questions.yaml
+++ b/charts/incubator/phoronix-test-suite/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/photo-stream/questions.yaml b/charts/incubator/photo-stream/questions.yaml
index 66cce47de2f..1eed2ead2c1 100644
--- a/charts/incubator/photo-stream/questions.yaml
+++ b/charts/incubator/photo-stream/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/photostructure/questions.yaml b/charts/incubator/photostructure/questions.yaml
index 9625949e36a..e5c4b0bd4dd 100644
--- a/charts/incubator/photostructure/questions.yaml
+++ b/charts/incubator/photostructure/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/phpmyadmin/questions.yaml b/charts/incubator/phpmyadmin/questions.yaml
index d5273a8969f..093db04de37 100644
--- a/charts/incubator/phpmyadmin/questions.yaml
+++ b/charts/incubator/phpmyadmin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/pigallery2/questions.yaml b/charts/incubator/pigallery2/questions.yaml
index c1acc6a3b38..77ebcbbcd6f 100644
--- a/charts/incubator/pigallery2/questions.yaml
+++ b/charts/incubator/pigallery2/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/piwigo/questions.yaml b/charts/incubator/piwigo/questions.yaml
index 8a29235ab75..02f012c2228 100644
--- a/charts/incubator/piwigo/questions.yaml
+++ b/charts/incubator/piwigo/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/pixark/questions.yaml b/charts/incubator/pixark/questions.yaml
index 4d13d6f2982..e90075675cf 100644
--- a/charts/incubator/pixark/questions.yaml
+++ b/charts/incubator/pixark/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/pixelserv-tls/questions.yaml b/charts/incubator/pixelserv-tls/questions.yaml
index 0423d20ecba..bdf902205a3 100644
--- a/charts/incubator/pixelserv-tls/questions.yaml
+++ b/charts/incubator/pixelserv-tls/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/plausible/questions.yaml b/charts/incubator/plausible/questions.yaml
index 97bc36d1d61..c820d34c733 100644
--- a/charts/incubator/plausible/questions.yaml
+++ b/charts/incubator/plausible/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: plausible
     group: "Container Configuration"
     label: "Plausible Configuration"
diff --git a/charts/incubator/plaxt/questions.yaml b/charts/incubator/plaxt/questions.yaml
index 9212653ae15..5735288ba85 100644
--- a/charts/incubator/plaxt/questions.yaml
+++ b/charts/incubator/plaxt/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/plex-auto-languages/questions.yaml b/charts/incubator/plex-auto-languages/questions.yaml
index 59cfa8c6dd7..b22119006f8 100644
--- a/charts/incubator/plex-auto-languages/questions.yaml
+++ b/charts/incubator/plex-auto-languages/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/plex-meta-manager/questions.yaml b/charts/incubator/plex-meta-manager/questions.yaml
index fa8865b9992..29f60217274 100644
--- a/charts/incubator/plex-meta-manager/questions.yaml
+++ b/charts/incubator/plex-meta-manager/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/plex-utills/questions.yaml b/charts/incubator/plex-utills/questions.yaml
index 2de7bfe5119..794ae773c93 100644
--- a/charts/incubator/plex-utills/questions.yaml
+++ b/charts/incubator/plex-utills/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/plexripper/questions.yaml b/charts/incubator/plexripper/questions.yaml
index f0c30e3d721..4c7d7c8f283 100644
--- a/charts/incubator/plexripper/questions.yaml
+++ b/charts/incubator/plexripper/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/plextraktsync/questions.yaml b/charts/incubator/plextraktsync/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/plextraktsync/questions.yaml
+++ b/charts/incubator/plextraktsync/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/post-recording/questions.yaml b/charts/incubator/post-recording/questions.yaml
index 4e8b4f29536..f3c18a12cfc 100644
--- a/charts/incubator/post-recording/questions.yaml
+++ b/charts/incubator/post-recording/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/poste/questions.yaml b/charts/incubator/poste/questions.yaml
index ff67c1692e5..54e8a0ec8ef 100644
--- a/charts/incubator/poste/questions.yaml
+++ b/charts/incubator/poste/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/posterr/questions.yaml b/charts/incubator/posterr/questions.yaml
index 5c1761c6a87..eed3063e2db 100644
--- a/charts/incubator/posterr/questions.yaml
+++ b/charts/incubator/posterr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/postscriptum/questions.yaml b/charts/incubator/postscriptum/questions.yaml
index 9403ceb62b2..6e09b8683d6 100644
--- a/charts/incubator/postscriptum/questions.yaml
+++ b/charts/incubator/postscriptum/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/preclear/questions.yaml b/charts/incubator/preclear/questions.yaml
index f363b092119..6f3a5b10cb2 100644
--- a/charts/incubator/preclear/questions.yaml
+++ b/charts/incubator/preclear/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/pritunl/questions.yaml b/charts/incubator/pritunl/questions.yaml
index 687823ec905..0cf1a845b4f 100644
--- a/charts/incubator/pritunl/questions.yaml
+++ b/charts/incubator/pritunl/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/privatebin/questions.yaml b/charts/incubator/privatebin/questions.yaml
index 23a218ccdc5..5d475c8c29c 100644
--- a/charts/incubator/privatebin/questions.yaml
+++ b/charts/incubator/privatebin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: privatebin
     group: "Container Configuration"
     label: "PrivateBin Custom Configuration"
diff --git a/charts/incubator/projectzomboidreporter-frontend/questions.yaml b/charts/incubator/projectzomboidreporter-frontend/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/projectzomboidreporter-frontend/questions.yaml
+++ b/charts/incubator/projectzomboidreporter-frontend/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/prpdf/questions.yaml b/charts/incubator/prpdf/questions.yaml
index a165981c386..d662cb32a01 100644
--- a/charts/incubator/prpdf/questions.yaml
+++ b/charts/incubator/prpdf/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/prusaslicer-novnc/questions.yaml b/charts/incubator/prusaslicer-novnc/questions.yaml
index fb75d70056e..201cdc8c98c 100644
--- a/charts/incubator/prusaslicer-novnc/questions.yaml
+++ b/charts/incubator/prusaslicer-novnc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/ps3netsrv/questions.yaml b/charts/incubator/ps3netsrv/questions.yaml
index 24d47128d91..68735c28328 100644
--- a/charts/incubator/ps3netsrv/questions.yaml
+++ b/charts/incubator/ps3netsrv/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/pt-helper/questions.yaml b/charts/incubator/pt-helper/questions.yaml
index 4f4e0f30298..6c7f74d4759 100644
--- a/charts/incubator/pt-helper/questions.yaml
+++ b/charts/incubator/pt-helper/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/pure-ftpd/questions.yaml b/charts/incubator/pure-ftpd/questions.yaml
index 1588dca940e..7519895f46a 100644
--- a/charts/incubator/pure-ftpd/questions.yaml
+++ b/charts/incubator/pure-ftpd/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/pvk-ii/questions.yaml b/charts/incubator/pvk-ii/questions.yaml
index 6ea18621bf7..2bf99d5b93f 100644
--- a/charts/incubator/pvk-ii/questions.yaml
+++ b/charts/incubator/pvk-ii/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/pwm/questions.yaml b/charts/incubator/pwm/questions.yaml
index 44bd0462bc9..bc02514e541 100644
--- a/charts/incubator/pwm/questions.yaml
+++ b/charts/incubator/pwm/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/pyload-ng/questions.yaml b/charts/incubator/pyload-ng/questions.yaml
index 8131bd433c6..a94f608ecc6 100644
--- a/charts/incubator/pyload-ng/questions.yaml
+++ b/charts/incubator/pyload-ng/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/qbitmanage/questions.yaml b/charts/incubator/qbitmanage/questions.yaml
index dec04b663e3..59d4ce10d50 100644
--- a/charts/incubator/qbitmanage/questions.yaml
+++ b/charts/incubator/qbitmanage/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/qflood/questions.yaml b/charts/incubator/qflood/questions.yaml
index ed50c0c1a63..91a47b6f842 100644
--- a/charts/incubator/qflood/questions.yaml
+++ b/charts/incubator/qflood/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/quake3/questions.yaml b/charts/incubator/quake3/questions.yaml
index 10ea5efcb58..586a25d3d2e 100644
--- a/charts/incubator/quake3/questions.yaml
+++ b/charts/incubator/quake3/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/quickshare/questions.yaml b/charts/incubator/quickshare/questions.yaml
index c452ad8ec7f..952cc14f12a 100644
--- a/charts/incubator/quickshare/questions.yaml
+++ b/charts/incubator/quickshare/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/quiz-game/questions.yaml b/charts/incubator/quiz-game/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/quiz-game/questions.yaml
+++ b/charts/incubator/quiz-game/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/ra-rom-processor/questions.yaml b/charts/incubator/ra-rom-processor/questions.yaml
index c5ca0487141..6cab2260b28 100644
--- a/charts/incubator/ra-rom-processor/questions.yaml
+++ b/charts/incubator/ra-rom-processor/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/radarrsync/questions.yaml b/charts/incubator/radarrsync/questions.yaml
index 1227c8e8ac3..abd8dac817a 100644
--- a/charts/incubator/radarrsync/questions.yaml
+++ b/charts/incubator/radarrsync/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/radicale/questions.yaml b/charts/incubator/radicale/questions.yaml
index 5394947634c..8735756aa4f 100644
--- a/charts/incubator/radicale/questions.yaml
+++ b/charts/incubator/radicale/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: radicale
     group: Container Configuration
     label: Radicale Configuration
diff --git a/charts/incubator/raneto/questions.yaml b/charts/incubator/raneto/questions.yaml
index 6f972f62205..a64c70ae514 100644
--- a/charts/incubator/raneto/questions.yaml
+++ b/charts/incubator/raneto/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rapidphotodownloader/questions.yaml b/charts/incubator/rapidphotodownloader/questions.yaml
index 5a56696dbcd..ab0d3b862a4 100644
--- a/charts/incubator/rapidphotodownloader/questions.yaml
+++ b/charts/incubator/rapidphotodownloader/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rcon-webadmin/questions.yaml b/charts/incubator/rcon-webadmin/questions.yaml
index a4e03b2653c..94c9629c8c4 100644
--- a/charts/incubator/rcon-webadmin/questions.yaml
+++ b/charts/incubator/rcon-webadmin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rdesktop/questions.yaml b/charts/incubator/rdesktop/questions.yaml
index 9b418ce717f..318194c1fbd 100644
--- a/charts/incubator/rdesktop/questions.yaml
+++ b/charts/incubator/rdesktop/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/reactive-resume/questions.yaml b/charts/incubator/reactive-resume/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/reactive-resume/questions.yaml
+++ b/charts/incubator/reactive-resume/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/recyclarr/questions.yaml b/charts/incubator/recyclarr/questions.yaml
index d8365da67e8..a7c7069c181 100644
--- a/charts/incubator/recyclarr/questions.yaml
+++ b/charts/incubator/recyclarr/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/red-discordbot/questions.yaml b/charts/incubator/red-discordbot/questions.yaml
index 73f9510c6aa..ac9099de796 100644
--- a/charts/incubator/red-discordbot/questions.yaml
+++ b/charts/incubator/red-discordbot/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/redisinsight/questions.yaml b/charts/incubator/redisinsight/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/redisinsight/questions.yaml
+++ b/charts/incubator/redisinsight/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/redm/questions.yaml b/charts/incubator/redm/questions.yaml
index 0805b9a4ce1..dff456ad813 100644
--- a/charts/incubator/redm/questions.yaml
+++ b/charts/incubator/redm/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/remotely/questions.yaml b/charts/incubator/remotely/questions.yaml
index 7f2f9966065..b598939ba98 100644
--- a/charts/incubator/remotely/questions.yaml
+++ b/charts/incubator/remotely/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/restic-rest-server/questions.yaml b/charts/incubator/restic-rest-server/questions.yaml
index 8e72ba6820f..650c57159db 100644
--- a/charts/incubator/restic-rest-server/questions.yaml
+++ b/charts/incubator/restic-rest-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/restreamer/questions.yaml b/charts/incubator/restreamer/questions.yaml
index 589eed787fc..916a9e597b4 100644
--- a/charts/incubator/restreamer/questions.yaml
+++ b/charts/incubator/restreamer/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rflood/questions.yaml b/charts/incubator/rflood/questions.yaml
index 23d081dfc54..db893c8377b 100644
--- a/charts/incubator/rflood/questions.yaml
+++ b/charts/incubator/rflood/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rickroll/questions.yaml b/charts/incubator/rickroll/questions.yaml
index 58fd1258e47..2906e342c9a 100644
--- a/charts/incubator/rickroll/questions.yaml
+++ b/charts/incubator/rickroll/questions.yaml
@@ -28,6 +28,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/rimgo/questions.yaml b/charts/incubator/rimgo/questions.yaml
index dd3bbaf8667..169ba38612a 100644
--- a/charts/incubator/rimgo/questions.yaml
+++ b/charts/incubator/rimgo/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/ring-mqtt/questions.yaml b/charts/incubator/ring-mqtt/questions.yaml
index f7897db11d9..df82dbdb5f0 100644
--- a/charts/incubator/ring-mqtt/questions.yaml
+++ b/charts/incubator/ring-mqtt/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rmlint/questions.yaml b/charts/incubator/rmlint/questions.yaml
index 1fdb7d9bb79..6c33c177cfb 100644
--- a/charts/incubator/rmlint/questions.yaml
+++ b/charts/incubator/rmlint/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rollarr/questions.yaml b/charts/incubator/rollarr/questions.yaml
index 60d862466a8..5ff85bc6bf5 100644
--- a/charts/incubator/rollarr/questions.yaml
+++ b/charts/incubator/rollarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/root/questions.yaml b/charts/incubator/root/questions.yaml
index 1465d9737c6..d735d83b0bb 100644
--- a/charts/incubator/root/questions.yaml
+++ b/charts/incubator/root/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/rss-proxy/questions.yaml b/charts/incubator/rss-proxy/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/rss-proxy/questions.yaml
+++ b/charts/incubator/rss-proxy/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/rss-to-telegram/questions.yaml b/charts/incubator/rss-to-telegram/questions.yaml
index 5c4861c600e..e98dc87ac44 100644
--- a/charts/incubator/rss-to-telegram/questions.yaml
+++ b/charts/incubator/rss-to-telegram/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rstudio/questions.yaml b/charts/incubator/rstudio/questions.yaml
index cc3fda117fe..e92f696cf33 100644
--- a/charts/incubator/rstudio/questions.yaml
+++ b/charts/incubator/rstudio/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rtmpserver/questions.yaml b/charts/incubator/rtmpserver/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/rtmpserver/questions.yaml
+++ b/charts/incubator/rtmpserver/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/rust/questions.yaml b/charts/incubator/rust/questions.yaml
index 681f8dc77fa..853c7dbb196 100644
--- a/charts/incubator/rust/questions.yaml
+++ b/charts/incubator/rust/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/rustpad/questions.yaml b/charts/incubator/rustpad/questions.yaml
index d2b9d13907c..71679600272 100644
--- a/charts/incubator/rustpad/questions.yaml
+++ b/charts/incubator/rustpad/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/s3backup/questions.yaml b/charts/incubator/s3backup/questions.yaml
index b9dab98ad70..11eba37a343 100644
--- a/charts/incubator/s3backup/questions.yaml
+++ b/charts/incubator/s3backup/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/s3sync/questions.yaml b/charts/incubator/s3sync/questions.yaml
index e9c36b0ee9c..4c9e17d2faf 100644
--- a/charts/incubator/s3sync/questions.yaml
+++ b/charts/incubator/s3sync/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/satisfactory-server/questions.yaml b/charts/incubator/satisfactory-server/questions.yaml
index 5ac84e507ec..6181daa1e0f 100644
--- a/charts/incubator/satisfactory-server/questions.yaml
+++ b/charts/incubator/satisfactory-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/scprime/questions.yaml b/charts/incubator/scprime/questions.yaml
index 23c045b8762..ac2302bdf4f 100644
--- a/charts/incubator/scprime/questions.yaml
+++ b/charts/incubator/scprime/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/searx/questions.yaml b/charts/incubator/searx/questions.yaml
index 0d4f2b7782d..172b4b5c061 100644
--- a/charts/incubator/searx/questions.yaml
+++ b/charts/incubator/searx/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/searxng/questions.yaml b/charts/incubator/searxng/questions.yaml
index 711ab6c3793..9a39743041e 100644
--- a/charts/incubator/searxng/questions.yaml
+++ b/charts/incubator/searxng/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/seedsync/questions.yaml b/charts/incubator/seedsync/questions.yaml
index 5620f4e862a..09f69cfa151 100644
--- a/charts/incubator/seedsync/questions.yaml
+++ b/charts/incubator/seedsync/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/self-service-password/questions.yaml b/charts/incubator/self-service-password/questions.yaml
index 7f332522c62..3befb8bc539 100644
--- a/charts/incubator/self-service-password/questions.yaml
+++ b/charts/incubator/self-service-password/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/send/questions.yaml b/charts/incubator/send/questions.yaml
index 01555f7134e..e774c4411f8 100644
--- a/charts/incubator/send/questions.yaml
+++ b/charts/incubator/send/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/senseai-server/questions.yaml b/charts/incubator/senseai-server/questions.yaml
index 04cd5c648d0..002b21ab94b 100644
--- a/charts/incubator/senseai-server/questions.yaml
+++ b/charts/incubator/senseai-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/server-7daystodie/questions.yaml b/charts/incubator/server-7daystodie/questions.yaml
index 65419cad3fa..30493de7e10 100644
--- a/charts/incubator/server-7daystodie/questions.yaml
+++ b/charts/incubator/server-7daystodie/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/serviio/questions.yaml b/charts/incubator/serviio/questions.yaml
index 4db58a3f005..68e0b9d2552 100644
--- a/charts/incubator/serviio/questions.yaml
+++ b/charts/incubator/serviio/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/sftpgo/questions.yaml b/charts/incubator/sftpgo/questions.yaml
index 1e898fecd2d..d07ef45ed3d 100644
--- a/charts/incubator/sftpgo/questions.yaml
+++ b/charts/incubator/sftpgo/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/shaarli/questions.yaml b/charts/incubator/shaarli/questions.yaml
index ca1583353e3..9e47886bdba 100644
--- a/charts/incubator/shaarli/questions.yaml
+++ b/charts/incubator/shaarli/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/shadowsocks/questions.yaml b/charts/incubator/shadowsocks/questions.yaml
index 61a95e9bdbb..47c47f1eb1f 100644
--- a/charts/incubator/shadowsocks/questions.yaml
+++ b/charts/incubator/shadowsocks/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/shapeshifter-obfuscator/questions.yaml b/charts/incubator/shapeshifter-obfuscator/questions.yaml
index aa9a7d2b9df..bf0d6e7f01f 100644
--- a/charts/incubator/shapeshifter-obfuscator/questions.yaml
+++ b/charts/incubator/shapeshifter-obfuscator/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/sheetable/questions.yaml b/charts/incubator/sheetable/questions.yaml
index a99ebd12f0f..9861cf1419a 100644
--- a/charts/incubator/sheetable/questions.yaml
+++ b/charts/incubator/sheetable/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/shoko-server/questions.yaml b/charts/incubator/shoko-server/questions.yaml
index a9ebdffa9e3..c5e9475c326 100644
--- a/charts/incubator/shoko-server/questions.yaml
+++ b/charts/incubator/shoko-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/shortipy/questions.yaml b/charts/incubator/shortipy/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/shortipy/questions.yaml
+++ b/charts/incubator/shortipy/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/sia-daemon/questions.yaml b/charts/incubator/sia-daemon/questions.yaml
index b5e4c7fa305..5d4001a3217 100644
--- a/charts/incubator/sia-daemon/questions.yaml
+++ b/charts/incubator/sia-daemon/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/simply-shorten/questions.yaml b/charts/incubator/simply-shorten/questions.yaml
index a503b1ae3e6..609a5514e90 100644
--- a/charts/incubator/simply-shorten/questions.yaml
+++ b/charts/incubator/simply-shorten/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/sinusbot/questions.yaml b/charts/incubator/sinusbot/questions.yaml
index 85283a684aa..adffa06e3e1 100644
--- a/charts/incubator/sinusbot/questions.yaml
+++ b/charts/incubator/sinusbot/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/skyrimtogetherrebornserver/questions.yaml b/charts/incubator/skyrimtogetherrebornserver/questions.yaml
index d88b0e3b7ab..dd6fef2ca46 100644
--- a/charts/incubator/skyrimtogetherrebornserver/questions.yaml
+++ b/charts/incubator/skyrimtogetherrebornserver/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/slack-invite/questions.yaml b/charts/incubator/slack-invite/questions.yaml
index a4a2e498db7..873957b029d 100644
--- a/charts/incubator/slack-invite/questions.yaml
+++ b/charts/incubator/slack-invite/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/snippet-box/questions.yaml b/charts/incubator/snippet-box/questions.yaml
index 5183eccbba8..2d3a2ed8c7b 100644
--- a/charts/incubator/snippet-box/questions.yaml
+++ b/charts/incubator/snippet-box/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/socials/questions.yaml b/charts/incubator/socials/questions.yaml
index 171183a4e06..232a3438cfc 100644
--- a/charts/incubator/socials/questions.yaml
+++ b/charts/incubator/socials/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/sonarqube/questions.yaml b/charts/incubator/sonarqube/questions.yaml
index 154eabb9f0e..072191ef395 100644
--- a/charts/incubator/sonarqube/questions.yaml
+++ b/charts/incubator/sonarqube/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/songkong/questions.yaml b/charts/incubator/songkong/questions.yaml
index 3c78eddc9bd..5815b14c96a 100644
--- a/charts/incubator/songkong/questions.yaml
+++ b/charts/incubator/songkong/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/sourcegraph/questions.yaml b/charts/incubator/sourcegraph/questions.yaml
index 8255a28b19a..da0f6048a66 100644
--- a/charts/incubator/sourcegraph/questions.yaml
+++ b/charts/incubator/sourcegraph/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/spaceengineers/questions.yaml b/charts/incubator/spaceengineers/questions.yaml
index e1e4df76c32..3236146e947 100644
--- a/charts/incubator/spaceengineers/questions.yaml
+++ b/charts/incubator/spaceengineers/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/splunk/questions.yaml b/charts/incubator/splunk/questions.yaml
index 55ed49d7fe9..67b80eda61c 100644
--- a/charts/incubator/splunk/questions.yaml
+++ b/charts/incubator/splunk/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/sqlite-web/questions.yaml b/charts/incubator/sqlite-web/questions.yaml
index e43e17bef6f..a43c4623ba2 100644
--- a/charts/incubator/sqlite-web/questions.yaml
+++ b/charts/incubator/sqlite-web/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/st-reborn-server/questions.yaml b/charts/incubator/st-reborn-server/questions.yaml
index 40fa1518ba4..039685e37fe 100644
--- a/charts/incubator/st-reborn-server/questions.yaml
+++ b/charts/incubator/st-reborn-server/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/stackedit/questions.yaml b/charts/incubator/stackedit/questions.yaml
index e3cfdab6d48..20bb75ee4d8 100644
--- a/charts/incubator/stackedit/questions.yaml
+++ b/charts/incubator/stackedit/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/standardnotes-web/questions.yaml b/charts/incubator/standardnotes-web/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/standardnotes-web/questions.yaml
+++ b/charts/incubator/standardnotes-web/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/starmade/questions.yaml b/charts/incubator/starmade/questions.yaml
index bf0f538d76e..afcfef47a27 100644
--- a/charts/incubator/starmade/questions.yaml
+++ b/charts/incubator/starmade/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/stationeers/questions.yaml b/charts/incubator/stationeers/questions.yaml
index b27813d318a..e1026f4e343 100644
--- a/charts/incubator/stationeers/questions.yaml
+++ b/charts/incubator/stationeers/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/statping-ng/questions.yaml b/charts/incubator/statping-ng/questions.yaml
index 8fe13ad97d7..7a551157ad8 100644
--- a/charts/incubator/statping-ng/questions.yaml
+++ b/charts/incubator/statping-ng/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/storm/questions.yaml b/charts/incubator/storm/questions.yaml
index c14ed36d5c7..866471062e4 100644
--- a/charts/incubator/storm/questions.yaml
+++ b/charts/incubator/storm/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/stun-turn-server/questions.yaml b/charts/incubator/stun-turn-server/questions.yaml
index 5b24aa53790..f6afe7376db 100644
--- a/charts/incubator/stun-turn-server/questions.yaml
+++ b/charts/incubator/stun-turn-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/suistartpage/questions.yaml b/charts/incubator/suistartpage/questions.yaml
index 502f0489c64..b9ac6897fd5 100644
--- a/charts/incubator/suistartpage/questions.yaml
+++ b/charts/incubator/suistartpage/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/survivethenights/questions.yaml b/charts/incubator/survivethenights/questions.yaml
index e0d6bbb637b..38fc4581032 100644
--- a/charts/incubator/survivethenights/questions.yaml
+++ b/charts/incubator/survivethenights/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/synctube/questions.yaml b/charts/incubator/synctube/questions.yaml
index 3d95ec0f3db..f4a8d3f0919 100644
--- a/charts/incubator/synctube/questions.yaml
+++ b/charts/incubator/synctube/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/tachidesk-docker/questions.yaml b/charts/incubator/tachidesk-docker/questions.yaml
index 453c0dfac63..e7dd078eeb8 100644
--- a/charts/incubator/tachidesk-docker/questions.yaml
+++ b/charts/incubator/tachidesk-docker/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/tanoshi/questions.yaml b/charts/incubator/tanoshi/questions.yaml
index c9d8a20236b..4d2d4659261 100644
--- a/charts/incubator/tanoshi/questions.yaml
+++ b/charts/incubator/tanoshi/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/tar1090/questions.yaml b/charts/incubator/tar1090/questions.yaml
index e8ae95322b0..9e85bf57cac 100644
--- a/charts/incubator/tar1090/questions.yaml
+++ b/charts/incubator/tar1090/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/tasmoadmin/questions.yaml b/charts/incubator/tasmoadmin/questions.yaml
index 20c06d38426..d925d53535d 100644
--- a/charts/incubator/tasmoadmin/questions.yaml
+++ b/charts/incubator/tasmoadmin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/tasmobackup/questions.yaml b/charts/incubator/tasmobackup/questions.yaml
index b4c11f608ed..5a1040e2da1 100644
--- a/charts/incubator/tasmobackup/questions.yaml
+++ b/charts/incubator/tasmobackup/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/tasmocompiler/questions.yaml b/charts/incubator/tasmocompiler/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/tasmocompiler/questions.yaml
+++ b/charts/incubator/tasmocompiler/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/technitium/questions.yaml b/charts/incubator/technitium/questions.yaml
index 8686461a327..67427b3b250 100644
--- a/charts/incubator/technitium/questions.yaml
+++ b/charts/incubator/technitium/questions.yaml
@@ -15,6 +15,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/teedy-docs/questions.yaml b/charts/incubator/teedy-docs/questions.yaml
index afba7a3ea7f..cd9398f72e4 100644
--- a/charts/incubator/teedy-docs/questions.yaml
+++ b/charts/incubator/teedy-docs/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/telethon-downloader/questions.yaml b/charts/incubator/telethon-downloader/questions.yaml
index 911957f62b9..07731ffd850 100644
--- a/charts/incubator/telethon-downloader/questions.yaml
+++ b/charts/incubator/telethon-downloader/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/terraria-tshock/questions.yaml b/charts/incubator/terraria-tshock/questions.yaml
index d405d7cfb92..97a8e0181d5 100644
--- a/charts/incubator/terraria-tshock/questions.yaml
+++ b/charts/incubator/terraria-tshock/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/theforest/questions.yaml b/charts/incubator/theforest/questions.yaml
index 1cf107b0997..0769447e09b 100644
--- a/charts/incubator/theforest/questions.yaml
+++ b/charts/incubator/theforest/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/thunderbird/questions.yaml b/charts/incubator/thunderbird/questions.yaml
index 432eb592467..aa964e755db 100644
--- a/charts/incubator/thunderbird/questions.yaml
+++ b/charts/incubator/thunderbird/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/timetagger/questions.yaml b/charts/incubator/timetagger/questions.yaml
index ae5b3949c7b..2ae2d8c82ac 100644
--- a/charts/incubator/timetagger/questions.yaml
+++ b/charts/incubator/timetagger/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/incubator/tonido/questions.yaml b/charts/incubator/tonido/questions.yaml
index eb553b6c98c..5bb7503890b 100644
--- a/charts/incubator/tonido/questions.yaml
+++ b/charts/incubator/tonido/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/tracks/questions.yaml b/charts/incubator/tracks/questions.yaml
index a743301dd06..dc763391707 100644
--- a/charts/incubator/tracks/questions.yaml
+++ b/charts/incubator/tracks/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/traktarr/questions.yaml b/charts/incubator/traktarr/questions.yaml
index 08b29fffe12..285dc7384fd 100644
--- a/charts/incubator/traktarr/questions.yaml
+++ b/charts/incubator/traktarr/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/trango/questions.yaml b/charts/incubator/trango/questions.yaml
index 956f0c2c97e..ce03b487435 100644
--- a/charts/incubator/trango/questions.yaml
+++ b/charts/incubator/trango/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/trilium/questions.yaml b/charts/incubator/trilium/questions.yaml
index 4f501c01df0..7ce7f046272 100644
--- a/charts/incubator/trilium/questions.yaml
+++ b/charts/incubator/trilium/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/troddit/questions.yaml b/charts/incubator/troddit/questions.yaml
index c136882dee3..b21898ca737 100644
--- a/charts/incubator/troddit/questions.yaml
+++ b/charts/incubator/troddit/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/ts-dnsserver/questions.yaml b/charts/incubator/ts-dnsserver/questions.yaml
index e351761a91f..875d97e9555 100644
--- a/charts/incubator/ts-dnsserver/questions.yaml
+++ b/charts/incubator/ts-dnsserver/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/ts3-manager/questions.yaml b/charts/incubator/ts3-manager/questions.yaml
index 78d15abbbde..c2328161e42 100644
--- a/charts/incubator/ts3-manager/questions.yaml
+++ b/charts/incubator/ts3-manager/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/tubearchivist-es/questions.yaml b/charts/incubator/tubearchivist-es/questions.yaml
index 27c9455fdfb..5b90e791e2b 100644
--- a/charts/incubator/tubearchivist-es/questions.yaml
+++ b/charts/incubator/tubearchivist-es/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/tubearchivist-redisjson/questions.yaml b/charts/incubator/tubearchivist-redisjson/questions.yaml
index c27471653c6..e57d31168f9 100644
--- a/charts/incubator/tubearchivist-redisjson/questions.yaml
+++ b/charts/incubator/tubearchivist-redisjson/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/tubesync/questions.yaml b/charts/incubator/tubesync/questions.yaml
index 9b2e6597d3f..4ddef846ff2 100644
--- a/charts/incubator/tubesync/questions.yaml
+++ b/charts/incubator/tubesync/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/tvhproxy/questions.yaml b/charts/incubator/tvhproxy/questions.yaml
index 8fd2b04a456..71380494630 100644
--- a/charts/incubator/tvhproxy/questions.yaml
+++ b/charts/incubator/tvhproxy/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/twonky-server/questions.yaml b/charts/incubator/twonky-server/questions.yaml
index 80ec71c9ef5..6c14e6feedc 100644
--- a/charts/incubator/twonky-server/questions.yaml
+++ b/charts/incubator/twonky-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/ubuntu-xrdp/questions.yaml b/charts/incubator/ubuntu-xrdp/questions.yaml
index 09529c2e40e..98d961dcd4d 100644
--- a/charts/incubator/ubuntu-xrdp/questions.yaml
+++ b/charts/incubator/ubuntu-xrdp/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/ungoogled-chromium/questions.yaml b/charts/incubator/ungoogled-chromium/questions.yaml
index b3ec1efa9f9..b6e457a4e14 100644
--- a/charts/incubator/ungoogled-chromium/questions.yaml
+++ b/charts/incubator/ungoogled-chromium/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/universal-media-server/questions.yaml b/charts/incubator/universal-media-server/questions.yaml
index cff031f488f..bca199a2510 100644
--- a/charts/incubator/universal-media-server/questions.yaml
+++ b/charts/incubator/universal-media-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/unturned/questions.yaml b/charts/incubator/unturned/questions.yaml
index b70d85d2ce9..190a31d5c9c 100644
--- a/charts/incubator/unturned/questions.yaml
+++ b/charts/incubator/unturned/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/urban-terror/questions.yaml b/charts/incubator/urban-terror/questions.yaml
index 4901176b880..3843eefb468 100644
--- a/charts/incubator/urban-terror/questions.yaml
+++ b/charts/incubator/urban-terror/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/v-rising/questions.yaml b/charts/incubator/v-rising/questions.yaml
index 1157baaa824..df712317d07 100644
--- a/charts/incubator/v-rising/questions.yaml
+++ b/charts/incubator/v-rising/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/valetudo-mapper/questions.yaml b/charts/incubator/valetudo-mapper/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/valetudo-mapper/questions.yaml
+++ b/charts/incubator/valetudo-mapper/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/vaulthunters/questions.yaml b/charts/incubator/vaulthunters/questions.yaml
index 78428d4ffa4..88911aff269 100644
--- a/charts/incubator/vaulthunters/questions.yaml
+++ b/charts/incubator/vaulthunters/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/venstar2mqtt/questions.yaml b/charts/incubator/venstar2mqtt/questions.yaml
index b08a4fbb341..1781fda7ae9 100644
--- a/charts/incubator/venstar2mqtt/questions.yaml
+++ b/charts/incubator/venstar2mqtt/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/vertex/questions.yaml b/charts/incubator/vertex/questions.yaml
index 476cd81ef36..34e93650e84 100644
--- a/charts/incubator/vertex/questions.yaml
+++ b/charts/incubator/vertex/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/vintage-story/questions.yaml b/charts/incubator/vintage-story/questions.yaml
index 984ef425497..eed623d6d42 100644
--- a/charts/incubator/vintage-story/questions.yaml
+++ b/charts/incubator/vintage-story/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/virt-manager/questions.yaml b/charts/incubator/virt-manager/questions.yaml
index d2db706afbe..732f1bcf3ad 100644
--- a/charts/incubator/virt-manager/questions.yaml
+++ b/charts/incubator/virt-manager/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/vlmcsd-kms-server/questions.yaml b/charts/incubator/vlmcsd-kms-server/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/vlmcsd-kms-server/questions.yaml
+++ b/charts/incubator/vlmcsd-kms-server/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/vorta/questions.yaml b/charts/incubator/vorta/questions.yaml
index 0d6b5336fdb..9661e0eeb51 100644
--- a/charts/incubator/vorta/questions.yaml
+++ b/charts/incubator/vorta/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/webp-server/questions.yaml b/charts/incubator/webp-server/questions.yaml
index 5688fe57c59..0adc48eea89 100644
--- a/charts/incubator/webp-server/questions.yaml
+++ b/charts/incubator/webp-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/webtop/questions.yaml b/charts/incubator/webtop/questions.yaml
index bb959830f01..7587f70f02f 100644
--- a/charts/incubator/webtop/questions.yaml
+++ b/charts/incubator/webtop/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/wger/questions.yaml b/charts/incubator/wger/questions.yaml
index e1e0197fa37..84345259f31 100644
--- a/charts/incubator/wger/questions.yaml
+++ b/charts/incubator/wger/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: wger
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/whisparr/questions.yaml b/charts/incubator/whisparr/questions.yaml
index 5e32083836b..f3f4ad18d35 100644
--- a/charts/incubator/whisparr/questions.yaml
+++ b/charts/incubator/whisparr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/wifi-card/questions.yaml b/charts/incubator/wifi-card/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/wifi-card/questions.yaml
+++ b/charts/incubator/wifi-card/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/wordle/questions.yaml b/charts/incubator/wordle/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/wordle/questions.yaml
+++ b/charts/incubator/wordle/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/xmrig/questions.yaml b/charts/incubator/xmrig/questions.yaml
index 3077eefa7ba..45158c5baa4 100644
--- a/charts/incubator/xmrig/questions.yaml
+++ b/charts/incubator/xmrig/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/xonotic/questions.yaml b/charts/incubator/xonotic/questions.yaml
index 2c704ad8f4d..c2b0541343b 100644
--- a/charts/incubator/xonotic/questions.yaml
+++ b/charts/incubator/xonotic/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/xware/questions.yaml b/charts/incubator/xware/questions.yaml
index fbd27e97fcb..e2ab9cf4edb 100644
--- a/charts/incubator/xware/questions.yaml
+++ b/charts/incubator/xware/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/incubator/yacht/questions.yaml b/charts/incubator/yacht/questions.yaml
index 6676b8f9b77..f8623e0f10a 100644
--- a/charts/incubator/yacht/questions.yaml
+++ b/charts/incubator/yacht/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/yacreaderlibraryserver/questions.yaml b/charts/incubator/yacreaderlibraryserver/questions.yaml
index 9f9fd689c09..23436bf87c3 100644
--- a/charts/incubator/yacreaderlibraryserver/questions.yaml
+++ b/charts/incubator/yacreaderlibraryserver/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/yacy/questions.yaml b/charts/incubator/yacy/questions.yaml
index f1672117295..a83da83b4cb 100644
--- a/charts/incubator/yacy/questions.yaml
+++ b/charts/incubator/yacy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/yourls/questions.yaml b/charts/incubator/yourls/questions.yaml
index 37405f95f67..3ea6513f1ed 100644
--- a/charts/incubator/yourls/questions.yaml
+++ b/charts/incubator/yourls/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/youtransfer/questions.yaml b/charts/incubator/youtransfer/questions.yaml
index eb7cbcdf211..75152cc6e20 100644
--- a/charts/incubator/youtransfer/questions.yaml
+++ b/charts/incubator/youtransfer/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/youtubedl-material/questions.yaml b/charts/incubator/youtubedl-material/questions.yaml
index 49b982b9da4..798809f46b5 100644
--- a/charts/incubator/youtubedl-material/questions.yaml
+++ b/charts/incubator/youtubedl-material/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/z80pack/questions.yaml b/charts/incubator/z80pack/questions.yaml
index ca12561a27f..56a9aa7135c 100644
--- a/charts/incubator/z80pack/questions.yaml
+++ b/charts/incubator/z80pack/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/zabbix-server/questions.yaml b/charts/incubator/zabbix-server/questions.yaml
index d75199e0af6..f15ed2f35d2 100644
--- a/charts/incubator/zabbix-server/questions.yaml
+++ b/charts/incubator/zabbix-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/incubator/zoneminder/questions.yaml b/charts/incubator/zoneminder/questions.yaml
index acb91d1ad2f..560b8cb55e3 100644
--- a/charts/incubator/zoneminder/questions.yaml
+++ b/charts/incubator/zoneminder/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/zusam/questions.yaml b/charts/incubator/zusam/questions.yaml
index 6f19b049b70..5fcd2bae71d 100644
--- a/charts/incubator/zusam/questions.yaml
+++ b/charts/incubator/zusam/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/airdcpp-webclient/questions.yaml b/charts/stable/airdcpp-webclient/questions.yaml
index 323682ee91f..04e0bf10250 100644
--- a/charts/stable/airdcpp-webclient/questions.yaml
+++ b/charts/stable/airdcpp-webclient/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/airsonic-advanced/questions.yaml b/charts/stable/airsonic-advanced/questions.yaml
index f47ee13654e..93132b2be5b 100644
--- a/charts/stable/airsonic-advanced/questions.yaml
+++ b/charts/stable/airsonic-advanced/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/airsonic/questions.yaml b/charts/stable/airsonic/questions.yaml
index d1adb099b2f..cdce9e73f5e 100644
--- a/charts/stable/airsonic/questions.yaml
+++ b/charts/stable/airsonic/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/alist/questions.yaml b/charts/stable/alist/questions.yaml
index 3c2e59b47cd..10d04e915bb 100644
--- a/charts/stable/alist/questions.yaml
+++ b/charts/stable/alist/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/amcrest2mqtt/questions.yaml b/charts/stable/amcrest2mqtt/questions.yaml
index 064d4cdd18b..6950a6d0258 100644
--- a/charts/stable/amcrest2mqtt/questions.yaml
+++ b/charts/stable/amcrest2mqtt/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/anonaddy/questions.yaml b/charts/stable/anonaddy/questions.yaml
index d4168929ac4..335ac069a93 100644
--- a/charts/stable/anonaddy/questions.yaml
+++ b/charts/stable/anonaddy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/apache-musicindex/questions.yaml b/charts/stable/apache-musicindex/questions.yaml
index 30a7b47910e..2f3916199b4 100644
--- a/charts/stable/apache-musicindex/questions.yaml
+++ b/charts/stable/apache-musicindex/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/appdaemon/questions.yaml b/charts/stable/appdaemon/questions.yaml
index cd2d2c629e8..234529ce278 100644
--- a/charts/stable/appdaemon/questions.yaml
+++ b/charts/stable/appdaemon/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/aria2/questions.yaml b/charts/stable/aria2/questions.yaml
index 3d85101f8ab..9d54b7890d4 100644
--- a/charts/stable/aria2/questions.yaml
+++ b/charts/stable/aria2/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/audacity/questions.yaml b/charts/stable/audacity/questions.yaml
index e919cd960b2..45c74aa7171 100644
--- a/charts/stable/audacity/questions.yaml
+++ b/charts/stable/audacity/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/audiobookshelf/questions.yaml b/charts/stable/audiobookshelf/questions.yaml
index cc1961103f9..fddb9fa7c38 100644
--- a/charts/stable/audiobookshelf/questions.yaml
+++ b/charts/stable/audiobookshelf/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/authelia/questions.yaml b/charts/stable/authelia/questions.yaml
index 51368dcf13b..6bee4cf4789 100644
--- a/charts/stable/authelia/questions.yaml
+++ b/charts/stable/authelia/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: domain
     group: "App Configuration"
diff --git a/charts/stable/automatic-music-downloader/questions.yaml b/charts/stable/automatic-music-downloader/questions.yaml
index 5a7002ec1c6..41ea8260c60 100644
--- a/charts/stable/automatic-music-downloader/questions.yaml
+++ b/charts/stable/automatic-music-downloader/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/avidemux/questions.yaml b/charts/stable/avidemux/questions.yaml
index 391a6606dfe..5a0ecc732a0 100644
--- a/charts/stable/avidemux/questions.yaml
+++ b/charts/stable/avidemux/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/babybuddy/questions.yaml b/charts/stable/babybuddy/questions.yaml
index f45f8a764c5..8fc425d09b9 100644
--- a/charts/stable/babybuddy/questions.yaml
+++ b/charts/stable/babybuddy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/baserow/questions.yaml b/charts/stable/baserow/questions.yaml
index 9478668ef0a..6423e25ae2a 100644
--- a/charts/stable/baserow/questions.yaml
+++ b/charts/stable/baserow/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/bazarr/questions.yaml b/charts/stable/bazarr/questions.yaml
index 716a793a01a..d4ac649c74e 100644
--- a/charts/stable/bazarr/questions.yaml
+++ b/charts/stable/bazarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/beets/questions.yaml b/charts/stable/beets/questions.yaml
index 9711cb6e341..0a8eb32bbcb 100644
--- a/charts/stable/beets/questions.yaml
+++ b/charts/stable/beets/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/blog/questions.yaml b/charts/stable/blog/questions.yaml
index f5f13dc16d3..92830178c41 100644
--- a/charts/stable/blog/questions.yaml
+++ b/charts/stable/blog/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/boinc/questions.yaml b/charts/stable/boinc/questions.yaml
index 0fb2cfc6e74..da6e0b30173 100644
--- a/charts/stable/boinc/questions.yaml
+++ b/charts/stable/boinc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/booksonic-air/questions.yaml b/charts/stable/booksonic-air/questions.yaml
index eae46ce8a3c..db104b63dad 100644
--- a/charts/stable/booksonic-air/questions.yaml
+++ b/charts/stable/booksonic-air/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/bookstack/questions.yaml b/charts/stable/bookstack/questions.yaml
index 97ec777a51c..a2fab7c0c23 100644
--- a/charts/stable/bookstack/questions.yaml
+++ b/charts/stable/bookstack/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/browserless-chrome/questions.yaml b/charts/stable/browserless-chrome/questions.yaml
index e46a7a6eaf3..00b5aeca926 100644
--- a/charts/stable/browserless-chrome/questions.yaml
+++ b/charts/stable/browserless-chrome/questions.yaml
@@ -25,6 +25,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/budge/questions.yaml b/charts/stable/budge/questions.yaml
index eb81fb1adc8..6946948b87a 100644
--- a/charts/stable/budge/questions.yaml
+++ b/charts/stable/budge/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
 # Include{containerConfig}
 # Include{serviceRoot}
diff --git a/charts/stable/calibre-web/questions.yaml b/charts/stable/calibre-web/questions.yaml
index 64f55b36849..6a85c8b3750 100644
--- a/charts/stable/calibre-web/questions.yaml
+++ b/charts/stable/calibre-web/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/calibre/questions.yaml b/charts/stable/calibre/questions.yaml
index e5dcfe1a879..9117edf8813 100644
--- a/charts/stable/calibre/questions.yaml
+++ b/charts/stable/calibre/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/chevereto/questions.yaml b/charts/stable/chevereto/questions.yaml
index a1abfcf452a..9804220fae5 100644
--- a/charts/stable/chevereto/questions.yaml
+++ b/charts/stable/chevereto/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: chevereto
     group: "Container Configuration"
     label: "Chevereto Configuration"
diff --git a/charts/stable/clamav/questions.yaml b/charts/stable/clamav/questions.yaml
index 2c826e1471a..4481214521c 100644
--- a/charts/stable/clamav/questions.yaml
+++ b/charts/stable/clamav/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/clarkson/questions.yaml b/charts/stable/clarkson/questions.yaml
index 5ca01243d17..150d1a68a0a 100644
--- a/charts/stable/clarkson/questions.yaml
+++ b/charts/stable/clarkson/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/cloud9/questions.yaml b/charts/stable/cloud9/questions.yaml
index 0529242bdd8..442bda03184 100644
--- a/charts/stable/cloud9/questions.yaml
+++ b/charts/stable/cloud9/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/cloudflared/questions.yaml b/charts/stable/cloudflared/questions.yaml
index 1f0eb63bcff..4e75c63a08f 100644
--- a/charts/stable/cloudflared/questions.yaml
+++ b/charts/stable/cloudflared/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/cloudflareddns/questions.yaml b/charts/stable/cloudflareddns/questions.yaml
index 436bc2c17bf..537b2539b87 100644
--- a/charts/stable/cloudflareddns/questions.yaml
+++ b/charts/stable/cloudflareddns/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/code-server/questions.yaml b/charts/stable/code-server/questions.yaml
index a7ed13433aa..4689f16014d 100644
--- a/charts/stable/code-server/questions.yaml
+++ b/charts/stable/code-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/commento-plusplus/questions.yaml b/charts/stable/commento-plusplus/questions.yaml
index 2ca6a55c247..4b299279249 100644
--- a/charts/stable/commento-plusplus/questions.yaml
+++ b/charts/stable/commento-plusplus/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/couchpotato/questions.yaml b/charts/stable/couchpotato/questions.yaml
index be9fbd6f1d9..a2fbb2cbf74 100644
--- a/charts/stable/couchpotato/questions.yaml
+++ b/charts/stable/couchpotato/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/cryptofolio/questions.yaml b/charts/stable/cryptofolio/questions.yaml
index 141a71fce10..968176b98e6 100644
--- a/charts/stable/cryptofolio/questions.yaml
+++ b/charts/stable/cryptofolio/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/custom-app/questions.yaml b/charts/stable/custom-app/questions.yaml
index cfae79db1ce..92f24d0b7c0 100644
--- a/charts/stable/custom-app/questions.yaml
+++ b/charts/stable/custom-app/questions.yaml
@@ -43,6 +43,7 @@ questions:
 # Include{recreate}
 # Include{controllerExpert}
 # Include{controllerExpertCommand}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: probes
     group: "Container Configuration"
diff --git a/charts/stable/cyberchef/questions.yaml b/charts/stable/cyberchef/questions.yaml
index ae461bae834..d189b9e7c6b 100644
--- a/charts/stable/cyberchef/questions.yaml
+++ b/charts/stable/cyberchef/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/czkawka/questions.yaml b/charts/stable/czkawka/questions.yaml
index cd0a7c339bb..465f43232f2 100644
--- a/charts/stable/czkawka/questions.yaml
+++ b/charts/stable/czkawka/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/darktable/questions.yaml b/charts/stable/darktable/questions.yaml
index 85a4a349988..cca2e279907 100644
--- a/charts/stable/darktable/questions.yaml
+++ b/charts/stable/darktable/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/dashdot/questions.yaml b/charts/stable/dashdot/questions.yaml
index 4c5d891e4c7..5c86683da86 100644
--- a/charts/stable/dashdot/questions.yaml
+++ b/charts/stable/dashdot/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/davos/questions.yaml b/charts/stable/davos/questions.yaml
index 74d08768756..998ef8af88f 100644
--- a/charts/stable/davos/questions.yaml
+++ b/charts/stable/davos/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/ddclient/questions.yaml b/charts/stable/ddclient/questions.yaml
index b5255b613a1..606244d6cfa 100644
--- a/charts/stable/ddclient/questions.yaml
+++ b/charts/stable/ddclient/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceExpertRoot}
             default: false
diff --git a/charts/stable/ddns-go/questions.yaml b/charts/stable/ddns-go/questions.yaml
index 61f7a24969c..08db9c7d885 100644
--- a/charts/stable/ddns-go/questions.yaml
+++ b/charts/stable/ddns-go/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/ddns-updater/questions.yaml b/charts/stable/ddns-updater/questions.yaml
index 38ac7a66720..a90220075df 100644
--- a/charts/stable/ddns-updater/questions.yaml
+++ b/charts/stable/ddns-updater/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/deconz/questions.yaml b/charts/stable/deconz/questions.yaml
index cb28400342f..29d9c7f5b9c 100644
--- a/charts/stable/deconz/questions.yaml
+++ b/charts/stable/deconz/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/deemix/questions.yaml b/charts/stable/deemix/questions.yaml
index 8862972ff00..2597dfbf640 100644
--- a/charts/stable/deemix/questions.yaml
+++ b/charts/stable/deemix/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/deepstack/questions.yaml b/charts/stable/deepstack/questions.yaml
index 057c2a4dec7..f22c5bd0350 100644
--- a/charts/stable/deepstack/questions.yaml
+++ b/charts/stable/deepstack/questions.yaml
@@ -23,6 +23,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/deluge/questions.yaml b/charts/stable/deluge/questions.yaml
index c536bb74291..082de33651d 100644
--- a/charts/stable/deluge/questions.yaml
+++ b/charts/stable/deluge/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/digikam/questions.yaml b/charts/stable/digikam/questions.yaml
index 1aebb310693..a99066eaa45 100644
--- a/charts/stable/digikam/questions.yaml
+++ b/charts/stable/digikam/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/dillinger/questions.yaml b/charts/stable/dillinger/questions.yaml
index 382d4e2d40f..0bc3313620f 100644
--- a/charts/stable/dillinger/questions.yaml
+++ b/charts/stable/dillinger/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/dizquetv/questions.yaml b/charts/stable/dizquetv/questions.yaml
index 1d51236f578..ec3e8211cb9 100644
--- a/charts/stable/dizquetv/questions.yaml
+++ b/charts/stable/dizquetv/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/docker-compose/questions.yaml b/charts/stable/docker-compose/questions.yaml
index f67f6fbb874..451f1aca3bb 100644
--- a/charts/stable/docker-compose/questions.yaml
+++ b/charts/stable/docker-compose/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/dokuwiki/questions.yaml b/charts/stable/dokuwiki/questions.yaml
index 83c135a7cd8..e55e679ef89 100644
--- a/charts/stable/dokuwiki/questions.yaml
+++ b/charts/stable/dokuwiki/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/domoticz/questions.yaml b/charts/stable/domoticz/questions.yaml
index d8f7c803c62..6fb60b74931 100644
--- a/charts/stable/domoticz/questions.yaml
+++ b/charts/stable/domoticz/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/doplarr/questions.yaml b/charts/stable/doplarr/questions.yaml
index ee6aaa3c01a..73d1762d988 100644
--- a/charts/stable/doplarr/questions.yaml
+++ b/charts/stable/doplarr/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/double-take/questions.yaml b/charts/stable/double-take/questions.yaml
index d6d82ae232a..2af8c528ef1 100644
--- a/charts/stable/double-take/questions.yaml
+++ b/charts/stable/double-take/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/doublecommander/questions.yaml b/charts/stable/doublecommander/questions.yaml
index 9c7905426ea..4444552dacd 100644
--- a/charts/stable/doublecommander/questions.yaml
+++ b/charts/stable/doublecommander/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/drawio/questions.yaml b/charts/stable/drawio/questions.yaml
index e7c040c2439..0c3a9d97328 100644
--- a/charts/stable/drawio/questions.yaml
+++ b/charts/stable/drawio/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/dsmr-reader/questions.yaml b/charts/stable/dsmr-reader/questions.yaml
index 25eb92c851e..21eff9bd98d 100644
--- a/charts/stable/dsmr-reader/questions.yaml
+++ b/charts/stable/dsmr-reader/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/duckdns/questions.yaml b/charts/stable/duckdns/questions.yaml
index 6dae0aef83e..a7f2d4df8eb 100644
--- a/charts/stable/duckdns/questions.yaml
+++ b/charts/stable/duckdns/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/dupeguru/questions.yaml b/charts/stable/dupeguru/questions.yaml
index 23d6ec5c8ce..351a7c44c8b 100644
--- a/charts/stable/dupeguru/questions.yaml
+++ b/charts/stable/dupeguru/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/duplicati/questions.yaml b/charts/stable/duplicati/questions.yaml
index 57a8a22cca5..7fd452a8ef5 100644
--- a/charts/stable/duplicati/questions.yaml
+++ b/charts/stable/duplicati/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/emby/questions.yaml b/charts/stable/emby/questions.yaml
index ef40209d0f1..8e0e87725bd 100644
--- a/charts/stable/emby/questions.yaml
+++ b/charts/stable/emby/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/embystat/questions.yaml b/charts/stable/embystat/questions.yaml
index 72af8395db7..0a30a886484 100644
--- a/charts/stable/embystat/questions.yaml
+++ b/charts/stable/embystat/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/emulatorjs/questions.yaml b/charts/stable/emulatorjs/questions.yaml
index 2c25bf727d0..1ac3443dac6 100644
--- a/charts/stable/emulatorjs/questions.yaml
+++ b/charts/stable/emulatorjs/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/endlessh/questions.yaml b/charts/stable/endlessh/questions.yaml
index 8cf27db57c4..f9945bf85ce 100644
--- a/charts/stable/endlessh/questions.yaml
+++ b/charts/stable/endlessh/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/esphome/questions.yaml b/charts/stable/esphome/questions.yaml
index b2d4d8e4317..c8f17ccf0b5 100644
--- a/charts/stable/esphome/questions.yaml
+++ b/charts/stable/esphome/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/etherpad/questions.yaml b/charts/stable/etherpad/questions.yaml
index 6dc05ab734d..f147ed5635f 100644
--- a/charts/stable/etherpad/questions.yaml
+++ b/charts/stable/etherpad/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/ferdi-server/questions.yaml b/charts/stable/ferdi-server/questions.yaml
index 11960d3376a..6f9763d9295 100644
--- a/charts/stable/ferdi-server/questions.yaml
+++ b/charts/stable/ferdi-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/filebot/questions.yaml b/charts/stable/filebot/questions.yaml
index 0205eeaf9b6..ed97518bbd9 100644
--- a/charts/stable/filebot/questions.yaml
+++ b/charts/stable/filebot/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/filebrowser/questions.yaml b/charts/stable/filebrowser/questions.yaml
index d2a075b7952..802c2e808d1 100644
--- a/charts/stable/filebrowser/questions.yaml
+++ b/charts/stable/filebrowser/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/fileflows/questions.yaml b/charts/stable/fileflows/questions.yaml
index 985a5a7cac4..cce772319b0 100644
--- a/charts/stable/fileflows/questions.yaml
+++ b/charts/stable/fileflows/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
 # Include{containerConfig}
 # Include{serviceRoot}
diff --git a/charts/stable/filezilla/questions.yaml b/charts/stable/filezilla/questions.yaml
index ea2cc0b54d8..dc6cb13da8e 100644
--- a/charts/stable/filezilla/questions.yaml
+++ b/charts/stable/filezilla/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/fireflyiii/questions.yaml b/charts/stable/fireflyiii/questions.yaml
index 3679b00fb04..66ff1562229 100644
--- a/charts/stable/fireflyiii/questions.yaml
+++ b/charts/stable/fireflyiii/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/firefox-syncserver/questions.yaml b/charts/stable/firefox-syncserver/questions.yaml
index bb965b5f64d..7265a8174ed 100644
--- a/charts/stable/firefox-syncserver/questions.yaml
+++ b/charts/stable/firefox-syncserver/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/firefox/questions.yaml b/charts/stable/firefox/questions.yaml
index a05963f1046..c2c2fd1bbec 100644
--- a/charts/stable/firefox/questions.yaml
+++ b/charts/stable/firefox/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/flaresolverr/questions.yaml b/charts/stable/flaresolverr/questions.yaml
index 5a7738dd425..f520dcf812f 100644
--- a/charts/stable/flaresolverr/questions.yaml
+++ b/charts/stable/flaresolverr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/fleet/questions.yaml b/charts/stable/fleet/questions.yaml
index 98bcddced89..66cca555274 100644
--- a/charts/stable/fleet/questions.yaml
+++ b/charts/stable/fleet/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/flexget/questions.yaml b/charts/stable/flexget/questions.yaml
index 3b34abb213f..a11754ffa9c 100644
--- a/charts/stable/flexget/questions.yaml
+++ b/charts/stable/flexget/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/flood/questions.yaml b/charts/stable/flood/questions.yaml
index af9906c0435..6f3f29609ec 100644
--- a/charts/stable/flood/questions.yaml
+++ b/charts/stable/flood/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/fluidd/questions.yaml b/charts/stable/fluidd/questions.yaml
index da5410caebc..f87da98d0cd 100644
--- a/charts/stable/fluidd/questions.yaml
+++ b/charts/stable/fluidd/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/focalboard/questions.yaml b/charts/stable/focalboard/questions.yaml
index 3d286e9347a..b7fde370677 100644
--- a/charts/stable/focalboard/questions.yaml
+++ b/charts/stable/focalboard/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: focalboard
     group: "Container Configuration"
     label: "Focalboard Configuration"
diff --git a/charts/stable/foldingathome/questions.yaml b/charts/stable/foldingathome/questions.yaml
index fc31b867c6e..a6f22894af2 100644
--- a/charts/stable/foldingathome/questions.yaml
+++ b/charts/stable/foldingathome/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/fossil/questions.yaml b/charts/stable/fossil/questions.yaml
index 7965760737b..a519c3be87d 100644
--- a/charts/stable/fossil/questions.yaml
+++ b/charts/stable/fossil/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/freeradius/questions.yaml b/charts/stable/freeradius/questions.yaml
index f96b8a9d47f..536b37aa38c 100644
--- a/charts/stable/freeradius/questions.yaml
+++ b/charts/stable/freeradius/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/freshrss/questions.yaml b/charts/stable/freshrss/questions.yaml
index 9378bb0542e..a2a5f0fc133 100644
--- a/charts/stable/freshrss/questions.yaml
+++ b/charts/stable/freshrss/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/friendica/questions.yaml b/charts/stable/friendica/questions.yaml
index edeeabbbf6f..017dbfef6e7 100644
--- a/charts/stable/friendica/questions.yaml
+++ b/charts/stable/friendica/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/gaps/questions.yaml b/charts/stable/gaps/questions.yaml
index 8054f84dece..c8d9522c483 100644
--- a/charts/stable/gaps/questions.yaml
+++ b/charts/stable/gaps/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/gitea/questions.yaml b/charts/stable/gitea/questions.yaml
index 60aa24423ad..65fec6627c6 100644
--- a/charts/stable/gitea/questions.yaml
+++ b/charts/stable/gitea/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: admin
     group: "App Configuration"
diff --git a/charts/stable/golinks/questions.yaml b/charts/stable/golinks/questions.yaml
index 562c7b39c2c..8aa76a4cdba 100644
--- a/charts/stable/golinks/questions.yaml
+++ b/charts/stable/golinks/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/gonic/questions.yaml b/charts/stable/gonic/questions.yaml
index a42ec603807..868a008cf19 100644
--- a/charts/stable/gonic/questions.yaml
+++ b/charts/stable/gonic/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/gotify/questions.yaml b/charts/stable/gotify/questions.yaml
index d65beab714a..15cf6321588 100644
--- a/charts/stable/gotify/questions.yaml
+++ b/charts/stable/gotify/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/grafana/questions.yaml b/charts/stable/grafana/questions.yaml
index 56ca12c30a9..0d6d85ed239 100644
--- a/charts/stable/grafana/questions.yaml
+++ b/charts/stable/grafana/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Secret Image Environment"
diff --git a/charts/stable/grav/questions.yaml b/charts/stable/grav/questions.yaml
index 3cc4220419c..3a11ac0bbc6 100644
--- a/charts/stable/grav/questions.yaml
+++ b/charts/stable/grav/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/grist/questions.yaml b/charts/stable/grist/questions.yaml
index 09bfa75e339..eef05542288 100644
--- a/charts/stable/grist/questions.yaml
+++ b/charts/stable/grist/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/grocy/questions.yaml b/charts/stable/grocy/questions.yaml
index 7bf9b840dbf..d0942da623c 100644
--- a/charts/stable/grocy/questions.yaml
+++ b/charts/stable/grocy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/guacamole-client/questions.yaml b/charts/stable/guacamole-client/questions.yaml
index e2692fabd28..13f2faacada 100644
--- a/charts/stable/guacamole-client/questions.yaml
+++ b/charts/stable/guacamole-client/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/guacd/questions.yaml b/charts/stable/guacd/questions.yaml
index 9a1219e4184..74407dc83fb 100644
--- a/charts/stable/guacd/questions.yaml
+++ b/charts/stable/guacd/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/habridge/questions.yaml b/charts/stable/habridge/questions.yaml
index 439bbec8238..f99a47329ca 100644
--- a/charts/stable/habridge/questions.yaml
+++ b/charts/stable/habridge/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/hammond/questions.yaml b/charts/stable/hammond/questions.yaml
index 35e635e9868..a630c9492dd 100644
--- a/charts/stable/hammond/questions.yaml
+++ b/charts/stable/hammond/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/handbrake/questions.yaml b/charts/stable/handbrake/questions.yaml
index 673ebe20e91..022fac45902 100644
--- a/charts/stable/handbrake/questions.yaml
+++ b/charts/stable/handbrake/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/haste-server/questions.yaml b/charts/stable/haste-server/questions.yaml
index 72a915472cb..661046410e8 100644
--- a/charts/stable/haste-server/questions.yaml
+++ b/charts/stable/haste-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
   - variable: env
     group: "Container Configuration"
diff --git a/charts/stable/headphones/questions.yaml b/charts/stable/headphones/questions.yaml
index 9c2eafa75f0..b064cfdce70 100644
--- a/charts/stable/headphones/questions.yaml
+++ b/charts/stable/headphones/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/healthchecks/questions.yaml b/charts/stable/healthchecks/questions.yaml
index af6ffb6271e..7e317ea48bd 100644
--- a/charts/stable/healthchecks/questions.yaml
+++ b/charts/stable/healthchecks/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/hedgedoc/questions.yaml b/charts/stable/hedgedoc/questions.yaml
index 563ba185c1b..a6d4bffc67f 100644
--- a/charts/stable/hedgedoc/questions.yaml
+++ b/charts/stable/hedgedoc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/heimdall/questions.yaml b/charts/stable/heimdall/questions.yaml
index 7bddf4e754a..11e07e86c50 100644
--- a/charts/stable/heimdall/questions.yaml
+++ b/charts/stable/heimdall/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/homarr/questions.yaml b/charts/stable/homarr/questions.yaml
index 1c2ff7eb09a..0532f9d4f7f 100644
--- a/charts/stable/homarr/questions.yaml
+++ b/charts/stable/homarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/home-assistant/questions.yaml b/charts/stable/home-assistant/questions.yaml
index 3eb0e917e44..e3151cd172a 100644
--- a/charts/stable/home-assistant/questions.yaml
+++ b/charts/stable/home-assistant/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/homer/questions.yaml b/charts/stable/homer/questions.yaml
index a95ebe9c11c..666abe84f5f 100644
--- a/charts/stable/homer/questions.yaml
+++ b/charts/stable/homer/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/htpcmanager/questions.yaml b/charts/stable/htpcmanager/questions.yaml
index 94e79b2e889..7f8e00077b4 100644
--- a/charts/stable/htpcmanager/questions.yaml
+++ b/charts/stable/htpcmanager/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/hyperion-ng/questions.yaml b/charts/stable/hyperion-ng/questions.yaml
index 6003ea5e60c..ba8f1711ef6 100644
--- a/charts/stable/hyperion-ng/questions.yaml
+++ b/charts/stable/hyperion-ng/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/icantbelieveitsnotvaletudo/questions.yaml b/charts/stable/icantbelieveitsnotvaletudo/questions.yaml
index 11594e206a9..f472f0c5830 100644
--- a/charts/stable/icantbelieveitsnotvaletudo/questions.yaml
+++ b/charts/stable/icantbelieveitsnotvaletudo/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: config
     group: "Container Configuration"
     label: "Configuration"
diff --git a/charts/stable/icinga2/questions.yaml b/charts/stable/icinga2/questions.yaml
index 1430c8f7413..44aed6361e3 100644
--- a/charts/stable/icinga2/questions.yaml
+++ b/charts/stable/icinga2/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/impostor-server/questions.yaml b/charts/stable/impostor-server/questions.yaml
index ad903f33134..6ac58fa7cbb 100644
--- a/charts/stable/impostor-server/questions.yaml
+++ b/charts/stable/impostor-server/questions.yaml
@@ -22,6 +22,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/inventree/questions.yaml b/charts/stable/inventree/questions.yaml
index 2ef8c747df6..21eb1e63bbd 100644
--- a/charts/stable/inventree/questions.yaml
+++ b/charts/stable/inventree/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/ipfs/questions.yaml b/charts/stable/ipfs/questions.yaml
index ee3a28234a5..58599286267 100644
--- a/charts/stable/ipfs/questions.yaml
+++ b/charts/stable/ipfs/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/ispy-agent-dvr/questions.yaml b/charts/stable/ispy-agent-dvr/questions.yaml
index 394a8b267a3..3bf7f92b298 100644
--- a/charts/stable/ispy-agent-dvr/questions.yaml
+++ b/charts/stable/ispy-agent-dvr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/iyuuplus/questions.yaml b/charts/stable/iyuuplus/questions.yaml
index aa15b01a291..f799f52ab1d 100644
--- a/charts/stable/iyuuplus/questions.yaml
+++ b/charts/stable/iyuuplus/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/jackett/questions.yaml b/charts/stable/jackett/questions.yaml
index 3943ebea5f2..85444d1e20a 100644
--- a/charts/stable/jackett/questions.yaml
+++ b/charts/stable/jackett/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/jdownloader2/questions.yaml b/charts/stable/jdownloader2/questions.yaml
index 685b639c06a..53cf384da5e 100644
--- a/charts/stable/jdownloader2/questions.yaml
+++ b/charts/stable/jdownloader2/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/jellyfin/questions.yaml b/charts/stable/jellyfin/questions.yaml
index b8f8261dbb2..920880d7ace 100644
--- a/charts/stable/jellyfin/questions.yaml
+++ b/charts/stable/jellyfin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/jellyseerr/questions.yaml b/charts/stable/jellyseerr/questions.yaml
index eaa6e414aa0..2be18892307 100644
--- a/charts/stable/jellyseerr/questions.yaml
+++ b/charts/stable/jellyseerr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/joplin-server/questions.yaml b/charts/stable/joplin-server/questions.yaml
index df9b5884180..539078fb115 100644
--- a/charts/stable/joplin-server/questions.yaml
+++ b/charts/stable/joplin-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/k8s-gateway/questions.yaml b/charts/stable/k8s-gateway/questions.yaml
index 768579f67c0..dcc4d6cee31 100644
--- a/charts/stable/k8s-gateway/questions.yaml
+++ b/charts/stable/k8s-gateway/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: domains
     group: "App Configuration"
diff --git a/charts/stable/kanboard/questions.yaml b/charts/stable/kanboard/questions.yaml
index 14f66cbd14d..233030b66b4 100644
--- a/charts/stable/kanboard/questions.yaml
+++ b/charts/stable/kanboard/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/kavita/questions.yaml b/charts/stable/kavita/questions.yaml
index 769dc9d2058..28ce6bb4029 100644
--- a/charts/stable/kavita/questions.yaml
+++ b/charts/stable/kavita/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/kimai/questions.yaml b/charts/stable/kimai/questions.yaml
index 4b2ff4c0915..7c298699632 100644
--- a/charts/stable/kimai/questions.yaml
+++ b/charts/stable/kimai/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/kms/questions.yaml b/charts/stable/kms/questions.yaml
index a4f2b1bd05f..b4f0795443f 100644
--- a/charts/stable/kms/questions.yaml
+++ b/charts/stable/kms/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/kodi-headless/questions.yaml b/charts/stable/kodi-headless/questions.yaml
index 55ccb5ed8cf..a9c60387af5 100644
--- a/charts/stable/kodi-headless/questions.yaml
+++ b/charts/stable/kodi-headless/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/koel/questions.yaml b/charts/stable/koel/questions.yaml
index d48c9bc77ef..90b2a8326c5 100644
--- a/charts/stable/koel/questions.yaml
+++ b/charts/stable/koel/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/komga/questions.yaml b/charts/stable/komga/questions.yaml
index 1ae031589b8..897c31cab20 100644
--- a/charts/stable/komga/questions.yaml
+++ b/charts/stable/komga/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/kopia/questions.yaml b/charts/stable/kopia/questions.yaml
index a179b346b98..037176fe116 100644
--- a/charts/stable/kopia/questions.yaml
+++ b/charts/stable/kopia/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/kutt/questions.yaml b/charts/stable/kutt/questions.yaml
index c74f9490acb..0186fe6abf5 100644
--- a/charts/stable/kutt/questions.yaml
+++ b/charts/stable/kutt/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/lanraragi/questions.yaml b/charts/stable/lanraragi/questions.yaml
index 73f84b7d533..8ab487e4a13 100644
--- a/charts/stable/lanraragi/questions.yaml
+++ b/charts/stable/lanraragi/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/lazylibrarian/questions.yaml b/charts/stable/lazylibrarian/questions.yaml
index 018f8fe664d..aec582d33b3 100644
--- a/charts/stable/lazylibrarian/questions.yaml
+++ b/charts/stable/lazylibrarian/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/leaf2mqtt/questions.yaml b/charts/stable/leaf2mqtt/questions.yaml
index 0e156e101da..c16293ed356 100644
--- a/charts/stable/leaf2mqtt/questions.yaml
+++ b/charts/stable/leaf2mqtt/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/leantime/questions.yaml b/charts/stable/leantime/questions.yaml
index 89e7621f3bb..9bc965e676b 100644
--- a/charts/stable/leantime/questions.yaml
+++ b/charts/stable/leantime/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/libreddit/questions.yaml b/charts/stable/libreddit/questions.yaml
index fc5a49b9884..6c729d1b0a1 100644
--- a/charts/stable/libreddit/questions.yaml
+++ b/charts/stable/libreddit/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: lbreddit
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/libreoffice/questions.yaml b/charts/stable/libreoffice/questions.yaml
index c70b965a9c7..67becc5b3a8 100644
--- a/charts/stable/libreoffice/questions.yaml
+++ b/charts/stable/libreoffice/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/librephotos/questions.yaml b/charts/stable/librephotos/questions.yaml
index 3793af09cf1..80a418724bd 100644
--- a/charts/stable/librephotos/questions.yaml
+++ b/charts/stable/librephotos/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Secret Image Environment"
diff --git a/charts/stable/librespeed/questions.yaml b/charts/stable/librespeed/questions.yaml
index 8e21f45402c..fa40b411a69 100644
--- a/charts/stable/librespeed/questions.yaml
+++ b/charts/stable/librespeed/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/lidarr/questions.yaml b/charts/stable/lidarr/questions.yaml
index 837cf0e7436..43cfe55d3d0 100644
--- a/charts/stable/lidarr/questions.yaml
+++ b/charts/stable/lidarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/linkace/questions.yaml b/charts/stable/linkace/questions.yaml
index 0c8b7455672..da7921aa920 100644
--- a/charts/stable/linkace/questions.yaml
+++ b/charts/stable/linkace/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Secret Image Environment"
diff --git a/charts/stable/linkding/questions.yaml b/charts/stable/linkding/questions.yaml
index 53edfb46417..dbf5de0dfab 100644
--- a/charts/stable/linkding/questions.yaml
+++ b/charts/stable/linkding/questions.yaml
@@ -14,6 +14,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/littlelink/questions.yaml b/charts/stable/littlelink/questions.yaml
index 554917f1536..b6b6fea47e4 100644
--- a/charts/stable/littlelink/questions.yaml
+++ b/charts/stable/littlelink/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: littlelink
     label: ""
diff --git a/charts/stable/logitech-media-server/questions.yaml b/charts/stable/logitech-media-server/questions.yaml
index e610378e14d..470e3662d0b 100644
--- a/charts/stable/logitech-media-server/questions.yaml
+++ b/charts/stable/logitech-media-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/loki/questions.yaml b/charts/stable/loki/questions.yaml
index 2896b97abad..4f155887d71 100644
--- a/charts/stable/loki/questions.yaml
+++ b/charts/stable/loki/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: config
     group: "App Configuration"
diff --git a/charts/stable/lychee/questions.yaml b/charts/stable/lychee/questions.yaml
index 644b3a9f909..edd6fc108fa 100644
--- a/charts/stable/lychee/questions.yaml
+++ b/charts/stable/lychee/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Secret Image Environment"
diff --git a/charts/stable/makemkv/questions.yaml b/charts/stable/makemkv/questions.yaml
index e1dd1053004..44fba436dc4 100644
--- a/charts/stable/makemkv/questions.yaml
+++ b/charts/stable/makemkv/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/matomo/questions.yaml b/charts/stable/matomo/questions.yaml
index 3156c280261..2905070e1ce 100644
--- a/charts/stable/matomo/questions.yaml
+++ b/charts/stable/matomo/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/mattermost/questions.yaml b/charts/stable/mattermost/questions.yaml
index 734f49830da..438f8e27c0b 100644
--- a/charts/stable/mattermost/questions.yaml
+++ b/charts/stable/mattermost/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/mealie/questions.yaml b/charts/stable/mealie/questions.yaml
index 5bcc17f7687..2caa1895af0 100644
--- a/charts/stable/mealie/questions.yaml
+++ b/charts/stable/mealie/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
 # Include{containerConfig}
 # Include{serviceRoot}
diff --git a/charts/stable/mediainfo/questions.yaml b/charts/stable/mediainfo/questions.yaml
index 8b22fe280ea..9e9c3bc0af2 100644
--- a/charts/stable/mediainfo/questions.yaml
+++ b/charts/stable/mediainfo/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/medusa/questions.yaml b/charts/stable/medusa/questions.yaml
index 3e5a762d2f5..ecd7755b1c3 100644
--- a/charts/stable/medusa/questions.yaml
+++ b/charts/stable/medusa/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/meshroom/questions.yaml b/charts/stable/meshroom/questions.yaml
index 836a0da26fe..d2bae890eec 100644
--- a/charts/stable/meshroom/questions.yaml
+++ b/charts/stable/meshroom/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
 # Include{containerConfig}
 # Include{serviceRoot}
diff --git a/charts/stable/metube/questions.yaml b/charts/stable/metube/questions.yaml
index 91802390847..b3fa38e1ac5 100644
--- a/charts/stable/metube/questions.yaml
+++ b/charts/stable/metube/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/minecraft-bedrock/questions.yaml b/charts/stable/minecraft-bedrock/questions.yaml
index f6283b36c37..ce89c341b6d 100644
--- a/charts/stable/minecraft-bedrock/questions.yaml
+++ b/charts/stable/minecraft-bedrock/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/minecraft-java/questions.yaml b/charts/stable/minecraft-java/questions.yaml
index 3218ec0e800..901116bc48a 100644
--- a/charts/stable/minecraft-java/questions.yaml
+++ b/charts/stable/minecraft-java/questions.yaml
@@ -28,6 +28,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/minetest/questions.yaml b/charts/stable/minetest/questions.yaml
index eda475f857e..1ba2fd27a57 100644
--- a/charts/stable/minetest/questions.yaml
+++ b/charts/stable/minetest/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/miniflux/questions.yaml b/charts/stable/miniflux/questions.yaml
index 7a7f86bbd1c..6dc369044c5 100644
--- a/charts/stable/miniflux/questions.yaml
+++ b/charts/stable/miniflux/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/minio-console/questions.yaml b/charts/stable/minio-console/questions.yaml
index 9a0d3d91ece..1d06394f610 100644
--- a/charts/stable/minio-console/questions.yaml
+++ b/charts/stable/minio-console/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/minio/questions.yaml b/charts/stable/minio/questions.yaml
index 8d8040216fa..0b574e718fe 100644
--- a/charts/stable/minio/questions.yaml
+++ b/charts/stable/minio/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/minisatip/questions.yaml b/charts/stable/minisatip/questions.yaml
index 5fbcf532cf1..441019eb85c 100644
--- a/charts/stable/minisatip/questions.yaml
+++ b/charts/stable/minisatip/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/mkvcleaver/questions.yaml b/charts/stable/mkvcleaver/questions.yaml
index b328c73c3a5..93a765eef3b 100644
--- a/charts/stable/mkvcleaver/questions.yaml
+++ b/charts/stable/mkvcleaver/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/mkvtoolnix/questions.yaml b/charts/stable/mkvtoolnix/questions.yaml
index 2af62428ea3..a0228e4dbff 100644
--- a/charts/stable/mkvtoolnix/questions.yaml
+++ b/charts/stable/mkvtoolnix/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/ml-workspace/questions.yaml b/charts/stable/ml-workspace/questions.yaml
index 9d80615ef42..613a2464157 100644
--- a/charts/stable/ml-workspace/questions.yaml
+++ b/charts/stable/ml-workspace/questions.yaml
@@ -30,6 +30,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/monica/questions.yaml b/charts/stable/monica/questions.yaml
index ff8d20abffe..c628cb31527 100644
--- a/charts/stable/monica/questions.yaml
+++ b/charts/stable/monica/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/mosdns/questions.yaml b/charts/stable/mosdns/questions.yaml
index 896d0a9abb5..0db6f637026 100644
--- a/charts/stable/mosdns/questions.yaml
+++ b/charts/stable/mosdns/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/mosquitto/questions.yaml b/charts/stable/mosquitto/questions.yaml
index 3d2960b24a9..4c95b66b2bd 100644
--- a/charts/stable/mosquitto/questions.yaml
+++ b/charts/stable/mosquitto/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: auth
     group: "App Configuration"
     label: "Authentication"
diff --git a/charts/stable/mstream/questions.yaml b/charts/stable/mstream/questions.yaml
index e36c049d84b..0427c17a1b5 100644
--- a/charts/stable/mstream/questions.yaml
+++ b/charts/stable/mstream/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/muximux/questions.yaml b/charts/stable/muximux/questions.yaml
index 374169a0395..422cb33a377 100644
--- a/charts/stable/muximux/questions.yaml
+++ b/charts/stable/muximux/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/mylar/questions.yaml b/charts/stable/mylar/questions.yaml
index 22dd873258b..494519e1aeb 100644
--- a/charts/stable/mylar/questions.yaml
+++ b/charts/stable/mylar/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/mysql-workbench/questions.yaml b/charts/stable/mysql-workbench/questions.yaml
index 473f3b9414c..fb323c2dc44 100644
--- a/charts/stable/mysql-workbench/questions.yaml
+++ b/charts/stable/mysql-workbench/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/n8n/questions.yaml b/charts/stable/n8n/questions.yaml
index 4963b80789d..f1c2e9ceb10 100644
--- a/charts/stable/n8n/questions.yaml
+++ b/charts/stable/n8n/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: timezoneandlocale
     group: "Container Configuration"
     label: "Timezone and Localization"
diff --git a/charts/stable/nano-wallet/questions.yaml b/charts/stable/nano-wallet/questions.yaml
index 9fed6dd97c5..f66bf45e36c 100644
--- a/charts/stable/nano-wallet/questions.yaml
+++ b/charts/stable/nano-wallet/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/navidrome/questions.yaml b/charts/stable/navidrome/questions.yaml
index 642152671f8..da73582fd8b 100644
--- a/charts/stable/navidrome/questions.yaml
+++ b/charts/stable/navidrome/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/netdata/questions.yaml b/charts/stable/netdata/questions.yaml
index 11d0cffdb10..788f2ff1b2a 100644
--- a/charts/stable/netdata/questions.yaml
+++ b/charts/stable/netdata/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/nextcloud/questions.yaml b/charts/stable/nextcloud/questions.yaml
index 4b6e9410295..06098de5e5a 100644
--- a/charts/stable/nextcloud/questions.yaml
+++ b/charts/stable/nextcloud/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/nextpvr/questions.yaml b/charts/stable/nextpvr/questions.yaml
index 9cd37464d71..814f85439b1 100644
--- a/charts/stable/nextpvr/questions.yaml
+++ b/charts/stable/nextpvr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/ngircd/questions.yaml b/charts/stable/ngircd/questions.yaml
index 62513c020bb..11ab5b3db73 100644
--- a/charts/stable/ngircd/questions.yaml
+++ b/charts/stable/ngircd/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/nntp2nntp/questions.yaml b/charts/stable/nntp2nntp/questions.yaml
index 33146a1bffc..8f96cce8dfd 100644
--- a/charts/stable/nntp2nntp/questions.yaml
+++ b/charts/stable/nntp2nntp/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/nocodb/questions.yaml b/charts/stable/nocodb/questions.yaml
index f0df5905b0c..0801150790a 100644
--- a/charts/stable/nocodb/questions.yaml
+++ b/charts/stable/nocodb/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/node-red/questions.yaml b/charts/stable/node-red/questions.yaml
index 35cec7ed415..18b1cd533ec 100644
--- a/charts/stable/node-red/questions.yaml
+++ b/charts/stable/node-red/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/novnc/questions.yaml b/charts/stable/novnc/questions.yaml
index 43cb04d1e93..e20706373a4 100644
--- a/charts/stable/novnc/questions.yaml
+++ b/charts/stable/novnc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/ntfy/questions.yaml b/charts/stable/ntfy/questions.yaml
index 587594fdc6c..aab4b81f9f9 100644
--- a/charts/stable/ntfy/questions.yaml
+++ b/charts/stable/ntfy/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/nullserv/questions.yaml b/charts/stable/nullserv/questions.yaml
index a339cfb1842..7e37d96d296 100644
--- a/charts/stable/nullserv/questions.yaml
+++ b/charts/stable/nullserv/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/nzbget/questions.yaml b/charts/stable/nzbget/questions.yaml
index 86ece5d1c2d..4be7f5f814f 100644
--- a/charts/stable/nzbget/questions.yaml
+++ b/charts/stable/nzbget/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/nzbhydra/questions.yaml b/charts/stable/nzbhydra/questions.yaml
index b2b5c8a8d88..429480bb7d0 100644
--- a/charts/stable/nzbhydra/questions.yaml
+++ b/charts/stable/nzbhydra/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/octoprint/questions.yaml b/charts/stable/octoprint/questions.yaml
index 5e145b09d4a..101266b67ba 100644
--- a/charts/stable/octoprint/questions.yaml
+++ b/charts/stable/octoprint/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/odoo/questions.yaml b/charts/stable/odoo/questions.yaml
index 240eb6f5f2a..73c2cc61700 100644
--- a/charts/stable/odoo/questions.yaml
+++ b/charts/stable/odoo/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/omada-controller/questions.yaml b/charts/stable/omada-controller/questions.yaml
index 34841d35c77..93715bf6051 100644
--- a/charts/stable/omada-controller/questions.yaml
+++ b/charts/stable/omada-controller/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/ombi/questions.yaml b/charts/stable/ombi/questions.yaml
index cfdceb33345..649b5373ef2 100644
--- a/charts/stable/ombi/questions.yaml
+++ b/charts/stable/ombi/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/onlyoffice-document-server/questions.yaml b/charts/stable/onlyoffice-document-server/questions.yaml
index 99ac6977cca..0cc849f5c75 100644
--- a/charts/stable/onlyoffice-document-server/questions.yaml
+++ b/charts/stable/onlyoffice-document-server/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/openhab/questions.yaml b/charts/stable/openhab/questions.yaml
index 332cc7b1d37..9ec47db28be 100644
--- a/charts/stable/openhab/questions.yaml
+++ b/charts/stable/openhab/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/openkm/questions.yaml b/charts/stable/openkm/questions.yaml
index fcfeef5f914..3afaf0e64f0 100644
--- a/charts/stable/openkm/questions.yaml
+++ b/charts/stable/openkm/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/openldap/questions.yaml b/charts/stable/openldap/questions.yaml
index c56d9ba7487..16c217f8d72 100644
--- a/charts/stable/openldap/questions.yaml
+++ b/charts/stable/openldap/questions.yaml
@@ -8,6 +8,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/openspeedtest/questions.yaml b/charts/stable/openspeedtest/questions.yaml
index d08654e441c..5a3c77bf456 100644
--- a/charts/stable/openspeedtest/questions.yaml
+++ b/charts/stable/openspeedtest/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/openvscode-server/questions.yaml b/charts/stable/openvscode-server/questions.yaml
index 47630073a22..c76a00a562d 100644
--- a/charts/stable/openvscode-server/questions.yaml
+++ b/charts/stable/openvscode-server/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/organizr/questions.yaml b/charts/stable/organizr/questions.yaml
index 1453eec6499..8e88d69736a 100644
--- a/charts/stable/organizr/questions.yaml
+++ b/charts/stable/organizr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/oscam/questions.yaml b/charts/stable/oscam/questions.yaml
index d70a6a4600d..a2ba89af697 100644
--- a/charts/stable/oscam/questions.yaml
+++ b/charts/stable/oscam/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/outline/questions.yaml b/charts/stable/outline/questions.yaml
index e8862260502..89ad488f166 100644
--- a/charts/stable/outline/questions.yaml
+++ b/charts/stable/outline/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/overseerr/questions.yaml b/charts/stable/overseerr/questions.yaml
index 3673628f89e..bad692ddea9 100644
--- a/charts/stable/overseerr/questions.yaml
+++ b/charts/stable/overseerr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/owncast/questions.yaml b/charts/stable/owncast/questions.yaml
index e00838542f1..7ef6c40d926 100644
--- a/charts/stable/owncast/questions.yaml
+++ b/charts/stable/owncast/questions.yaml
@@ -14,6 +14,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/owncloud-ocis/questions.yaml b/charts/stable/owncloud-ocis/questions.yaml
index b95c11667ab..4ce8c5d3269 100644
--- a/charts/stable/owncloud-ocis/questions.yaml
+++ b/charts/stable/owncloud-ocis/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/paperless-ng/questions.yaml b/charts/stable/paperless-ng/questions.yaml
index ab9e52252fa..4e65e4621c0 100644
--- a/charts/stable/paperless-ng/questions.yaml
+++ b/charts/stable/paperless-ng/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/papermerge/questions.yaml b/charts/stable/papermerge/questions.yaml
index e36414c0123..4dc327005fd 100644
--- a/charts/stable/papermerge/questions.yaml
+++ b/charts/stable/papermerge/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/pgadmin/questions.yaml b/charts/stable/pgadmin/questions.yaml
index 7582584a9ca..7d4c3616cbb 100644
--- a/charts/stable/pgadmin/questions.yaml
+++ b/charts/stable/pgadmin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/photoprism/questions.yaml b/charts/stable/photoprism/questions.yaml
index 4150a58467b..675d4f5b978 100644
--- a/charts/stable/photoprism/questions.yaml
+++ b/charts/stable/photoprism/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/photoshow/questions.yaml b/charts/stable/photoshow/questions.yaml
index 474d552003d..4ab721736d9 100644
--- a/charts/stable/photoshow/questions.yaml
+++ b/charts/stable/photoshow/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/photoview/questions.yaml b/charts/stable/photoview/questions.yaml
index b6dc00a6549..bbed8eb4f7c 100644
--- a/charts/stable/photoview/questions.yaml
+++ b/charts/stable/photoview/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
   - variable: env
     group: "Container Configuration"
diff --git a/charts/stable/phpldapadmin/questions.yaml b/charts/stable/phpldapadmin/questions.yaml
index ee4f1677175..41d5b4d9225 100644
--- a/charts/stable/phpldapadmin/questions.yaml
+++ b/charts/stable/phpldapadmin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/piaware/questions.yaml b/charts/stable/piaware/questions.yaml
index f1b9c0943f2..046b4da775d 100644
--- a/charts/stable/piaware/questions.yaml
+++ b/charts/stable/piaware/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/picoshare/questions.yaml b/charts/stable/picoshare/questions.yaml
index 0c394d59867..b13756abd95 100644
--- a/charts/stable/picoshare/questions.yaml
+++ b/charts/stable/picoshare/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/pidgin/questions.yaml b/charts/stable/pidgin/questions.yaml
index aa7e23a21ac..cc0415e823a 100644
--- a/charts/stable/pidgin/questions.yaml
+++ b/charts/stable/pidgin/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/pihole/questions.yaml b/charts/stable/pihole/questions.yaml
index 119bd116d2e..ac8e9e1631a 100644
--- a/charts/stable/pihole/questions.yaml
+++ b/charts/stable/pihole/questions.yaml
@@ -15,6 +15,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: pihole
     group: "App Configuration"
diff --git a/charts/stable/pinry/questions.yaml b/charts/stable/pinry/questions.yaml
index 9bbbc7dea4e..bb973cd0240 100644
--- a/charts/stable/pinry/questions.yaml
+++ b/charts/stable/pinry/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/pixapop/questions.yaml b/charts/stable/pixapop/questions.yaml
index 39e212643f9..d48e9b0337b 100644
--- a/charts/stable/pixapop/questions.yaml
+++ b/charts/stable/pixapop/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/plex/questions.yaml b/charts/stable/plex/questions.yaml
index 6b4c95bb7da..615acf56355 100644
--- a/charts/stable/plex/questions.yaml
+++ b/charts/stable/plex/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/podgrab/questions.yaml b/charts/stable/podgrab/questions.yaml
index 61956173f9e..0e973ef5d88 100644
--- a/charts/stable/podgrab/questions.yaml
+++ b/charts/stable/podgrab/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/pretend-youre-xyzzy/questions.yaml b/charts/stable/pretend-youre-xyzzy/questions.yaml
index a4766e3525f..2bd58f1e6bb 100644
--- a/charts/stable/pretend-youre-xyzzy/questions.yaml
+++ b/charts/stable/pretend-youre-xyzzy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/projectsend/questions.yaml b/charts/stable/projectsend/questions.yaml
index 83220afebb3..24db57f51be 100644
--- a/charts/stable/projectsend/questions.yaml
+++ b/charts/stable/projectsend/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/protonmail-bridge/questions.yaml b/charts/stable/protonmail-bridge/questions.yaml
index dcabd27cfe2..61ba7d35f89 100644
--- a/charts/stable/protonmail-bridge/questions.yaml
+++ b/charts/stable/protonmail-bridge/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/prowlarr/questions.yaml b/charts/stable/prowlarr/questions.yaml
index 02977720051..0af4d7e1ce8 100644
--- a/charts/stable/prowlarr/questions.yaml
+++ b/charts/stable/prowlarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
 # Include{containerConfig}
 # Include{serviceRoot}
diff --git a/charts/stable/putty/questions.yaml b/charts/stable/putty/questions.yaml
index 7cc674b91c1..0e13948d321 100644
--- a/charts/stable/putty/questions.yaml
+++ b/charts/stable/putty/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/pwndrop/questions.yaml b/charts/stable/pwndrop/questions.yaml
index 84d6f512978..b4cf4f44fca 100644
--- a/charts/stable/pwndrop/questions.yaml
+++ b/charts/stable/pwndrop/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/pydio-cells/questions.yaml b/charts/stable/pydio-cells/questions.yaml
index f60242c9c46..82920e19c11 100644
--- a/charts/stable/pydio-cells/questions.yaml
+++ b/charts/stable/pydio-cells/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/pyload/questions.yaml b/charts/stable/pyload/questions.yaml
index 66acd5d1a32..1bd45128cd6 100644
--- a/charts/stable/pyload/questions.yaml
+++ b/charts/stable/pyload/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/pylon/questions.yaml b/charts/stable/pylon/questions.yaml
index bb346a26bba..35750c7818b 100644
--- a/charts/stable/pylon/questions.yaml
+++ b/charts/stable/pylon/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/qbittorrent/questions.yaml b/charts/stable/qbittorrent/questions.yaml
index 7a3cc3a1ea7..dd18675c298 100644
--- a/charts/stable/qbittorrent/questions.yaml
+++ b/charts/stable/qbittorrent/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/qdirstat/questions.yaml b/charts/stable/qdirstat/questions.yaml
index ad98d1b41cc..bd6e6712621 100644
--- a/charts/stable/qdirstat/questions.yaml
+++ b/charts/stable/qdirstat/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/qinglong/questions.yaml b/charts/stable/qinglong/questions.yaml
index bf3c179eb39..4d55ceb58e4 100644
--- a/charts/stable/qinglong/questions.yaml
+++ b/charts/stable/qinglong/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/quassel-core/questions.yaml b/charts/stable/quassel-core/questions.yaml
index 2e7852c4af1..05ef85b56d0 100644
--- a/charts/stable/quassel-core/questions.yaml
+++ b/charts/stable/quassel-core/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/quassel-web/questions.yaml b/charts/stable/quassel-web/questions.yaml
index 8e30ea9244c..8386c6826d0 100644
--- a/charts/stable/quassel-web/questions.yaml
+++ b/charts/stable/quassel-web/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/radarr/questions.yaml b/charts/stable/radarr/questions.yaml
index d350578bd13..28b8e5fc48a 100644
--- a/charts/stable/radarr/questions.yaml
+++ b/charts/stable/radarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/readarr/questions.yaml b/charts/stable/readarr/questions.yaml
index 42345b03ec9..d6d8d7f9e79 100644
--- a/charts/stable/readarr/questions.yaml
+++ b/charts/stable/readarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/recipes/questions.yaml b/charts/stable/recipes/questions.yaml
index 5016448fbfe..81c1de75956 100644
--- a/charts/stable/recipes/questions.yaml
+++ b/charts/stable/recipes/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/redmine/questions.yaml b/charts/stable/redmine/questions.yaml
index 0843eb9ea1f..4c413df0f12 100644
--- a/charts/stable/redmine/questions.yaml
+++ b/charts/stable/redmine/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: redmine
     group: "Container Configuration"
     label: "Redmine Configuration"
diff --git a/charts/stable/reg/questions.yaml b/charts/stable/reg/questions.yaml
index 3081a91437e..c96bcb7b10b 100644
--- a/charts/stable/reg/questions.yaml
+++ b/charts/stable/reg/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
 # Include{containerConfig}
 # Include{serviceRoot}
diff --git a/charts/stable/remmina/questions.yaml b/charts/stable/remmina/questions.yaml
index eeff7daf3ce..1e0645fd13c 100644
--- a/charts/stable/remmina/questions.yaml
+++ b/charts/stable/remmina/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/requestrr/questions.yaml b/charts/stable/requestrr/questions.yaml
index 5392bd6985f..111a9701bca 100644
--- a/charts/stable/requestrr/questions.yaml
+++ b/charts/stable/requestrr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/resilio-sync/questions.yaml b/charts/stable/resilio-sync/questions.yaml
index bc73a24bd7d..1fb8effaeec 100644
--- a/charts/stable/resilio-sync/questions.yaml
+++ b/charts/stable/resilio-sync/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/rsnapshot/questions.yaml b/charts/stable/rsnapshot/questions.yaml
index 5c246f55c4d..55659b58cc1 100644
--- a/charts/stable/rsnapshot/questions.yaml
+++ b/charts/stable/rsnapshot/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceExpertRoot}
             default: false
diff --git a/charts/stable/rss-bridge/questions.yaml b/charts/stable/rss-bridge/questions.yaml
index 4db94bed382..7c5fde028e4 100644
--- a/charts/stable/rss-bridge/questions.yaml
+++ b/charts/stable/rss-bridge/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/rsshub/questions.yaml b/charts/stable/rsshub/questions.yaml
index bb426278316..24ddadd2bba 100644
--- a/charts/stable/rsshub/questions.yaml
+++ b/charts/stable/rsshub/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/sabnzbd/questions.yaml b/charts/stable/sabnzbd/questions.yaml
index ee0a9d1d1e7..d0aff43f600 100644
--- a/charts/stable/sabnzbd/questions.yaml
+++ b/charts/stable/sabnzbd/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/satisfactory/questions.yaml b/charts/stable/satisfactory/questions.yaml
index 54b57ab6a77..2242901a837 100644
--- a/charts/stable/satisfactory/questions.yaml
+++ b/charts/stable/satisfactory/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/scrutiny/questions.yaml b/charts/stable/scrutiny/questions.yaml
index 65a024e9204..85cc510a171 100644
--- a/charts/stable/scrutiny/questions.yaml
+++ b/charts/stable/scrutiny/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/ser2sock/questions.yaml b/charts/stable/ser2sock/questions.yaml
index b0515c4aea6..51a7e0c09ee 100644
--- a/charts/stable/ser2sock/questions.yaml
+++ b/charts/stable/ser2sock/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/shiori/questions.yaml b/charts/stable/shiori/questions.yaml
index 04c8e807ab5..36baca28ff4 100644
--- a/charts/stable/shiori/questions.yaml
+++ b/charts/stable/shiori/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/shlink-web-client/questions.yaml b/charts/stable/shlink-web-client/questions.yaml
index 1513eadff37..aedec978270 100644
--- a/charts/stable/shlink-web-client/questions.yaml
+++ b/charts/stable/shlink-web-client/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/shlink/questions.yaml b/charts/stable/shlink/questions.yaml
index 23c01e56793..d3761a629d6 100644
--- a/charts/stable/shlink/questions.yaml
+++ b/charts/stable/shlink/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/shorturl/questions.yaml b/charts/stable/shorturl/questions.yaml
index 5400e30f6e4..6631131c256 100644
--- a/charts/stable/shorturl/questions.yaml
+++ b/charts/stable/shorturl/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/sickchill/questions.yaml b/charts/stable/sickchill/questions.yaml
index b544d9bc155..9992a40bb3a 100644
--- a/charts/stable/sickchill/questions.yaml
+++ b/charts/stable/sickchill/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/sickgear/questions.yaml b/charts/stable/sickgear/questions.yaml
index 541abd4fe73..bc291203aa3 100644
--- a/charts/stable/sickgear/questions.yaml
+++ b/charts/stable/sickgear/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/smokeping/questions.yaml b/charts/stable/smokeping/questions.yaml
index 0fe6c3c358f..25b82b61f42 100644
--- a/charts/stable/smokeping/questions.yaml
+++ b/charts/stable/smokeping/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/snapdrop/questions.yaml b/charts/stable/snapdrop/questions.yaml
index ef16c79e87d..76e12b427a1 100644
--- a/charts/stable/snapdrop/questions.yaml
+++ b/charts/stable/snapdrop/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/snipe-it/questions.yaml b/charts/stable/snipe-it/questions.yaml
index 43e2d1c6b24..22e7e5500dc 100644
--- a/charts/stable/snipe-it/questions.yaml
+++ b/charts/stable/snipe-it/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/sonarr/questions.yaml b/charts/stable/sonarr/questions.yaml
index d4b8946eaa9..72dab949b57 100644
--- a/charts/stable/sonarr/questions.yaml
+++ b/charts/stable/sonarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/spotweb/questions.yaml b/charts/stable/spotweb/questions.yaml
index e02ac128e3b..410d2b55830 100644
--- a/charts/stable/spotweb/questions.yaml
+++ b/charts/stable/spotweb/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/sqlitebrowser/questions.yaml b/charts/stable/sqlitebrowser/questions.yaml
index edd57a8f07a..93674172c07 100644
--- a/charts/stable/sqlitebrowser/questions.yaml
+++ b/charts/stable/sqlitebrowser/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/stash/questions.yaml b/charts/stable/stash/questions.yaml
index b9585ba8622..7a8012dc979 100644
--- a/charts/stable/stash/questions.yaml
+++ b/charts/stable/stash/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/static/questions.yaml b/charts/stable/static/questions.yaml
index c44ab7ca222..052458219bd 100644
--- a/charts/stable/static/questions.yaml
+++ b/charts/stable/static/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/statping/questions.yaml b/charts/stable/statping/questions.yaml
index f7cf3e7ab8a..eb97077e45f 100644
--- a/charts/stable/statping/questions.yaml
+++ b/charts/stable/statping/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/storj-node/questions.yaml b/charts/stable/storj-node/questions.yaml
index 1eaf9bc8b27..b973ade8209 100644
--- a/charts/stable/storj-node/questions.yaml
+++ b/charts/stable/storj-node/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/strapi/questions.yaml b/charts/stable/strapi/questions.yaml
index e69c0afe7f1..460de1b9ca0 100644
--- a/charts/stable/strapi/questions.yaml
+++ b/charts/stable/strapi/questions.yaml
@@ -14,6 +14,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   # Docker specific env
   - variable: env
     group: "Container Configuration"
diff --git a/charts/stable/synapse/questions.yaml b/charts/stable/synapse/questions.yaml
index ec8bbcb9ca1..1dd616b91c9 100644
--- a/charts/stable/synapse/questions.yaml
+++ b/charts/stable/synapse/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: synapse
     group: "Container Configuration"
diff --git a/charts/stable/synclounge/questions.yaml b/charts/stable/synclounge/questions.yaml
index f0534d9f9a9..84d11f02266 100644
--- a/charts/stable/synclounge/questions.yaml
+++ b/charts/stable/synclounge/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/syncthing/questions.yaml b/charts/stable/syncthing/questions.yaml
index f8933ea0360..cb750e7f098 100644
--- a/charts/stable/syncthing/questions.yaml
+++ b/charts/stable/syncthing/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/syslog-ng/questions.yaml b/charts/stable/syslog-ng/questions.yaml
index 7f1aae0bc39..57fd8d9b69b 100644
--- a/charts/stable/syslog-ng/questions.yaml
+++ b/charts/stable/syslog-ng/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/tautulli/questions.yaml b/charts/stable/tautulli/questions.yaml
index fdb9ac044bc..84ac432a0b9 100644
--- a/charts/stable/tautulli/questions.yaml
+++ b/charts/stable/tautulli/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/tdarr-node/questions.yaml b/charts/stable/tdarr-node/questions.yaml
index d5f194b8f3b..09feb18f40f 100644
--- a/charts/stable/tdarr-node/questions.yaml
+++ b/charts/stable/tdarr-node/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/tdarr/questions.yaml b/charts/stable/tdarr/questions.yaml
index bfc703fef78..c44a49a91d6 100644
--- a/charts/stable/tdarr/questions.yaml
+++ b/charts/stable/tdarr/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/teamspeak3/questions.yaml b/charts/stable/teamspeak3/questions.yaml
index 3e1f7c9db4c..1e1a035c0e4 100644
--- a/charts/stable/teamspeak3/questions.yaml
+++ b/charts/stable/teamspeak3/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/teedy/questions.yaml b/charts/stable/teedy/questions.yaml
index dda1a4f65a5..621f0be5bb5 100644
--- a/charts/stable/teedy/questions.yaml
+++ b/charts/stable/teedy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/thelounge/questions.yaml b/charts/stable/thelounge/questions.yaml
index 41169ee8ef5..871fd29df0b 100644
--- a/charts/stable/thelounge/questions.yaml
+++ b/charts/stable/thelounge/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/theme-park/questions.yaml b/charts/stable/theme-park/questions.yaml
index 35e0cffb282..4d459f1a79a 100644
--- a/charts/stable/theme-park/questions.yaml
+++ b/charts/stable/theme-park/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/tinymediamanager/questions.yaml b/charts/stable/tinymediamanager/questions.yaml
index 0e4b5161bde..0fcbec160f9 100644
--- a/charts/stable/tinymediamanager/questions.yaml
+++ b/charts/stable/tinymediamanager/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/traccar/questions.yaml b/charts/stable/traccar/questions.yaml
index 42ae5f778c6..1301dd6398d 100644
--- a/charts/stable/traccar/questions.yaml
+++ b/charts/stable/traccar/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/traefik/questions.yaml b/charts/stable/traefik/questions.yaml
index 8d5981a18d2..90c2da836e2 100644
--- a/charts/stable/traefik/questions.yaml
+++ b/charts/stable/traefik/questions.yaml
@@ -17,6 +17,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: ingressClass
     label: "ingressClass"
diff --git a/charts/stable/transmission/questions.yaml b/charts/stable/transmission/questions.yaml
index 6e11e1e43fa..51ac6609953 100644
--- a/charts/stable/transmission/questions.yaml
+++ b/charts/stable/transmission/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/trilium-notes/questions.yaml b/charts/stable/trilium-notes/questions.yaml
index 534a9b6bb13..fee5ce792fc 100644
--- a/charts/stable/trilium-notes/questions.yaml
+++ b/charts/stable/trilium-notes/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/truecommand/questions.yaml b/charts/stable/truecommand/questions.yaml
index 890a9d831fb..11964e4c935 100644
--- a/charts/stable/truecommand/questions.yaml
+++ b/charts/stable/truecommand/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/tsmuxer/questions.yaml b/charts/stable/tsmuxer/questions.yaml
index 87b8765623e..98217fdcf7f 100644
--- a/charts/stable/tsmuxer/questions.yaml
+++ b/charts/stable/tsmuxer/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/tt-rss/questions.yaml b/charts/stable/tt-rss/questions.yaml
index 7e4e5704dfe..48e1f64f509 100644
--- a/charts/stable/tt-rss/questions.yaml
+++ b/charts/stable/tt-rss/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/tvheadend/questions.yaml b/charts/stable/tvheadend/questions.yaml
index 589a2fe41cc..84bdcf721ec 100644
--- a/charts/stable/tvheadend/questions.yaml
+++ b/charts/stable/tvheadend/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/twtxt/questions.yaml b/charts/stable/twtxt/questions.yaml
index 8afd67eaefe..f77a64310f5 100644
--- a/charts/stable/twtxt/questions.yaml
+++ b/charts/stable/twtxt/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/typecho/questions.yaml b/charts/stable/typecho/questions.yaml
index 356a85e1121..ea80f8ec75e 100644
--- a/charts/stable/typecho/questions.yaml
+++ b/charts/stable/typecho/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/ubooquity/questions.yaml b/charts/stable/ubooquity/questions.yaml
index c6fa081eb20..0224ab6d949 100644
--- a/charts/stable/ubooquity/questions.yaml
+++ b/charts/stable/ubooquity/questions.yaml
@@ -20,6 +20,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/unifi/questions.yaml b/charts/stable/unifi/questions.yaml
index d839cfebac1..16b1bf1331a 100644
--- a/charts/stable/unifi/questions.yaml
+++ b/charts/stable/unifi/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/unmanic/questions.yaml b/charts/stable/unmanic/questions.yaml
index 99bd920ae0a..74c7a0181e8 100644
--- a/charts/stable/unmanic/questions.yaml
+++ b/charts/stable/unmanic/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/unpackerr/questions.yaml b/charts/stable/unpackerr/questions.yaml
index 8a66e07fcbb..535496f3503 100644
--- a/charts/stable/unpackerr/questions.yaml
+++ b/charts/stable/unpackerr/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceExpertRoot}
             default: false
diff --git a/charts/stable/uptime-kuma/questions.yaml b/charts/stable/uptime-kuma/questions.yaml
index b434e2648b7..b11d2bbbbb1 100644
--- a/charts/stable/uptime-kuma/questions.yaml
+++ b/charts/stable/uptime-kuma/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/valheim/questions.yaml b/charts/stable/valheim/questions.yaml
index 6d7b7f3b0c3..abc9bf38573 100644
--- a/charts/stable/valheim/questions.yaml
+++ b/charts/stable/valheim/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/vaultwarden/questions.yaml b/charts/stable/vaultwarden/questions.yaml
index 9314a4ca795..66daf82f6d6 100644
--- a/charts/stable/vaultwarden/questions.yaml
+++ b/charts/stable/vaultwarden/questions.yaml
@@ -14,6 +14,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
   - variable: vaultwarden
     label: ""
diff --git a/charts/stable/verysync/questions.yaml b/charts/stable/verysync/questions.yaml
index 5da35f8f453..c625ff7a44a 100644
--- a/charts/stable/verysync/questions.yaml
+++ b/charts/stable/verysync/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/vikunja/questions.yaml b/charts/stable/vikunja/questions.yaml
index d1a98561395..003598b612e 100644
--- a/charts/stable/vikunja/questions.yaml
+++ b/charts/stable/vikunja/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/webgrabplus/questions.yaml b/charts/stable/webgrabplus/questions.yaml
index ca66edc114f..19f38093889 100644
--- a/charts/stable/webgrabplus/questions.yaml
+++ b/charts/stable/webgrabplus/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceExpertRoot}
             default: false
diff --git a/charts/stable/weblate/questions.yaml b/charts/stable/weblate/questions.yaml
index 67b40bb5eeb..efe1c135a4a 100644
--- a/charts/stable/weblate/questions.yaml
+++ b/charts/stable/weblate/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: weblate
     group: "Container Configuration"
     label: "Weblate Configuration"
diff --git a/charts/stable/website-shot/questions.yaml b/charts/stable/website-shot/questions.yaml
index 839c6e1ab72..2552a8bb978 100644
--- a/charts/stable/website-shot/questions.yaml
+++ b/charts/stable/website-shot/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/wekan/questions.yaml b/charts/stable/wekan/questions.yaml
index 98cd7e8c99b..2f89fc37ea7 100644
--- a/charts/stable/wekan/questions.yaml
+++ b/charts/stable/wekan/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/wg-easy/questions.yaml b/charts/stable/wg-easy/questions.yaml
index 07b175217b7..f042a10385b 100644
--- a/charts/stable/wg-easy/questions.yaml
+++ b/charts/stable/wg-easy/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/whoogle/questions.yaml b/charts/stable/whoogle/questions.yaml
index 7eae3607f89..a5c0085c295 100644
--- a/charts/stable/whoogle/questions.yaml
+++ b/charts/stable/whoogle/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/wikijs/questions.yaml b/charts/stable/wikijs/questions.yaml
index ae2a258f8b3..22768b8139d 100644
--- a/charts/stable/wikijs/questions.yaml
+++ b/charts/stable/wikijs/questions.yaml
@@ -15,6 +15,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/wireshark/questions.yaml b/charts/stable/wireshark/questions.yaml
index 47ae6e264a5..09228037168 100644
--- a/charts/stable/wireshark/questions.yaml
+++ b/charts/stable/wireshark/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/xbackbone/questions.yaml b/charts/stable/xbackbone/questions.yaml
index ee23b073a31..538c2f0de25 100644
--- a/charts/stable/xbackbone/questions.yaml
+++ b/charts/stable/xbackbone/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/xteve/questions.yaml b/charts/stable/xteve/questions.yaml
index af5ef9f12f6..e0eb4c99b85 100644
--- a/charts/stable/xteve/questions.yaml
+++ b/charts/stable/xteve/questions.yaml
@@ -12,6 +12,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/xwiki/questions.yaml b/charts/stable/xwiki/questions.yaml
index e23e1f29d8b..05af6f3d61d 100644
--- a/charts/stable/xwiki/questions.yaml
+++ b/charts/stable/xwiki/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
diff --git a/charts/stable/zerotier/questions.yaml b/charts/stable/zerotier/questions.yaml
index f6e1ede3e52..af0c100a44e 100644
--- a/charts/stable/zerotier/questions.yaml
+++ b/charts/stable/zerotier/questions.yaml
@@ -9,6 +9,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/zigbee2mqtt/questions.yaml b/charts/stable/zigbee2mqtt/questions.yaml
index 164e2851ea5..c283f8ac8da 100644
--- a/charts/stable/zigbee2mqtt/questions.yaml
+++ b/charts/stable/zigbee2mqtt/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/znc/questions.yaml b/charts/stable/znc/questions.yaml
index 11060c3cdd9..eb6b7dbee83 100644
--- a/charts/stable/znc/questions.yaml
+++ b/charts/stable/znc/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/ztcuui-aio/questions.yaml b/charts/stable/ztcuui-aio/questions.yaml
index a0c63739caf..a33ae56cc71 100644
--- a/charts/stable/ztcuui-aio/questions.yaml
+++ b/charts/stable/ztcuui-aio/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
   - variable: secretEnv
     group: "Container Configuration"
     label: "Image Secrets"
diff --git a/charts/stable/zwavejs2mqtt/questions.yaml b/charts/stable/zwavejs2mqtt/questions.yaml
index 5d439285fe7..fdc2b71d365 100644
--- a/charts/stable/zwavejs2mqtt/questions.yaml
+++ b/charts/stable/zwavejs2mqtt/questions.yaml
@@ -11,6 +11,7 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/templates/questions/controller/controllerExpert.yaml b/templates/questions/controller/controllerExpert.yaml
index 7eb9e8941f4..8b802d2218e 100644
--- a/templates/questions/controller/controllerExpert.yaml
+++ b/templates/questions/controller/controllerExpert.yaml
@@ -5,16 +5,6 @@
             default: false
             show_subquestions_if: true
             subquestions:
-              - variable: extraArgs
-                label: Extra Args
-                schema:
-                  type: list
-                  default: []
-                  items:
-                    - variable: arg
-                      label: Arg
-                      schema:
-                        type: string
               - variable: labelsList
                 label: Controller Labels
                 schema:
diff --git a/templates/questions/controller/controllerExpertExtraArgs.yaml b/templates/questions/controller/controllerExpertExtraArgs.yaml
new file mode 100644
index 00000000000..1399c5f3041
--- /dev/null
+++ b/templates/questions/controller/controllerExpertExtraArgs.yaml
@@ -0,0 +1,19 @@
+  - variable: customextraargs
+    group: Controller
+    label: "Extra Args"
+    description: "Do not click this unless you know what you are doing"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: extraArgs
+          label: Extra Args
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: arg
+                label: Arg
+                schema:
+                  type: string
diff --git a/tools/build-release.sh b/tools/build-release.sh
index 20f132daec3..3862f76260f 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -187,6 +187,12 @@ include_questions(){
     /# Include{controllerExpert}/ { for (i=0;i<n;++i) print a[i]; next }
     1' templates/questions/controller/controllerExpert.yaml ${target}/questions.yaml > "tmp${chartname}" && mv "tmp${chartname}" ${target}/questions.yaml
 
+     # Replace # Include{controllerExpertExtraArgs} with the standard controllerExpertExtraArgs codesnippet
+    awk 'NR==FNR { a[n++]=$0; next }
+    /# Include{controllerExpertExtraArgs}/ { for (i=0;i<n;++i) print a[i]; next }
+    1' templates/questions/controller/controllerExpertExtraArgs.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 }