diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
index f2d34ad715..4f31399738 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64"
 else
-	CROS_WORKON_COMMIT="e4965ec33d06f0c71622aad59d5f59f9aaca7c00"  # v0.1.2
+	CROS_WORKON_COMMIT="5185fe48dafd601917660c4df41ed0c3332e5f98"  # v0.1.2
 	KEYWORDS="amd64"
 fi
 
@@ -35,4 +35,6 @@ src_compile() {
 
 src_install() {
 	dobin ${S}/bin/coreos-cloudinit
+	systemd_dounit "${FILESDIR}"/coreos-cloudinit-oem.service
+	systemd_enable_service default.target coreos-cloudinit-oem.service
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service
new file mode 100644
index 0000000000..7f6aa1e3d6
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=coreos-cloudinit for /usr/share/oem/cloud-config.yml
+Requires=dbus.service
+After=dbus.service
+Requires=coreos-setup-environment.service
+After=coreos-setup-environment.service
+RequiresMountsFor=/usr/share/oem
+ConditionPathExists=/usr/share/oem/cloud-config.yml
+ 
+# We use this to start etcd, since cloudinit will reconfigure etcd
+#Wants=etcd.service
+#After=etcd.service
+ 
+[Service]
+Type=oneshot
+EnvironmentFile=/etc/environment
+# XXX: We could not figure out a better way. The above Wants/After does not do this. 
+ExecStartPre=/usr/bin/coreos-cloudinit --from-file=/usr/share/oem/cloud-config.yml 
+ExecStart=/usr/bin/systemctl daemon-reload
+ExecStartPost=/usr/bin/systemctl start etcd
+ 
+[Install]
+WantedBy=multi-user.target
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 8f3223dca5..930b1bae14 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
@@ -52,7 +52,6 @@ src_install() {
 	systemd_enable_service basic.target coreos-startup.target
 
 	# Services!
-	systemd_enable_service default.target coreos-cloudinit-oem.service
 	systemd_enable_service default.target local-enable.service
 	systemd_enable_service default.target sshd-keygen.service
 	systemd_enable_service default.target sshd.socket