diff --git a/README.md b/README.md
index 4def1afe..5381d6f8 100644
--- a/README.md
+++ b/README.md
@@ -1191,10 +1191,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.6.0-beta.3
-[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/v0.6.0-beta.3/README.md
+[addon-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/v0.6.0-beta.4
+[addon-doc-zwave2mqtt]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/v0.6.0-beta.4/README.md
 [zwave2mqtt-issue]: https://github.com/hassio-addons/addon-zwave2mqtt/issues
-[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-v0.6.0-beta.3-blue.svg
+[zwave2mqtt-version-shield]: https://img.shields.io/badge/version-v0.6.0-beta.4-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 695c0ba9..d334d674 100644
--- a/zwave2mqtt/CHANGELOG.md
+++ b/zwave2mqtt/CHANGELOG.md
@@ -10,8 +10,10 @@
 - :hammer: Disable Docker init
 - :arrow_up: Upgrades open-zwave database to e3bae88
 - :ambulance: Correct database paths
+- :ambulance: Change database path again, update documentation with known issue
+- :arrow_up: Upgrades git to 2.24.2-r0
 
-[changelog]: https://github.com/hassio-addons/addon-zwave2mqtt/compare/v0.5.0...v0.6.0-beta.3
+[changelog]: https://github.com/hassio-addons/addon-zwave2mqtt/compare/v0.5.0...v0.6.0-beta.4
 
 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 b0326530..d77dc96d 100644
--- a/zwave2mqtt/README.md
+++ b/zwave2mqtt/README.md
@@ -47,7 +47,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/v0.6.0-beta.3/README.md
+[docs]: https://github.com/hassio-addons/addon-zwave2mqtt/blob/v0.6.0-beta.4/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/home-assistant-community-add-on-z-wave-to-mqtt/115899?u=frenck
@@ -58,5 +58,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-v0.6.0-beta.3-blue.svg
-[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/v0.6.0-beta.3
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-v0.6.0-beta.4-blue.svg
+[release]: https://github.com/hassio-addons/addon-zwave2mqtt/tree/v0.6.0-beta.4
\ No newline at end of file
diff --git a/zwave2mqtt/config.json b/zwave2mqtt/config.json
index 47f447de..27382562 100644
--- a/zwave2mqtt/config.json
+++ b/zwave2mqtt/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Z-Wave to MQTT",
-  "version": "0.6.0-beta.3",
+  "version": "0.6.0-beta.4",
   "slug": "zwave2mqtt",
   "description": "Fully configurable Z-Wave to MQTT gateway and control panel",
   "url": "https://github.com/hassio-addons/addon-zwave2mqtt",