diff --git a/compose/docker-compose-master.yaml b/compose/docker-compose-master.yaml
index e35a858f..5a2519e5 100644
--- a/compose/docker-compose-master.yaml
+++ b/compose/docker-compose-master.yaml
@@ -43,7 +43,7 @@ services:
       ETCD_DATA_DIR: /etcd_data
       ETCD_ENABLE_V2: "true"
       ALLOW_NONE_AUTHENTICATION: "yes"
-      ETCD_ADVERTISE_CLIENT_URLS: "http://0.0.0.0:2379"
+      ETCD_ADVERTISE_CLIENT_URLS: "http://etcd:2379"
       ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379"
     ports:
       - "2379:2379/tcp"
diff --git a/compose/docker-compose-release.yaml b/compose/docker-compose-release.yaml
index bd9554c8..c36474b3 100644
--- a/compose/docker-compose-release.yaml
+++ b/compose/docker-compose-release.yaml
@@ -43,7 +43,7 @@ services:
       ETCD_DATA_DIR: /etcd_data
       ETCD_ENABLE_V2: "true"
       ALLOW_NONE_AUTHENTICATION: "yes"
-      ETCD_ADVERTISE_CLIENT_URLS: "http://0.0.0.0:2379"
+      ETCD_ADVERTISE_CLIENT_URLS: "http://etcd:2379"
       ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379"
     ports:
       - "2379:2379/tcp"