diff --git a/init.d/codedeploy-agent.service b/init.d/codedeploy-agent.service
index 72a47342..7b62eb6e 100644
--- a/init.d/codedeploy-agent.service
+++ b/init.d/codedeploy-agent.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=AWS CodeDeploy Host Agent
+Wants=network-online.target nss-lookup.target
+After=network-online.target nss-lookup.target
 
 [Service]
 Type=forking
-After=network.target
 ExecStart=/bin/bash -a -c '[ -f /etc/profile ] && source /etc/profile; /opt/codedeploy-agent/bin/codedeploy-agent start'
 ExecStop=/opt/codedeploy-agent/bin/codedeploy-agent stop
 RemainAfterExit=no