diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.2-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.2-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.2-r2.ebuild
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 5dbfd97356..bd8027d41f 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,8 +36,7 @@ src_compile() {
 
 src_install() {
 	dobin ${S}/bin/coreos-cloudinit
-	systemd_dounit "${FILESDIR}"/coreos-cloudinit-oem.service
+	systemd_dounit "${FILESDIR}"/coreos-cloudinit@.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
index 71901cafd1..97029e1a36 100644
--- 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
@@ -1,6 +1,9 @@
 [Unit]
-Requires=coreos-cloudinit-oem.service
-After=coreos-cloudinit-oem.service
+# Load OEM and coreos-install cloud-configs by default
+Requires=coreos-cloudinit@usr-share-oem-cloud\x2dconfig.yml.service
+After=coreos-cloudinit@usr-share-oem-cloud\x2dconfig.yml.service
+Requires=coreos-cloudinit@var-lib-coreos\x2dinstall-user_data.service
+After=coreos-cloudinit@var-lib-coreos\x2dinstall-user_data.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
deleted file mode 100644
index 0c8c42b74c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=coreos-cloudinit for /usr/share/oem/cloud-config.yml
-Requires=dbus.service
-After=dbus.service
-RequiresMountsFor=/usr/share/oem
-ConditionPathExists=/usr/share/oem/cloud-config.yml
- 
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/coreos-cloudinit --from-file=/usr/share/oem/cloud-config.yml
- 
-[Install]
-WantedBy=multi-user.target
-WantedBy=cloudinit.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service
new file mode 100644
index 0000000000..1051bdb063
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Load cloud-config from %f
+Requires=dbus.service
+After=dbus.service
+RequiresMountsFor=%f
+ConditionFileNotEmpty=%f
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/coreos-cloudinit --from-file=%f
+ 
+[Install]
+WantedBy=cloud-config.target