diff --git a/charts/stable/zigbee2mqtt/Chart.yaml b/charts/stable/zigbee2mqtt/Chart.yaml
index 0d5d9ff55dc..d39f8f21c89 100644
--- a/charts/stable/zigbee2mqtt/Chart.yaml
+++ b/charts/stable/zigbee2mqtt/Chart.yaml
@@ -19,7 +19,7 @@ maintainers:
 name: zigbee2mqtt
 sources:
 - https://github.com/Koenkk/zigbee2mqtt
-version: 2.0.5
+version: 2.0.6
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/zigbee2mqtt/questions.yaml b/charts/stable/zigbee2mqtt/questions.yaml
index 6212af36e79..cc9c946113e 100644
--- a/charts/stable/zigbee2mqtt/questions.yaml
+++ b/charts/stable/zigbee2mqtt/questions.yaml
@@ -74,6 +74,26 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
+  - variable: secret
+    group: "Container Configuration"
+    label: "Image Secrets"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: ZIGBEE2MQTT_CONFIG_MQTT_USER
+          label: "MQTT User"
+          description: "This overrides config file"
+          schema:
+            type: string
+            default: ""
+        - variable: ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD
+          label: "MQTT Password"
+          description: "This overrides config file"
+          schema:
+            type: string
+            private: true
+            default: ""
 
   - variable: env
     group: "Container Configuration"
@@ -88,6 +108,21 @@ questions:
           schema:
             type: string
             default: "/dev/ttyUSB0"
+        - variable: ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER
+          label: "Serial Adapter Type"
+          description: "This overrides config file"
+          schema:
+            type: string
+            default: "null"
+            enum:
+              - value: "null"
+                description: "null"
+              - value: "deconz"
+                description: "deconz"
+              - value: "ezsp"
+                description: "ezsp"
+              - value: "zstack"
+                description: "zstack"
         - variable: ZIGBEE2MQTT_CONFIG_MQTT_SERVER
           label: "MQTT Server"
           description: "This overrides config file"
diff --git a/charts/stable/zigbee2mqtt/values.yaml b/charts/stable/zigbee2mqtt/values.yaml
index 96e2aff59fe..3c6e5ecc12c 100644
--- a/charts/stable/zigbee2mqtt/values.yaml
+++ b/charts/stable/zigbee2mqtt/values.yaml
@@ -3,9 +3,14 @@ image:
   tag: v1.24.0@sha256:2574cbd6af36d0305c8034804e2c64f672757133d71b14f87f36913a9b97e754
   pullPolicy: IfNotPresent
 
+secret:
+  ZIGBEE2MQTT_CONFIG_MQTT_USER: "admin"
+  ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: "password"
+
 env:
   ZIGBEE2MQTT_DATA: "/data"
   ZIGBEE2MQTT_CONFIG_SERIAL_PORT: "/dev/ttyACM0"
+  ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER: "null"
   ZIGBEE2MQTT_CONFIG_MQTT_SERVER: "mqtt://localhost"
   ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC: "zigbee2mqtt"
 
@@ -51,11 +56,11 @@ config:
     # MQTT server URL
     server: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_SERVER }}"
     # MQTT server authentication, uncomment if required:
-    # user: my_user
+    user: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_USER }}"
     # password: my_password
     # client_id: my_id
     # Alternatively, credentials may be put into a separate file, managed through a secret:
-    # password: '!secret password'
+    password: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD }}"
 
     # Optional: Include device information to mqtt messages (default: false)
     include_device_information: true
@@ -65,7 +70,7 @@ config:
     # Location of your zigbee device
     port: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT }}"
     # Optional: adapter type, not needed unless you are experiencing problems (options: zstack, deconz)
-    # adapter: deconz
+    adapter: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER }}"
 
   advanced:
     network_key: GENERATE