diff --git a/README.md b/README.md
index 25f22e85..0c362531 100644
--- a/README.md
+++ b/README.md
@@ -1011,10 +1011,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-zwave-js-ui]: https://github.com/hassio-addons/addon-zwave-js-ui/tree/v1.14.0
-[addon-doc-zwave-js-ui]: https://github.com/hassio-addons/addon-zwave-js-ui/blob/v1.14.0/README.md
+[addon-zwave-js-ui]: https://github.com/hassio-addons/addon-zwave-js-ui/tree/v1.15.0
+[addon-doc-zwave-js-ui]: https://github.com/hassio-addons/addon-zwave-js-ui/blob/v1.15.0/README.md
 [zwave-js-ui-issue]: https://github.com/hassio-addons/addon-zwave-js-ui/issues
-[zwave-js-ui-version-shield]: https://img.shields.io/badge/version-v1.14.0-blue.svg
+[zwave-js-ui-version-shield]: https://img.shields.io/badge/version-v1.15.0-blue.svg
 [zwave-js-ui-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [zwave-js-ui-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [zwave-js-ui-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/zwave-js-ui/CHANGELOG.md b/zwave-js-ui/CHANGELOG.md
index 9bdb842a..45d83cd0 100644
--- a/zwave-js-ui/CHANGELOG.md
+++ b/zwave-js-ui/CHANGELOG.md
@@ -1,7 +1,11 @@
 ## What’s changed
 
+## 🚀 Enhancements
+
+- Extend timeout on shutdown @frenck ([#537](https://github.com/hassio-addons/addon-zwave-js-ui/pull/537))
+
 ## ⬆️ Dependency updates
 
-- ⬆️ Update ghcr.io/hassio-addons/base Docker tag to v14.0.2 @renovate ([#534](https://github.com/hassio-addons/addon-zwave-js-ui/pull/534))
-- ⬆️ Update zwave-js/zwave-js-ui to v8.19.0 @renovate ([#535](https://github.com/hassio-addons/addon-zwave-js-ui/pull/535))
-- ⬆️ Update alpine_3_18/nodejs to v18.16.1-r0 @renovate ([#536](https://github.com/hassio-addons/addon-zwave-js-ui/pull/536))
+- ⬆️ Update zwave-js/zwave-js-ui to v8.20.0 @renovate ([#539](https://github.com/hassio-addons/addon-zwave-js-ui/pull/539))
+- ⬆️ Update ghcr.io/hassio-addons/base Docker tag to v14.0.3 @renovate ([#540](https://github.com/hassio-addons/addon-zwave-js-ui/pull/540))
+- ⬆️ Update zwave-js/zwave-js-ui to v8.21.0 @renovate ([#541](https://github.com/hassio-addons/addon-zwave-js-ui/pull/541))
diff --git a/zwave-js-ui/README.md b/zwave-js-ui/README.md
index d71ad01e..0599f6dd 100644
--- a/zwave-js-ui/README.md
+++ b/zwave-js-ui/README.md
@@ -59,6 +59,6 @@ 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-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v1.14.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-zwave-js-ui/tree/v1.14.0
+[release-shield]: https://img.shields.io/badge/version-v1.15.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-zwave-js-ui/tree/v1.15.0
 [zwave-js-ui]: https://github.com/zwave-js/zwave-js-ui
\ No newline at end of file
diff --git a/zwave-js-ui/config.yaml b/zwave-js-ui/config.yaml
index c9e6d85b..2539e066 100644
--- a/zwave-js-ui/config.yaml
+++ b/zwave-js-ui/config.yaml
@@ -1,5 +1,5 @@
 name: Z-Wave JS UI
-version: 1.14.0
+version: 1.15.0
 slug: zwavejs2mqtt
 description: Fully configurable Z-Wave JS gateway and control panel
 url: https://github.com/hassio-addons/addon-zwave-js-ui
@@ -10,6 +10,7 @@ panel_title: Z-Wave JS
 panel_icon: mdi:z-wave
 startup: system
 init: false
+timeout: 30
 arch:
 - aarch64
 - amd64