diff --git a/README.md b/README.md
index 2b41f4558..0cdb25c5b 100644
--- a/README.md
+++ b/README.md
@@ -1170,10 +1170,10 @@ SOFTWARE.
 [vscode-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [vscode-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
 [vscode-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
-[addon-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/93f58df
-[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/93f58df/README.md
+[addon-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/631d926
+[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/631d926/README.md
 [zwave2mqtt-issue]: https://github.com/hassio-addons/addon-zwave2mqtt/issues
-[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-93f58df-blue.svg
+[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-631d926-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 c01ec9a2f..f77b7adec 100644
--- a/zwave2mqtt/CHANGELOG.md
+++ b/zwave2mqtt/CHANGELOG.md
@@ -1,5 +1,5 @@
-# Changelog since v0.3.0
+# Changelog since v0.3.1
 
-2019/07/24 09:14 UTC - [93f58df](https://github.com/hassio-addons/addon-zwave2mqtt/commit/93f58dfac0f712780e24981fc120c2d494a3881b) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades Zwave2Mqtt to v2.0.2 
+2019/08/10 15:51 UTC - [631d926](https://github.com/hassio-addons/addon-zwave2mqtt/commit/631d926a56b1dc6d2c906b63f98ec5faf1a755fa) by [@frenck](https://github.com/frenck)
+> :arrow_up: Upgrades add-on base image to v4.0.3 
 
diff --git a/zwave2mqtt/README.md b/zwave2mqtt/README.md
index f93ff7403..5cb0af55e 100644
--- a/zwave2mqtt/README.md
+++ b/zwave2mqtt/README.md
@@ -52,7 +52,7 @@ If you are more interested in stable releases of our add-ons:
 [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/93f58df/README.md
+[docs]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/631d926/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
@@ -60,6 +60,6 @@ If you are more interested in stable releases of our add-ons:
 [patreon-shield]: https://www.frenck.nl/images/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-93f58df-blue.svg
-[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/93f58df
+[release-shield]: https://img.shields.io/badge/version-631d926-blue.svg
+[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/631d926
 [logo]: https://github.com/hassio-addons/addon-zwave2mqtt/raw/master/zwave2mqtt/logo.png
\ No newline at end of file
diff --git a/zwave2mqtt/config.json b/zwave2mqtt/config.json
index 35cc35201..4576868b7 100644
--- a/zwave2mqtt/config.json
+++ b/zwave2mqtt/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Z-Wave to MQTT",
-  "version": "93f58df",
+  "version": "631d926",
   "slug": "zwave2mqtt",
   "description": "Fully configurable Z-Wave to MQTT gateway and control panel",
   "url": "https://github.com/hassio-addons/addon-zwave2mqtt",