diff --git a/ecs/bin/ejabberdctl b/ecs/bin/ejabberdctl
index 055ae8b..ac71534 100755
--- a/ecs/bin/ejabberdctl
+++ b/ecs/bin/ejabberdctl
@@ -8,7 +8,7 @@ ERL_PROCESSES=250000
 ERL_MAX_ETS_TABLES=1400
 FIREWALL_WINDOW="4370-4379"
 INET_DIST_INTERFACE=""
-ERLANG_NODE=ejabberd@$(hostname -s)
+ERLANG_NODE=ejabberd@localhost
 EJABBERD_BYPASS_WARNINGS=true
 
 # define default environment variables
diff --git a/ecs/conf/ejabberdctl.cfg b/ecs/conf/ejabberdctl.cfg
index 45e8838..eef596e 100644
--- a/ecs/conf/ejabberdctl.cfg
+++ b/ecs/conf/ejabberdctl.cfg
@@ -130,7 +130,7 @@
 #
 # Default: ejabberd@localhost
 #
-#ERLANG_NODE=ejabberd@$(hostname)
+#ERLANG_NODE=ejabberd@$(hostname -s)
 
 #.
 #' ERLANG_COOKIE: Erlang cookie for inter-node communication