diff --git a/README.md b/README.md
index 7f6e869dc..250f6cb34 100644
--- a/README.md
+++ b/README.md
@@ -1251,10 +1251,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/209a28a
-[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/209a28a/README.md
+[addon-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/58de2eb
+[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/58de2eb/README.md
 [zwave2mqtt-issue]: https://github.com/hassio-addons/addon-zwave2mqtt/issues
-[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-209a28a-blue.svg
+[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-58de2eb-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 215461bee..f005eea5b 100644
--- a/zwave2mqtt/CHANGELOG.md
+++ b/zwave2mqtt/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog since v0.4.2
+- :hammer: Don't use apk cache on cleanup 
+- :arrow_up: Upgrades Zwave2Mqtt to to 
+- :arrow_up: Upgrades open-zwave database to 2e18ba844ff75965819c0dad74817a3178dbe8da 
+- :arrow_up: Upgrades add-on base image to v7.0.2 
 - :hammer: Updates for upstream Supervisor changes 
 - :hammer: Update add-on config with new password & list features 
 - :hammer: Re-branding 
diff --git a/zwave2mqtt/README.md b/zwave2mqtt/README.md
index 83255cc55..6fd77a0db 100644
--- a/zwave2mqtt/README.md
+++ b/zwave2mqtt/README.md
@@ -50,7 +50,7 @@ If you are more interested in stable releases of our add-ons:
 
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/209a28a/README.md
+[docs]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/58de2eb/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
@@ -61,5 +61,5 @@ If you are more interested in stable releases of our add-ons:
 [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-209a28a-blue.svg
-[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/209a28a
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-58de2eb-blue.svg
+[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/58de2eb
\ No newline at end of file
diff --git a/zwave2mqtt/config.json b/zwave2mqtt/config.json
index 708d5522f..654327413 100644
--- a/zwave2mqtt/config.json
+++ b/zwave2mqtt/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Z-Wave to MQTT",
-  "version": "209a28a",
+  "version": "58de2eb",
   "slug": "zwave2mqtt",
   "description": "Fully configurable Z-Wave to MQTT gateway and control panel",
   "url": "https://github.com/hassio-addons/addon-zwave2mqtt",