diff --git a/library/emqx b/library/emqx
index 112971be77353..a1655401eb245 100644
--- a/library/emqx
+++ b/library/emqx
@@ -8,8 +8,8 @@ GitCommit: 35e70c8e602687db5a447c9573bde8ab77335fdc
 Directory: 5.7
 File: Dockerfile
 
-Tags: 5.8.3, 5.8, 5, latest
+Tags: 5.8.4, 5.8, 5, latest
 Architectures: amd64, arm64v8
-GitCommit: 5ac2e927cf2111d81f32e027a09b554719b9558d
+GitCommit: 2f016465686acf8d3d8ac5d9470839e213a195b8
 Directory: 5.8
 File: Dockerfile