diff --git a/README.md b/README.md
index 159faffb6..baf329129 100644
--- a/README.md
+++ b/README.md
@@ -843,10 +843,10 @@ SOFTWARE.
 [bookstack-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [bookstack-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [bookstack-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
-[addon-emqx]: https://github.com/hassio-addons/addon-emqx/tree/4cd6579
-[addon-doc-emqx]: https://github.com/hassio-addons/addon-emqx/blob/4cd6579/README.md
+[addon-emqx]: https://github.com/hassio-addons/addon-emqx/tree/99489ba
+[addon-doc-emqx]: https://github.com/hassio-addons/addon-emqx/blob/99489ba/README.md
 [emqx-issue]: https://github.com/hassio-addons/addon-emqx/issues
-[emqx-version-shield]: https://img.shields.io/badge/version-4cd6579-blue.svg
+[emqx-version-shield]: https://img.shields.io/badge/version-99489ba-blue.svg
 [emqx-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [emqx-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [emqx-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
diff --git a/emqx/CHANGELOG.md b/emqx/CHANGELOG.md
index e8403874d..658fcb235 100644
--- a/emqx/CHANGELOG.md
+++ b/emqx/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Changelog since v0.7.2
+- ⬆️ Update emqx/emqx to v5.8.4 (#125) 
 - ⬆️ Update ghcr.io/hassio-addons/debian-base Docker tag to v7.6.2 (#124)
 
 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
diff --git a/emqx/README.md b/emqx/README.md
index 045ba2a49..6b0e6e3b3 100644
--- a/emqx/README.md
+++ b/emqx/README.md
@@ -56,6 +56,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-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-4cd6579-blue.svg
-[release]: https://github.com/hassio-addons/addon-emqx/tree/4cd6579
+[release-shield]: https://img.shields.io/badge/version-99489ba-blue.svg
+[release]: https://github.com/hassio-addons/addon-emqx/tree/99489ba
 [screenshot]: https://github.com/hassio-addons/addon-emqx/raw/main/images/screenshot.png
\ No newline at end of file
diff --git a/emqx/config.yaml b/emqx/config.yaml
index e80c391b2..3ae83b9f8 100644
--- a/emqx/config.yaml
+++ b/emqx/config.yaml
@@ -1,5 +1,5 @@
 name: EMQX
-version: 4cd6579
+version: 99489ba
 slug: emqx
 description: The most scalable open-source MQTT broker for IoT. An alternative for
   the Mosquitto add-on