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 133dfb43be..571b94741a 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
@@ -36,5 +36,7 @@ src_compile() {
 src_install() {
 	dobin ${S}/bin/coreos-cloudinit
 	systemd_dounit "${FILESDIR}"/coreos-cloudinit-oem.service
+	systemd_dounit "${FILESDIR}"/cloud-config.target
 	systemd_enable_service default.target coreos-cloudinit-oem.service
+	systemd_enable_service default.target cloud-config.target
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target
new file mode 100644
index 0000000000..71901cafd1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target
@@ -0,0 +1,6 @@
+[Unit]
+Requires=coreos-cloudinit-oem.service
+After=coreos-cloudinit-oem.service
+
+[Install]
+WantedBy=multi-user.target
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
index 7f6aa1e3d6..2731b2d2ed 100644
--- 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
@@ -7,17 +7,12 @@ 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
+WantedBy=cloudinit.target
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 6072824a15..fe68a02cf0 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
@@ -37,4 +37,5 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+	systemd_enable_service multi-user.target ${PN}.service
 }
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
index 946f52650d..30e941449e 100644
--- 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
@@ -1,8 +1,13 @@
 [Unit]
 Description=etcd
+After=cloud-config.target
+Wants=cloud-config.target
 
 [Service]
 User=etcd
 PermissionsStartOnly=true
 Environment=ETCD_DATA_DIR=/var/lib/etcd ETCD_NAME=default
 ExecStart=/usr/bin/etcd 
+
+[Install]
+WantedBy=multi-user.target