$ git diff 3705bb5 -- systemd/
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
index b19eeae..9b3e88f 100644
--- a/systemd/cloud-init-local.service
+++ b/systemd/cloud-init-local.service
@@ -1,12 +1,14 @@
 [Unit]
 Description=Initial cloud-init job (pre-networking)
 DefaultDependencies=no
-Wants=local-fs.target
 Wants=network-pre.target
-After=local-fs.target
-Conflicts=shutdown.target
+After=systemd-remount-fs.service
+Before=basic.target
+Before=NetworkManager.service
 Before=network-pre.target
 Before=shutdown.target
+Conflicts=shutdown.target
+RequiresMountsFor=/var/lib
 
 [Service]
 Type=oneshot
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index 6fb655e..cde6ed8 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service
@@ -1,9 +1,18 @@
 [Unit]
 Description=Initial cloud-init job (metadata service crawler)
-After=cloud-init-local.service networking.service
-Before=network-online.target sshd.service sshd-keygen.service systemd-user-sessions.service
-Requires=networking.service
-Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service
+DefaultDependencies=no
+Wants=cloud-init-local.service
+Wants=sshd-keygen.service
+Wants=sshd.service
+After=cloud-init-local.service
+After=networking.service
+After=systemd-networkd-wait-online.service
+Before=network-online.target
+Before=sshd-keygen.service
+Before=sshd.service
+Before=sysinit.target
+Before=systemd-user-sessions.service
+Conflicts=shutdown.target
 
 [Service]
 Type=oneshot