diff --git a/common/rootfs/etc/cont-init.d/zigbee2mqtt.sh b/common/rootfs/etc/cont-init.d/zigbee2mqtt.sh
index 4b3cb9c63..47ff3e0bb 100644
--- a/common/rootfs/etc/cont-init.d/zigbee2mqtt.sh
+++ b/common/rootfs/etc/cont-init.d/zigbee2mqtt.sh
@@ -60,6 +60,8 @@ fi
 CONFIG_PATH=/data/options.json
 bashio::log.info "Adjusting Zigbee2mqtt core yaml config with add-on quirks ..."
 cat "$CONFIG_PATH" | jq 'del(.data_path, .zigbee_shepherd_devices, .socat)' \
+    | jq 'if .devices then .devices = (.devices | split(",")|map(gsub("\\s+";"";"g"))) else . end' \
+    | jq 'if .groups then .groups = (.groups | split(",")|map(gsub("\\s+";"";"g"))) else . end' \
     | jq 'if .advanced.ext_pan_id_string then .advanced.ext_pan_id = (.advanced.ext_pan_id_string | (split(",")|map(tonumber))) | del(.advanced.ext_pan_id_string) else . end' \
     | jq 'if .advanced.network_key_string then .advanced.network_key = (.advanced.network_key_string | (split(",")|map(tonumber))) | del(.advanced.network_key_string) else . end' \
     | jq 'if .device_options_string then .device_options = (.device_options_string|fromjson) | del(.device_options_string) else . end' \
diff --git a/zigbee2mqtt-edge/config.json b/zigbee2mqtt-edge/config.json
index 4f52f1ad4..7dfa798d3 100644
--- a/zigbee2mqtt-edge/config.json
+++ b/zigbee2mqtt-edge/config.json
@@ -91,7 +91,8 @@
       "keepalive": "int?",
       "version": "int?",
       "reject_unauthorized": "bool?",
-      "include_device_information": "bool?"
+      "include_device_information": "bool?",
+      "force_disable_retain": "bool?"
     },
     "serial": {
       "port": "str",
@@ -154,6 +155,7 @@
       "new_api": "bool?"
     },
     "frontend": {
+      "host": "str?",
       "port": "int?"
     },
     "socat": {
diff --git a/zigbee2mqtt/CHANGELOG.md b/zigbee2mqtt/CHANGELOG.md
index 25bc63180..5f6e93927 100644
--- a/zigbee2mqtt/CHANGELOG.md
+++ b/zigbee2mqtt/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.16.2
+- Updated Zigbee2mqtt to version [`1.16.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.16.2)
+- New configuration options
+    - `mqtt`
+        - `force_disable_retain`
+    - `frontend`
+        - `host`
+- `devices` and `groups` options now accept a comma-separated string of files
+
 ## 1.16.1-1
 - Allow add-on to start with other mqtt servers not just built in
 
diff --git a/zigbee2mqtt/DOCS.md b/zigbee2mqtt/DOCS.md
index e681ef002..7203b541f 100644
--- a/zigbee2mqtt/DOCS.md
+++ b/zigbee2mqtt/DOCS.md
@@ -70,6 +70,7 @@ When set, the add-on will scan your `data_path` for a `devices.js` file, and wil
 - Depending on your configuration, the MQTT server config may need to include the port, typically `1883` or `8883` for SSL communications. For example, `mqtt://core-mosquitto:1883` for Home Assistant's Mosquitto add-on.
 - To find out which serial ports you have exposed go to **Supervisor → System → Host system → ⋮ → Hardware**
 - Please see this add-on's [documentation on GitHub](https://github.com/zigbee2mqtt/hassio-zigbee2mqtt/blob/dev/zigbee2mqtt/DOCS.md#socat) for further add-on-specific information (using Socat, how to add support for new devices etc.).
+- The 'devices' and 'groups' configuration options accept arrays of files since Zigbee2MQTT v1.16.2. In order to maintain backwards compatibility of configurations, the same functionality is achieved in this addon by the use of comma-separated strings.
 
 # Additional Configuration Options
 - `network_key_string`  
@@ -98,4 +99,4 @@ You can configure the socat module within the socat section using the following
 - `options` extra options added to the socat command line (optional)
 - `log` true/false if to log the socat stdout/stderr to data_path/socat.log (default: false)
 
-**NOTE:** You'll have to change both the `master` and the `slave` options according to your needs. The defaults values will make sure that socat listens on port `8485` and redirects its output to `/dev/ttyZ2M`. The zigbee2mqtt's serial port setting is NOT automatically set and has to be changed accordingly.
\ No newline at end of file
+**NOTE:** You'll have to change both the `master` and the `slave` options according to your needs. The defaults values will make sure that socat listens on port `8485` and redirects its output to `/dev/ttyZ2M`. The zigbee2mqtt's serial port setting is NOT automatically set and has to be changed accordingly.
diff --git a/zigbee2mqtt/config.json b/zigbee2mqtt/config.json
index 8300ae10d..41c61eeb2 100644
--- a/zigbee2mqtt/config.json
+++ b/zigbee2mqtt/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Zigbee2mqtt",
-  "version": "1.16.1-1",
+  "version": "1.16.2",
   "slug": "zigbee2mqtt",
   "description": "Zigbee2mqtt add-on",
   "auto_uart": true,
@@ -91,7 +91,8 @@
       "keepalive": "int?",
       "version": "int?",
       "reject_unauthorized": "bool?",
-      "include_device_information": "bool?"
+      "include_device_information": "bool?",
+      "force_disable_retain": "bool?"
     },
     "serial": {
       "port": "str",
@@ -154,6 +155,7 @@
       "new_api": "bool?"
     },
     "frontend": {
+      "host": "str?",
       "port": "int?"
     },
     "socat": {