diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r248.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r249.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r248.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r249.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index b8d7b89a8a..c18192d844 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -81,7 +81,7 @@ RDEPEND="${RDEPEND}
 # implementation based on whether protocol 2 is enabled or not.
 RDEPEND="${RDEPEND}
 	etcd_protocols_1? (
-		dev-db/etcd:1[etcd_protocols_2=]
+		dev-db/etcd:1
 		!etcd_protocols_2? ( dev-db/etcdctl )
 	)
 	etcd_protocols_2? ( dev-db/etcd:2 )
@@ -108,6 +108,7 @@ RDEPEND="${RDEPEND}
 	coreos-base/coreos-init
 	coreos-base/coreos-cloudinit
 	coreos-base/coretest
+	dev-db/etcd-starter
 	net-analyzer/nmap
 	net-firewall/ebtables
 	net-firewall/ipset
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild
similarity index 50%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild
index 7411e7b354..ffa3b6eef7 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.7-r3.ebuild
@@ -8,7 +8,7 @@ EAPI=4
 CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
-inherit coreos-doc toolchain-funcs cros-workon systemd
+inherit coreos-doc toolchain-funcs cros-workon
 
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
@@ -23,32 +23,17 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="1"
-IUSE="etcd_protocols_1 etcd_protocols_2"
-
-# Sanity check that this version is indeed wanted!
-REQUIRED_USE="etcd_protocols_${SLOT}"
 
 DEPEND=">=dev-lang/go-1.2"
-RDEPEND="!dev-db/etcd:0
-	!etcd_protocols_2? ( !dev-db/etcd:2 )"
+RDEPEND="!dev-db/etcd:0"
 
 src_compile() {
 	./build
 }
 
 src_install() {
-	local libexec="libexec/${PN}/internal_versions"
+	local libexec="libexec/${PN}/internal_versions/${SLOT}"
 
 	exeinto "/usr/${libexec}"
-	newexe "${S}/bin/${PN}" ${SLOT}
-
-	# protocol1 is default if protocol2 is disabled
-	if ! use etcd_protocols_2; then
-		dosym "../${libexec}/${SLOT}" /usr/bin/${PN}
-
-		systemd_dounit "${FILESDIR}"/${PN}.service
-		systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
-
-		coreos-dodoc -r Documentation/*
-	fi
+	doexe "${S}/bin/${PN}"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
index b459bcbb6b..30d7faeef4 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/etcd"
-inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd
+inherit coreos-doc coreos-go toolchain-funcs cros-workon
 
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
@@ -38,18 +38,14 @@ src_compile() {
 }
 
 src_install() {
-	local libexec="libexec/${PN}/internal_versions"
+	local libexec="libexec/${PN}/internal_versions/${SLOT}"
 
 	dobin ${WORKDIR}/gopath/bin/etcdctl
 	dobin ${WORKDIR}/gopath/bin/etcd-migrate
 	dobin ${WORKDIR}/gopath/bin/etcd-dump-logs
 
 	exeinto "/usr/${libexec}"
-	newexe "${WORKDIR}/gopath/bin/${PN}" ${SLOT}
-	dosym "../${libexec}/${SLOT}" /usr/bin/${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+	doexe "${WORKDIR}/gopath/bin/${PN}"
 
 	coreos-dodoc -r Documentation/*
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
deleted file mode 100644
index 721e9c9161..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d    /var/lib/etcd 0755 etcd etcd - -
-d    /var/run/etcd 0755 etcd etcd - -
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
deleted file mode 100644
index 4d12c4bcbb..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=etcd
-
-[Service]
-User=etcd
-PermissionsStartOnly=true
-Environment=ETCD_DATA_DIR=/var/lib/etcd
-Environment=ETCD_NAME=%m
-ExecStart=/usr/bin/etcd
-Restart=always
-RestartSec=10s
-LimitNOFILE=40000