diff --git a/charts/incubator/teslamate/Chart.yaml b/charts/incubator/teslamate/Chart.yaml
index 22a22822e51..40040cc7e06 100644
--- a/charts/incubator/teslamate/Chart.yaml
+++ b/charts/incubator/teslamate/Chart.yaml
@@ -37,4 +37,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/TeslaMate
   - https://hub.docker.com/r/teslamate/teslamate
 type: application
-version: 1.0.5
+version: 1.0.6
diff --git a/charts/incubator/teslamate/questions.yaml b/charts/incubator/teslamate/questions.yaml
index 1a318d15eb3..c38dd3f1b98 100644
--- a/charts/incubator/teslamate/questions.yaml
+++ b/charts/incubator/teslamate/questions.yaml
@@ -10,50 +10,49 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+                                - variable: env
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: DISABLE_MQTT
+                                        label: "Mqtt Disabled"
+                                        description: "Disables the MQTT feature if true"
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                      - variable: MQTT_HOST
+                                        label: "Mqtt Host"
+                                        description: "Hostname of the broker."
+                                        schema:
+                                          type: string
+                                          default: ""
+                                          show_if: [["DISABLE_MQTT", "=", false]]
+                                      - variable: MQTT_PORT
+                                        label: "Mqtt Port"
+                                        schema:
+                                          type: int
+                                          default: 1883
+                                          show_if: [["DISABLE_MQTT", "=", false]]
+                                      - variable: MQTT_USERNAME
+                                        label: "Mqtt Username"
+                                        description: "Username of the broker."
+                                        schema:
+                                          type: string
+                                          default: ""
+                                          show_if: [["DISABLE_MQTT", "=", false]]
+                                      - variable: MQTT_PASSWORD
+                                        label: "Mqtt Password"
+                                        description: "Password of the broker."
+                                        schema:
+                                          type: string
+                                          private: true
+                                          show_if: [["DISABLE_MQTT", "=", false]]
 # Include{containerBasic}
 # Include{containerAdvanced}
 # Include{containerConfig}
 # Include{podOptions}
-  - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: DISABLE_MQTT
-          label: "Mqtt Disabled"
-          description: "Disables the MQTT feature if true"
-          schema:
-            type: boolean
-            default: true
-        - variable: MQTT_HOST
-          label: "Mqtt Host"
-          description: "Hostname of the broker."
-          schema:
-            type: string
-            default: ""
-            show_if: [["DISABLE_MQTT", "=", false]]
-        - variable: MQTT_PORT
-          label: "Mqtt Port"
-          schema:
-            type: int
-            default: 1883
-            show_if: [["DISABLE_MQTT", "=", false]]
-        - variable: MQTT_USERNAME
-          label: "Mqtt Username"
-          description: "Username of the broker."
-          schema:
-            type: string
-            default: ""
-            show_if: [["DISABLE_MQTT", "=", false]]
-        - variable: MQTT_PASSWORD
-          label: "Mqtt Password"
-          description: "Password of the broker."
-          schema:
-            type: string
-            private: true
-            show_if: [["DISABLE_MQTT", "=", false]]
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"