diff --git a/service/etcd.yaml b/service/etcd.yaml
index e56305e..c7a202c 100644
--- a/service/etcd.yaml
+++ b/service/etcd.yaml
@@ -11,4 +11,4 @@ service:
         liveness: "true"
       daemon:
         command: etcd --listen-client-urls http://0.0.0.0:{{ etcd_client_port }}
-                      --advertise-client-urls {{ etcd_urls }}
+                      --advertise-client-urls {{ address("etcd") }}:{{ etcd_client_port }}
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 1c0f527..323c596 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,5 +1,4 @@
 configs:
-  etcd_urls: http://etcd:2379
   etcd_connection_attempts: 20
   etcd_connection_delay: 5
   etcd_client_port: 2379