diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r12.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r11.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r12.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 a0e7496dfa..0cb40d500a 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="defdf1c8856372681c6e0be318beec8af7eb36be"
+CROS_WORKON_COMMIT="bd43c06a3b0eb14ed6d5f93af2a9dfafe060d8bc"
 CROS_WORKON_PROJECT="coreos/init"
 CROS_WORKON_LOCALNAME="init"
 
@@ -51,5 +51,14 @@ src_install() {
 		systemd_dounit "${unit}"
 	done
 
-	systemd_enable_service multi-user.target coreos-startup.target
+	# Set the default target to multi-user not graphical, this is CoreOS!
+	dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+
+	systemd_enable_service basic.target coreos-startup.target
+
+	# Services!
+	systemd_enable_service default.target local-enable.service
+	systemd_enable_service default.target dhcpcd.service
+	systemd_enable_service default.target sshd-keygen.service
+	systemd_enable_service default.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 742aeab6b8..35b24ce8b5 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
@@ -50,5 +50,14 @@ src_install() {
 		systemd_dounit "${unit}"
 	done
 
-	systemd_enable_service multi-user.target coreos-startup.target
+	# Set the default target to multi-user not graphical, this is CoreOS!
+	dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+
+	systemd_enable_service basic.target coreos-startup.target
+
+	# Services!
+	systemd_enable_service default.target local-enable.service
+	systemd_enable_service default.target dhcpcd.service
+	systemd_enable_service default.target sshd-keygen.service
+	systemd_enable_service default.target sshd.socket
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service
index cbd23b7efd..21a844dcd4 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service
@@ -11,4 +11,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r378.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r379.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r378.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r379.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild
index 05d11e9379..b76aca827d 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild
@@ -85,6 +85,7 @@ src_install() {
 	use delta_generator && dobin delta_generator
 
 	systemd_dounit "${FILESDIR}"/update-engine.service
+	systemd_enable_service multi-user.target update-engine.service
 
 	insinto /usr/share/dbus-1/services
 	doins org.chromium.UpdateEngine.service
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
index 85e96ae2b9..8ed2171b58 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
@@ -84,6 +84,7 @@ src_install() {
 	use delta_generator && dobin delta_generator
 
 	systemd_dounit "${FILESDIR}"/update-engine.service
+	systemd_enable_service multi-user.target update-engine.service
 
 	insinto /usr/share/dbus-1/services
 	doins org.chromium.UpdateEngine.service