diff --git a/apps/emqx/5.8.0/docker-compose.yml b/apps/emqx/5.8.0/docker-compose.yml
index aed98ceb0..3ab1a2c85 100644
--- a/apps/emqx/5.8.0/docker-compose.yml
+++ b/apps/emqx/5.8.0/docker-compose.yml
@@ -15,6 +15,8 @@ services:
     volumes:
       - ./data:/opt/emqx/data
       - ./log:/opt/emqx/log
+    environment:
+      - EMQX_NODE_NAME=emqx@${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
 networks: