diff --git a/README.md b/README.md
index 5178e2b4..5c3d45f9 100644
--- a/README.md
+++ b/README.md
@@ -1141,10 +1141,10 @@ SOFTWARE.
 [wireguard-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [wireguard-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [wireguard-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/v0.4.2
-[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/v0.4.2/README.md
+[addon-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/v0.5.0
+[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/v0.5.0/README.md
 [zwave2mqtt-issue]: https://github.com/hassio-addons/addon-zwave2mqtt/issues
-[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-v0.4.2-blue.svg
+[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-v0.5.0-blue.svg
 [zwave2mqtt-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/zwave2mqtt-armhf.svg
 [zwave2mqtt-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [zwave2mqtt-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/zwave2mqtt/CHANGELOG.md b/zwave2mqtt/CHANGELOG.md
index cb575ecb..86b7a2c6 100644
--- a/zwave2mqtt/CHANGELOG.md
+++ b/zwave2mqtt/CHANGELOG.md
@@ -1,14 +1,39 @@
 [Full Changelog][changelog]
 
-This is a general maintenance release.
+🎉 Major update release!
+
+This upgrades the add-on to the latest Zwave2Mqtt (v2.2.0) using OpenZwave 1.6!
+
+It also means, we are now using the latest and greatest device database available, and are now able to keep up with the device database from the OpenZwave project.
 
 ### 🔨 Changes
 
-- :arrow_up: Upgrades Zwave2Mqtt to v2.0.6
-- :arrow_up: Upgrades add-on base image to v5.0.3
-- :books: Update add-on installation instructions
+- :fireworks: Updates maintenance/license year to 2020
+- :pencil2: Funding adjustments
+- :pencil2: Fixes some spelling and grammar
+- :arrow_up: Upgrades git to 2.24.1-r0
+- :arrow_up: Upgrades yarn to 1.19.2-r0
+- :arrow_up: Upgrades eudev to 3.2.9-r1
+- :arrow_up: Upgrades lua-resty-http to 0.15-r0
+- :arrow_up: Upgrades libusb to 1.0.23-r0
+- :arrow_up: Upgrades openzwave to 1.6.974-r0
+- :arrow_up: Upgrades openssl to 1.1.1d-r3
+- :ambulance: Upgrade node-serialport on the fly for Node 12.x support
+- :pencil2: Fixes some spelling and grammar
+- :art: Config.json file formatting
+- :ambulance: Fix Patreon link
+- :arrow_up: Upgrades nginx to 1.16.1-r6
+- :arrow_up: Upgrades nodejs to 12.15.0-r1
+- :books: Update add-on documentation to use new YAML configuration format
+- :hammer: Re-branding
+- :hammer: Update add-on config with new password & list features
+- :hammer: Updates for upstream Supervisor changes
+- :arrow_up: Upgrades add-on base image to v7.0.2
+- :arrow_up: Upgrades open-zwave database to 2e18ba844ff75965819c0dad74817a3178dbe8da
+- :arrow_up: Upgrades Zwave2Mqtt to v2.2.0
+- :hammer: Don't use apk cache on cleanup
 
-[changelog]: https://github.com/hassio-addons/addon-zwave2mqtt/compare/v0.4.1...v0.4.2
+[changelog]: https://github.com/hassio-addons/addon-zwave2mqtt/compare/v0.4.2...v0.5.0
 
 Questions? Join our Discord server! https://discord.me/hassioaddons
 Enjoying my add-ons? Consider supporting my work: https://patreon.com/frenck
\ No newline at end of file
diff --git a/zwave2mqtt/README.md b/zwave2mqtt/README.md
index 425186ed..2eae0941 100644
--- a/zwave2mqtt/README.md
+++ b/zwave2mqtt/README.md
@@ -1,12 +1,12 @@
-# Community Hass.io Add-ons: Z-Wave to MQTT
+# Home Assistant Community Add-on: Z-Wave to MQTT
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
 [![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
 
-[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors]
 
-[![Support my work on Patreon][patreon-shield]][patreon]
+[![Support Frenck on Patreon][patreon-shield]][patreon]
 
 Fully configurable Z-Wave to MQTT gateway and control panel.
 
@@ -31,7 +31,7 @@ Some advantages and use-cases for this are:
 
 ## WARNING! THIS IS A BETA VERSION!
 
-This Hass.io Add-ons repository contains beta releases of add-ons.
+This Home Assistant Add-ons repository contains beta releases of add-ons.
 
 - They might stop working at any time.
 - They could have a negative impact on your system.
@@ -45,18 +45,18 @@ If you are more interested in stable releases of our add-ons:
 
 <https://github.com/hassio-addons/repository>
 
-[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
-[buymeacoffee]: https://www.buymeacoffee.com/frenck
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/v0.4.2/README.md
+[docs]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/v0.5.0/README.md
 [esphome]: https://esphome.io/components/mqtt.html#on-message-trigger
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-z-wave-to-mqtt/115899?u=frenck
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg
-[patreon-shield]: https://www.frenck.nl/images/patreon.png
+[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
+[github-sponsors]: https://github.com/sponsors/frenck
+[logo]: https://github.com/hassio-addons/addon-zwave2mqtt/raw/master/zwave2mqtt/logo.png
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg
+[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-v0.4.2-blue.svg
-[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/v0.4.2
-[logo]: https://github.com/hassio-addons/addon-zwave2mqtt/raw/master/zwave2mqtt/logo.png
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-v0.5.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/v0.5.0
\ No newline at end of file
diff --git a/zwave2mqtt/config.json b/zwave2mqtt/config.json
index a04e7d49..8d100067 100644
--- a/zwave2mqtt/config.json
+++ b/zwave2mqtt/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Z-Wave to MQTT",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "slug": "zwave2mqtt",
   "description": "Fully configurable Z-Wave to MQTT gateway and control panel",
   "url": "https://github.com/hassio-addons/addon-zwave2mqtt",
@@ -35,7 +35,7 @@
     "keyfile": "privkey.pem"
   },
   "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
+    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str",