diff --git a/charts/stable/custom-app/questions.yaml b/charts/stable/custom-app/questions.yaml
index 18add88574f..e8b823cbc08 100644
--- a/charts/stable/custom-app/questions.yaml
+++ b/charts/stable/custom-app/questions.yaml
@@ -108,14 +108,8 @@ questions:
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
 
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
 # Include{containerConfig}
+
   - variable: probes
     group: "Container Configuration"
     label: "Healthcheck Probes"
diff --git a/charts/stable/esphome/questions.yaml b/charts/stable/esphome/questions.yaml
index a69da2534a7..a5d67d63914 100644
--- a/charts/stable/esphome/questions.yaml
+++ b/charts/stable/esphome/questions.yaml
@@ -74,13 +74,7 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
+
 # Include{containerConfig}
 
   - variable: service
diff --git a/charts/stable/focalboard/questions.yaml b/charts/stable/focalboard/questions.yaml
index 385cb2f3283..192aa4aed87 100644
--- a/charts/stable/focalboard/questions.yaml
+++ b/charts/stable/focalboard/questions.yaml
@@ -74,13 +74,6 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
 
   - variable: focalboard
     group: "Container Configuration"
diff --git a/charts/stable/icantbelieveitsnotvaletudo/questions.yaml b/charts/stable/icantbelieveitsnotvaletudo/questions.yaml
index ff697793417..20e2e802626 100644
--- a/charts/stable/icantbelieveitsnotvaletudo/questions.yaml
+++ b/charts/stable/icantbelieveitsnotvaletudo/questions.yaml
@@ -75,14 +75,6 @@ questions:
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
 
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-
   - variable: config
     group: "Container Configuration"
     label: "Configuration"
diff --git a/charts/stable/mosquitto/questions.yaml b/charts/stable/mosquitto/questions.yaml
index 3b961593851..234ea04b520 100644
--- a/charts/stable/mosquitto/questions.yaml
+++ b/charts/stable/mosquitto/questions.yaml
@@ -74,13 +74,6 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
 
   - variable: auth
     group: "App Configuration"
diff --git a/charts/stable/n8n/questions.yaml b/charts/stable/n8n/questions.yaml
index 49292d75a9a..88ad03ad0c1 100644
--- a/charts/stable/n8n/questions.yaml
+++ b/charts/stable/n8n/questions.yaml
@@ -73,14 +73,9 @@ questions:
                       description: "RollingUpdate: Create new pods and then kill old ones"
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
+
 # Include{controllerExpert}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
+
   - variable: deployment
     group: "Container Configuration"
     label: "Deployment"
@@ -470,6 +465,7 @@ questions:
             type: int
 
 # Include{containerConfig}
+
   - variable: service
     group: "Networking and Services"
     label: "Configure Service(s)"
@@ -602,7 +598,9 @@ questions:
                       description: "Default"
                     - value: "Memory"
                       description: "Memory"
+
 # Include{persistenceAdvanced}
+
 # Include{persistenceList}
 
   - variable: ingress
diff --git a/charts/stable/synapse/questions.yaml b/charts/stable/synapse/questions.yaml
index 47940167707..e953cd31443 100644
--- a/charts/stable/synapse/questions.yaml
+++ b/charts/stable/synapse/questions.yaml
@@ -74,13 +74,7 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
+
 # Include{containerConfig}
 
   - variable: synapse
diff --git a/charts/stable/syncthing/questions.yaml b/charts/stable/syncthing/questions.yaml
index fc7701dfbe6..29b3d91b45e 100644
--- a/charts/stable/syncthing/questions.yaml
+++ b/charts/stable/syncthing/questions.yaml
@@ -74,13 +74,7 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
+
 # Include{containerConfig}
 
   - variable: service
diff --git a/charts/stable/weblate/questions.yaml b/charts/stable/weblate/questions.yaml
index 15a088ced24..32585398e95 100644
--- a/charts/stable/weblate/questions.yaml
+++ b/charts/stable/weblate/questions.yaml
@@ -74,13 +74,7 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
+
   - variable: weblate
     group: "Container Configuration"
     label: "Weblate Configuration"
diff --git a/charts/stable/zwavejs2mqtt/questions.yaml b/charts/stable/zwavejs2mqtt/questions.yaml
index cf876fbaaa3..8157290cab8 100644
--- a/charts/stable/zwavejs2mqtt/questions.yaml
+++ b/charts/stable/zwavejs2mqtt/questions.yaml
@@ -74,13 +74,7 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
+
 # Include{containerConfig}
 
   - variable: service