diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
index 47ef1435cd..e462e212c2 100755
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
@@ -16,14 +16,16 @@ BOOTSTRAP="/var/run/etcd/bootstrap.config"
 
 [ ! -e $BOOTSTRAP ] && echo bootstrap config missing && exit 1
 
+CLUSTER_ARGS="-n $MY_IP -c $MY_IP:4001 -s $MY_IP:7001"
+
 # strip blank lines
 IPS=$(grep -v $MY_IP $BOOTSTRAP|grep -v '^\n$' |sed 's/$/:7001/'|tr '\n' ','|sed 's/^,//'|sed 's/,$//')
 
 if [ -z "$IPS" ]; then
         echo "becoming master..."
-        exec /usr/bin/etcd ${DEFAULT_ARGS} -h $MY_IP
+        exec /usr/bin/etcd ${DEFAULT_ARGS} ${CLUSTER_ARGS}
 else
         echo "trying $IPS"
         set -x
-        exec /usr/bin/etcd ${DEFAULT_ARGS} -h $MY_IP -C "$IPS"
+        exec /usr/bin/etcd ${DEFAULT_ARGS} ${CLUSTER_ARGS} -C "$IPS"
 fi