diff --git a/charts/stable/zigbee2mqtt/CHANGELOG.md b/charts/stable/zigbee2mqtt/CHANGELOG.md
index cf8473d5ed3..82dc14fe9c6 100644
--- a/charts/stable/zigbee2mqtt/CHANGELOG.md
+++ b/charts/stable/zigbee2mqtt/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog<br>
 
 
+<a name="zigbee2mqtt-2.0.7"></a>
+### [zigbee2mqtt-2.0.7](https://github.com/truecharts/apps/compare/zigbee2mqtt-2.0.6...zigbee2mqtt-2.0.7) (2022-03-20)
+
+#### Fix
+
+* Remove configmap and provide questions for basic setup to get up and running ([#2225](https://github.com/truecharts/apps/issues/2225))
+
+
+
 <a name="zigbee2mqtt-2.0.6"></a>
 ### [zigbee2mqtt-2.0.6](https://github.com/truecharts/apps/compare/zigbee2mqtt-2.0.5...zigbee2mqtt-2.0.6) (2022-03-19)
 
diff --git a/charts/stable/zigbee2mqtt/helm-values.md b/charts/stable/zigbee2mqtt/helm-values.md
index fc9a12322ac..1b3d6b8a4d6 100644
--- a/charts/stable/zigbee2mqtt/helm-values.md
+++ b/charts/stable/zigbee2mqtt/helm-values.md
@@ -11,11 +11,13 @@ You will, however, be able to use all values referenced in the common chart here
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| config | object | See values.yaml | zigbee2mqtt configuration settings. This will be copied into the container's persistent storage at first run only. Further configuration should be done in the application itself! See [project documentation](https://www.zigbee2mqtt.io/information/configuration.html) for more information. these are mostly just defaults and any further tweaking should be done using env-vars |
+| env.ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API | bool | `true` |  |
+| env.ZIGBEE2MQTT_CONFIG_FRONTEND_PORT | string | `"{{ .Values.service.main.ports.main.port }}"` |  |
 | env.ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC | string | `"zigbee2mqtt"` |  |
 | env.ZIGBEE2MQTT_CONFIG_MQTT_SERVER | string | `"mqtt://localhost"` |  |
-| env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER | string | `"null"` |  |
-| env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT | string | `"/dev/ttyACM0"` |  |
+| env.ZIGBEE2MQTT_CONFIG_PERMIT_JOIN | bool | `true` |  |
+| env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER | string | `"auto"` |  |
+| env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT | string | `"/dev/ttyUSB0"` |  |
 | env.ZIGBEE2MQTT_DATA | string | `"/data"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"tccr.io/truecharts/zigbee2mqtt"` |  |
@@ -24,10 +26,9 @@ You will, however, be able to use all values referenced in the common chart here
 | persistence.data.mountPath | string | `"/data"` |  |
 | podSecurityContext.runAsGroup | int | `0` |  |
 | podSecurityContext.runAsUser | int | `0` |  |
-| secret.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD | string | `"password"` |  |
-| secret.ZIGBEE2MQTT_CONFIG_MQTT_USER | string | `"admin"` |  |
+| secret.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD | string | `""` |  |
+| secret.ZIGBEE2MQTT_CONFIG_MQTT_USER | string | `""` |  |
 | securityContext.runAsNonRoot | bool | `false` |  |
 | service.main.ports.main.port | int | `10103` |  |
-| service.main.ports.main.targetPort | int | `8080` |  |
 
 All Rights Reserved - The TrueCharts Project
diff --git a/docs/apps/stable/zigbee2mqtt/CHANGELOG.md b/docs/apps/stable/zigbee2mqtt/CHANGELOG.md
index cf8473d5ed3..82dc14fe9c6 100644
--- a/docs/apps/stable/zigbee2mqtt/CHANGELOG.md
+++ b/docs/apps/stable/zigbee2mqtt/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog<br>
 
 
+<a name="zigbee2mqtt-2.0.7"></a>
+### [zigbee2mqtt-2.0.7](https://github.com/truecharts/apps/compare/zigbee2mqtt-2.0.6...zigbee2mqtt-2.0.7) (2022-03-20)
+
+#### Fix
+
+* Remove configmap and provide questions for basic setup to get up and running ([#2225](https://github.com/truecharts/apps/issues/2225))
+
+
+
 <a name="zigbee2mqtt-2.0.6"></a>
 ### [zigbee2mqtt-2.0.6](https://github.com/truecharts/apps/compare/zigbee2mqtt-2.0.5...zigbee2mqtt-2.0.6) (2022-03-19)
 
diff --git a/docs/apps/stable/zigbee2mqtt/helm-values.md b/docs/apps/stable/zigbee2mqtt/helm-values.md
index fc9a12322ac..1b3d6b8a4d6 100644
--- a/docs/apps/stable/zigbee2mqtt/helm-values.md
+++ b/docs/apps/stable/zigbee2mqtt/helm-values.md
@@ -11,11 +11,13 @@ You will, however, be able to use all values referenced in the common chart here
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| config | object | See values.yaml | zigbee2mqtt configuration settings. This will be copied into the container's persistent storage at first run only. Further configuration should be done in the application itself! See [project documentation](https://www.zigbee2mqtt.io/information/configuration.html) for more information. these are mostly just defaults and any further tweaking should be done using env-vars |
+| env.ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API | bool | `true` |  |
+| env.ZIGBEE2MQTT_CONFIG_FRONTEND_PORT | string | `"{{ .Values.service.main.ports.main.port }}"` |  |
 | env.ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC | string | `"zigbee2mqtt"` |  |
 | env.ZIGBEE2MQTT_CONFIG_MQTT_SERVER | string | `"mqtt://localhost"` |  |
-| env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER | string | `"null"` |  |
-| env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT | string | `"/dev/ttyACM0"` |  |
+| env.ZIGBEE2MQTT_CONFIG_PERMIT_JOIN | bool | `true` |  |
+| env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER | string | `"auto"` |  |
+| env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT | string | `"/dev/ttyUSB0"` |  |
 | env.ZIGBEE2MQTT_DATA | string | `"/data"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"tccr.io/truecharts/zigbee2mqtt"` |  |
@@ -24,10 +26,9 @@ You will, however, be able to use all values referenced in the common chart here
 | persistence.data.mountPath | string | `"/data"` |  |
 | podSecurityContext.runAsGroup | int | `0` |  |
 | podSecurityContext.runAsUser | int | `0` |  |
-| secret.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD | string | `"password"` |  |
-| secret.ZIGBEE2MQTT_CONFIG_MQTT_USER | string | `"admin"` |  |
+| secret.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD | string | `""` |  |
+| secret.ZIGBEE2MQTT_CONFIG_MQTT_USER | string | `""` |  |
 | securityContext.runAsNonRoot | bool | `false` |  |
 | service.main.ports.main.port | int | `10103` |  |
-| service.main.ports.main.targetPort | int | `8080` |  |
 
 All Rights Reserved - The TrueCharts Project
diff --git a/docs/index.yaml b/docs/index.yaml
index 7be9d47aa69..da3b8317667 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -77779,6 +77779,38 @@ entries:
     - https://github.com/truecharts/apps/releases/download/zerotier-0.0.1/zerotier-0.0.1.tgz
     version: 0.0.1
   zigbee2mqtt:
+  - annotations:
+      truecharts.org/SCALE-support: "true"
+      truecharts.org/catagories: |
+        - media
+      truecharts.org/grade: U
+    apiVersion: v2
+    appVersion: 1.24.0
+    created: "2022-03-20T12:09:06.373990595Z"
+    dependencies:
+    - name: common
+      repository: https://truecharts.org
+      version: 9.1.6
+    description: Bridges events and allows you to control your Zigbee devices via
+      MQTT
+    digest: 320bac45bd501ce97d54f153d387d8eae31a64f3393b1286ed8ae39df3817722
+    home: https://github.com/truecharts/apps/tree/master/charts/stable/zigbee2mqtt
+    icon: https://truecharts.org/_static/img/appicons/zigbee2mqtt.png
+    keywords:
+    - zigbee
+    - mqtt
+    - home-assistant
+    kubeVersion: '>=1.16.0-0'
+    maintainers:
+    - email: info@truecharts.org
+      name: TrueCharts
+      url: https://truecharts.org
+    name: zigbee2mqtt
+    sources:
+    - https://github.com/Koenkk/zigbee2mqtt
+    urls:
+    - https://github.com/truecharts/apps/releases/download/zigbee2mqtt-2.0.7/zigbee2mqtt-2.0.7.tgz
+    version: 2.0.7
   - annotations:
       truecharts.org/SCALE-support: "true"
       truecharts.org/catagories: |
@@ -78609,4 +78641,4 @@ entries:
     urls:
     - https://github.com/truecharts/apps/releases/download/zwavejs2mqtt-9.0.24/zwavejs2mqtt-9.0.24.tgz
     version: 9.0.24
-generated: "2022-03-20T03:55:47.610388654Z"
+generated: "2022-03-20T12:09:06.382983571Z"