diff --git a/etcd/templates/etcd.j2 b/etcd/templates/etcd.j2
index 0e9ac1ba..882b5060 100644
--- a/etcd/templates/etcd.j2
+++ b/etcd/templates/etcd.j2
@@ -4,7 +4,7 @@ ETCD_LOG_OUTPUTS="stdout"
 ETCD_LISTEN_PEER_URLS="http://{{ etcd_peer_hosts }}:{{ etcd_peer_port }}"
 ETCD_LISTEN_CLIENT_URLS="http://localhost:{{ etcd_client_port }},http://{{ etcd_listen_ip }}:{{ etcd_client_port }}"
 ETCD_INITIAL_ADVERTISE_PEER_URLS="http://{{ etcd_listen_ip }}:{{ etcd_peer_port }}"
-ETCD_INITIAL_CLUSTER="{{ etcd_local_name }}=http://{{ etcd_cluster_ips }}:{{ etcd_peer_port }},"
+ETCD_INITIAL_CLUSTER="{{ etcd_initial_cluster }},"
 ETCD_ADVERTISE_CLIENT_URLS="http://{{ etcd_listen_ip }}:{{ etcd_client_port }}"
 ETCD_INITIAL_CLUSTER_TOKEN="{{ etcd_cluster_token }}"
 ETCD_INITIAL_CLUSTER_STATE="new"