diff --git a/logserver/config/logstash.yml b/logserver/config/logstash.yml
index 1aed618..1f062eb 100644
--- a/logserver/config/logstash.yml
+++ b/logserver/config/logstash.yml
@@ -2,7 +2,7 @@
 # This file contains Logstash settings (not pipeline configuration)
 
 # Node name
-node.name: "${CONTAINER_NAME}_logstash"
+node.name: "logstash"
 
 # Pipeline settings
 pipeline.workers: 2
diff --git a/logserver/docker-compose.yml b/logserver/docker-compose.yml
index f99d19d..61ffe62 100644
--- a/logserver/docker-compose.yml
+++ b/logserver/docker-compose.yml
@@ -32,6 +32,7 @@ services:
       - "LS_JAVA_OPTS=-Xms${LS_HEAP_SIZE:-1g} -Xmx${LS_HEAP_SIZE:-1g}"
       - "xpack.monitoring.enabled=false"
       - ELASTIC_PASSWORD=${ELASTIC_PASSWORD:-${KIBANA_PASSWORD:-changeme}}
+      - CONTAINER_NAME=${CONTAINER_NAME}
     command: logstash -f /usr/share/logstash/config/logstash.conf
     volumes:
       - ${CONFIG_PATH}:/usr/share/logstash/config