diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1-r3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1-r3.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1.ebuild
index 4db7fa0856..4ff9ee9872 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1.ebuild
@@ -35,4 +35,7 @@ src_install() {
 	dosbin ${S}/${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_enable_service multi-user.target ${PN}.service
+
+	systemd_dounit "${FILESDIR}"/${PN}-bootstrap.service
+	systemd_enable_service multi-user.target ${PN}-bootstrap.service
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd-bootstrap.service b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd-bootstrap.service
new file mode 100644
index 0000000000..9ac1e53e75
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd-bootstrap.service
@@ -0,0 +1,7 @@
+[Service]
+ExecStart=/usr/lib/etcd/host/doozerd/configure.sh
+Before=etcd.service
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service
index 9de00d84ec..1af7c18404 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service
@@ -1,5 +1,7 @@
 [Service]
-ExecStart=/usr/sbin/etcd -a doozer:?ca=1.d.core-os.net:8046
+ExecStart=/usr/sbin/etcd -a doozer:?ca=${DOOZERD_MASTER}:8046
+EnvironmentFile=/var/run/etcd/doozerd/EnvironmentFile
 
 [Install]
 WantedBy=multi-user.target
+