diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1-r8.ebuild
new file mode 120000
index 0000000000..3cf57b4e08
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1-r8.ebuild
@@ -0,0 +1 @@
+etcd-lib-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/etcd-lib/etcd-lib-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1.ebuild
similarity index 71%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/etcd-lib/etcd-lib-0.0.1-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1.ebuild
index c0b1e73f50..87caf5999a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/etcd-lib/etcd-lib-0.0.1-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1.ebuild
@@ -31,11 +31,8 @@ src_install() {
 	systemd_dounit "${S}"/etcd@.service
 	dodir /usr/lib/etcd/
 	insinto /usr/lib/etcd/
-	doins -r "${S}"/*
+	cp -Ra "${S}"/* ${D}/usr/lib/etcd/
 
-	# TODO(philips): fix this up in core once we finish the final layout
-	dodir /mnt/stateful_partition/containers
-	dodir /mnt/stateful_partition/systemd-rest
-	dosym /mnt/stateful_partition/containers /var/lib/containers
-	dosym /mnt/stateful_partition/systemd-rest /var/lib/systemd-rest
+	dodir /var/lib/containers
+	dodir /var/lib/systemd-rest
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1-r3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1-r3.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1.ebuild
index 331d606dfa..8033fda479 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/systemd-rest/systemd-rest-0.0.1.ebuild
@@ -8,7 +8,7 @@ EAPI=2
 CROS_WORKON_PROJECT="coreos/systemd-rest"
 CROS_WORKON_LOCALNAME="systemd-rest"
 CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_COMMIT="3eb21f4f355fa3f8049fe18fce9d2b9530deaf63"
+CROS_WORKON_COMMIT="d1da3004cdbe19afcc7a81d274085efd0b73ba64"
 inherit toolchain-funcs cros-workon systemd
 
 DESCRIPTION="systemd over rest"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r4.ebuild
new file mode 120000
index 0000000000..f7b4679fcd
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r4.ebuild
@@ -0,0 +1 @@
+coreos-init-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
index b09f33015b..7421eabe79 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-CROS_WORKON_COMMIT="42a2dc50a0d170611bb5681948a454a81f455573"
+CROS_WORKON_COMMIT="1a02594160810ace0059ad3c9a7bcfae00ebe934"
 CROS_WORKON_PROJECT="coreos/init"
 CROS_WORKON_LOCALNAME="init"
 
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 c829b0763a..fba8321195 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
@@ -150,7 +150,7 @@ RDEPEND="${RDEPEND}
 	app-admin/systemd-rest
 	app-admin/etcd
 	app-admin/etcd-client
-	coreos-base/etcd-lib
+	app-admin/etcd-lib
 	coreos-base/crosh
 	sys-apps/util-linux
 	sys-auth/pam_pwdfile