diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r6.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r6.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
index cea2c6d6c1..5e96f070ea 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.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="9b03ebb14f931b132963088a11dd41d7425e7b2f"
+CROS_WORKON_COMMIT="0935d44747e8b336a2e85db02adb589bb75d399e"
 CROS_WORKON_PROJECT="coreos/init"
 CROS_WORKON_LOCALNAME="init"
 
@@ -20,21 +20,24 @@ IUSE="nfs"
 
 DEPEND=""
 RDEPEND="
-    sys-block/parted
-    sys-apps/gptfdisk
-    sys-apps/systemd
-    "
+	sys-block/parted
+	sys-apps/gptfdisk
+	sys-apps/systemd
+	"
 
 src_install() {
-	into /	# We want /sbin, not /usr/sbin, etc.
+	# Install our boot scripts along side systemd in /usr/lib
+	exeinto /usr/lib/coreos
+	for script in scripts/*; do
+		doexe "${script}"
+	done
 
-	dosbin coreos_startup
+	# Install all units, enable the higher-level services
+	for unit in systemd/*; do
+		systemd_dounit "${unit}"
+	done
 
-	systemd_dounit coreos-startup.service
 	systemd_enable_service basic.target coreos-startup.service
-
-	systemd_dounit update-engine.service
 	systemd_enable_service multi-user.target update-engine.service
-
 	systemd_enable_service multi-user.target sshd.socket
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
index 1d73344884..803af03fc9 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -18,18 +18,25 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="nfs"
 
 DEPEND=""
-RDEPEND="sys-apps/systemd"
+RDEPEND="
+	sys-block/parted
+	sys-apps/gptfdisk
+	sys-apps/systemd
+	"
 
 src_install() {
-	into /	# We want /sbin, not /usr/sbin, etc.
+	# Install our boot scripts along side systemd in /usr/lib
+	exeinto /usr/lib/coreos
+	for script in scripts/*; do
+		doexe "${script}"
+	done
 
-	dosbin coreos_startup
+	# Install all units, enable the higher-level services
+	for unit in systemd/*; do
+		systemd_dounit "${unit}"
+	done
 
-	systemd_dounit coreos-startup.service
 	systemd_enable_service basic.target coreos-startup.service
-
-	systemd_dounit update-engine.service
 	systemd_enable_service multi-user.target update-engine.service
-
 	systemd_enable_service multi-user.target sshd.socket
 }