diff --git a/init/arch/waagent.service b/init/arch/waagent.service
index d426eb219..fdce05640 100644
--- a/init/arch/waagent.service
+++ b/init/arch/waagent.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Azure Linux Agent
 Wants=network-online.target sshd.service sshd-keygen.service
-After=network-online.target
+After=network-online.target cloud-init.service
 
 ConditionFileIsExecutable=/usr/bin/waagent
 ConditionPathExists=/etc/waagent.conf
diff --git a/init/clearlinux/waagent.service b/init/clearlinux/waagent.service
index 9afee4544..a0d98b52c 100644
--- a/init/clearlinux/waagent.service
+++ b/init/clearlinux/waagent.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Azure Linux Agent
 Wants=network-online.target sshd.service sshd-keygen.service
-After=network-online.target
+After=network-online.target cloud-init.service
 
 ConditionFileIsExecutable=/usr/bin/waagent
 ConditionPathExists=/usr/share/defaults/waagent/waagent.conf
diff --git a/init/redhat/waagent.service b/init/redhat/waagent.service
index 2c6ac5d82..64a2bc9f6 100644
--- a/init/redhat/waagent.service
+++ b/init/redhat/waagent.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Azure Linux Agent
 Wants=network-online.target sshd.service sshd-keygen.service
-After=network-online.target
+After=network-online.target cloud-init.service
 
 ConditionFileIsExecutable=/usr/sbin/waagent
 ConditionPathExists=/etc/waagent.conf
diff --git a/init/sles/waagent.service b/init/sles/waagent.service
index 39d01d1c4..34932cb2d 100644
--- a/init/sles/waagent.service
+++ b/init/sles/waagent.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Azure Linux Agent
 Wants=network-online.target sshd.service sshd-keygen.service
-After=network-online.target
+After=network-online.target cloud-init.service
 
 ConditionFileIsExecutable=/usr/sbin/waagent
 ConditionPathExists=/etc/waagent.conf
diff --git a/init/waagent.service b/init/waagent.service
index e91f1433b..66509a196 100644
--- a/init/waagent.service
+++ b/init/waagent.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Azure Linux Agent
 Wants=network-online.target sshd.service sshd-keygen.service
-After=network-online.target
+After=network-online.target cloud-init.service
 
 ConditionFileIsExecutable=/usr/sbin/waagent
 ConditionPathExists=/etc/waagent.conf