diff --git a/docker-compose.elk.yml.dist b/docker-compose.elk.yml.dist
index 6c414e1c..75ffa10e 100644
--- a/docker-compose.elk.yml.dist
+++ b/docker-compose.elk.yml.dist
@@ -18,7 +18,7 @@ services:
     - ./config/:/tmp/docker-mailserver/
     environment:
     - ENABLE_FAIL2BAN=1
-    - ENABLE_ELK=1
+    - ENABLE_ELK_FORWARDER=1
     cap_add:
     - NET_ADMIN
   elk:
diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index 5bead6c4..afd4213b 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -354,10 +354,10 @@ if [ "$ONE_DIR" = 1 -a -d $statedir ]; then
     fi
   done
 fi
-if [ "$ENABLE_ELK" = 1 ]; then
+if [ "$ENABLE_ELK_FORWARDER" = 1 ]; then
 ELK_PORT=${ELK_PORT:="10514"}
 ELK_HOST=${ELK_HOST:="elk"}
-echo "forward logs to ELK ($ELK_HOST:$ELK_PORT)"
+echo "Enabling log forwarding to ELK ($ELK_HOST:$ELK_PORT)"
 echo " *.* @$ELK_HOST:$ELK_PORT " > /etc/rsyslog.d/60-elk.conf
 else 
   rm -f /etc/rsyslog.d/60-elk.conf