diff -rup cloud-init-18.3/systemd/cloud-init.service.tmpl cloud-init-18.3-new/systemd/cloud-init.service.tmpl
--- cloud-init-18.3/systemd/cloud-init.service.tmpl	2018-06-20 05:49:26.000000000 +0530
+++ cloud-init-18.3-new/systemd/cloud-init.service.tmpl	2018-09-20 20:13:57.640348280 +0530
@@ -1,7 +1,6 @@
 ## template:jinja
 [Unit]
 Description=Initial cloud-init job (metadata service crawler)
-DefaultDependencies=no
 Wants=cloud-init-local.service
 Wants=sshd-keygen.service
 Wants=sshd.service
@@ -21,15 +20,9 @@ After=wicked.service
 After=dbus.service
 {% endif %}
 Before=network-online.target
+After=systemd-networkd-wait-online.service
 Before=sshd-keygen.service
 Before=sshd.service
-{% if variant in ["ubuntu", "unknown", "debian"] %}
-Before=sysinit.target
-Conflicts=shutdown.target
-{% endif %}
-{% if variant in ["suse"] %}
-Conflicts=shutdown.target
-{% endif %}
 Before=systemd-user-sessions.service
 
 [Service]