diff --git a/charts/enterprise/metallb/Chart.yaml b/charts/enterprise/metallb/Chart.yaml
index aae2de2b511..ee5336e9b1f 100644
--- a/charts/enterprise/metallb/Chart.yaml
+++ b/charts/enterprise/metallb/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/metallb/metallb
   - https://metallb.universe.tf
 type: application
-version: 6.0.0
+version: 6.0.1
 annotations:
   truecharts.org/catagories: |
     - core
diff --git a/charts/enterprise/metallb/questions.yaml b/charts/enterprise/metallb/questions.yaml
index 45b15130b92..c483ec1a25e 100644
--- a/charts/enterprise/metallb/questions.yaml
+++ b/charts/enterprise/metallb/questions.yaml
@@ -1,7 +1,6 @@
 # Include{groups}
 questions:
 # Include{global}
-# Include{controller}
   - variable: ipAddressPools
     group: App Configuration
     label: IP Address Pools Object
diff --git a/charts/incubator/mineos/Chart.yaml b/charts/incubator/mineos/Chart.yaml
index 4754a060577..b7535ff56b7 100644
--- a/charts/incubator/mineos/Chart.yaml
+++ b/charts/incubator/mineos/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: mineos
-version: 1.0.0
+version: 1.0.1
 appVersion: "latest"
 description: MineOS is a server front-end to ease managing Minecraft administrative tasks.
 type: application
diff --git a/charts/incubator/mineos/questions.yaml b/charts/incubator/mineos/questions.yaml
index 2ee9d61da0d..b5c3982c7ce 100644
--- a/charts/incubator/mineos/questions.yaml
+++ b/charts/incubator/mineos/questions.yaml
@@ -201,7 +201,6 @@ questions:
                               default: 25570
                               required: true
 # Include{advancedPortTCP}
-                                    max: 65535
                                 - variable: targetPort
                                   label: "Target Port"
                                   description: "The internal(!) port on the container the Application runs on"
@@ -331,7 +330,6 @@ questions:
                               default: 25570
                               required: true
 # Include{advancedPortUDP}
-                                    max: 65535
                                 - variable: targetPort
                                   label: "Target Port"
                                   description: "The internal(!) port on the container the Application runs on"
@@ -401,7 +399,6 @@ questions:
                               default: 19134
                               required: true
 # Include{advancedPortUDP}
-                                    max: 65535
                                 - variable: targetPort
                                   label: "Target Port"
                                   description: "The internal(!) port on the container the Application runs on"
@@ -491,7 +488,6 @@ questions:
                               default: 25575
                               required: true
 # Include{advancedPortTCP}
-                                    max: 65535
                                 - variable: targetPort
                                   label: "Target Port"
                                   description: "The internal(!) port on the container the Application runs on"
@@ -512,7 +508,6 @@ questions:
                               default: 25576
                               required: true
 # Include{advancedPortTCP}
-                                    max: 65535
                                 - variable: targetPort
                                   label: "Target Port"
                                   description: "The internal(!) port on the container the Application runs on"
diff --git a/charts/stable/external-service/Chart.yaml b/charts/stable/external-service/Chart.yaml
index 01b9a030aeb..6f151e08103 100644
--- a/charts/stable/external-service/Chart.yaml
+++ b/charts/stable/external-service/Chart.yaml
@@ -20,7 +20,7 @@ name: external-service
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/external-service
 type: application
-version: 7.0.0
+version: 7.0.1
 annotations:
   truecharts.org/catagories: |
     - networking
diff --git a/charts/stable/external-service/questions.yaml b/charts/stable/external-service/questions.yaml
index db903794ff4..cf61380720d 100644
--- a/charts/stable/external-service/questions.yaml
+++ b/charts/stable/external-service/questions.yaml
@@ -4,7 +4,6 @@ portals:
 # Include{portalLink}
 questions:
 # Include{global}
-# Include{controller}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
diff --git a/charts/stable/promcord/Chart.yaml b/charts/stable/promcord/Chart.yaml
index 97879c9ad9f..af995558eb6 100644
--- a/charts/stable/promcord/Chart.yaml
+++ b/charts/stable/promcord/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/promcord
   - https://github.com/nimarion/promcord
 type: application
-version: 5.0.0
+version: 5.0.1
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/promcord/questions.yaml b/charts/stable/promcord/questions.yaml
index 5fafdf29aee..e1fafe5e10b 100644
--- a/charts/stable/promcord/questions.yaml
+++ b/charts/stable/promcord/questions.yaml
@@ -3,6 +3,14 @@ portals: {}
 questions:
 # Include{global}
 # Include{controller}
+# Include{controllerDeployment}
+# Include{replicas}
+# Include{replica1}
+# Include{strategy}
+# Include{recreate}
+# Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
+# Include{containerConfig}
   - variable: secretEnv
     group: "App Configuration"
     label: "Image Secrets"
@@ -18,7 +26,6 @@ questions:
             required: true
             private: true
             default: "REPLACETHIS"
-# Include{containerConfig}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/stable/speedtest-exporter/Chart.yaml b/charts/stable/speedtest-exporter/Chart.yaml
index 529e01222d8..1731a94c682 100644
--- a/charts/stable/speedtest-exporter/Chart.yaml
+++ b/charts/stable/speedtest-exporter/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/speedtest-exporter
   - https://github.com/MiguelNdeCarvalho/speedtest-exporter/
 type: application
-version: 4.0.0
+version: 4.0.1
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/speedtest-exporter/questions.yaml b/charts/stable/speedtest-exporter/questions.yaml
index 5e8387766f0..e2f4ff5a059 100644
--- a/charts/stable/speedtest-exporter/questions.yaml
+++ b/charts/stable/speedtest-exporter/questions.yaml
@@ -3,6 +3,13 @@ portals: {}
 questions:
 # Include{global}
 # Include{controller}
+# Include{controllerDeployment}
+# Include{replicas}
+# Include{replica1}
+# Include{strategy}
+# Include{recreate}
+# Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
 # Include{containerConfig}
 # Include{serviceExpertRoot}
             default: false
diff --git a/charts/stable/unpoller/Chart.yaml b/charts/stable/unpoller/Chart.yaml
index 5388f4efa2c..14592b7f0d2 100644
--- a/charts/stable/unpoller/Chart.yaml
+++ b/charts/stable/unpoller/Chart.yaml
@@ -23,7 +23,7 @@ sources:
   - https://github.com/unifi-poller/unifi-poller
   - https://hub.docker.com/r/golift/unifi-poller
 type: application
-version: 4.0.0
+version: 4.0.1
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/unpoller/questions.yaml b/charts/stable/unpoller/questions.yaml
index c67bfc0be99..f2fe46dd398 100644
--- a/charts/stable/unpoller/questions.yaml
+++ b/charts/stable/unpoller/questions.yaml
@@ -3,6 +3,14 @@ portals: {}
 questions:
 # Include{global}
 # Include{controller}
+# Include{controllerDeployment}
+# Include{replicas}
+# Include{replica1}
+# Include{strategy}
+# Include{recreate}
+# Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
+# Include{containerConfig}
   - variable: secretEnv
     group: "App Configuration"
     label: "Secret Image Environment"
@@ -38,7 +46,6 @@ questions:
             type: string
             default: ""
             required: true
-# Include{containerConfig}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/stable/uptimerobot-prometheus/Chart.yaml b/charts/stable/uptimerobot-prometheus/Chart.yaml
index 82d2d2a0b06..1d536d50ded 100644
--- a/charts/stable/uptimerobot-prometheus/Chart.yaml
+++ b/charts/stable/uptimerobot-prometheus/Chart.yaml
@@ -24,7 +24,7 @@ sources:
   - https://github.com/lekpamartin/uptimerobot_exporter
   - https://github.com/k8s-at-home/charts/tree/master/charts/uptimerobot-prometheus
 type: application
-version: 5.0.0
+version: 5.0.1
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/uptimerobot-prometheus/questions.yaml b/charts/stable/uptimerobot-prometheus/questions.yaml
index 54abc7e7a63..f1fdd022d64 100644
--- a/charts/stable/uptimerobot-prometheus/questions.yaml
+++ b/charts/stable/uptimerobot-prometheus/questions.yaml
@@ -3,6 +3,14 @@ portals: {}
 questions:
 # Include{global}
 # Include{controller}
+# Include{controllerDeployment}
+# Include{replicas}
+# Include{replica1}
+# Include{strategy}
+# Include{recreate}
+# Include{controllerExpert}
+# Include{controllerExpertExtraArgs}
+# Include{containerConfig}
   - variable: secretEnv
     group: "App Configuration"
     label: "Image Secrets"
@@ -18,7 +26,6 @@ questions:
             required: true
             private: true
             default: "REPLACETHIS"
-# Include{containerConfig}
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}