diff --git a/packaging/linux/amazon-ssm-agent.service b/packaging/linux/amazon-ssm-agent.service
index 21e87650b8..cf42df560a 100644
--- a/packaging/linux/amazon-ssm-agent.service
+++ b/packaging/linux/amazon-ssm-agent.service
@@ -1,6 +1,9 @@
 [Unit]
-Description=amazon-ssm-agent
-After=network-online.target
+Description=Amazon SSM Agent
+Documentation=https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html
+Wants=network-online.target
+After=network-online.target nss-lookup.target cloud-init.target
+ConditionFileIsExecutable=/usr/bin/amazon-ssm-agent
 
 [Service]
 Type=simple
diff --git a/packaging/ubuntu/amazon-ssm-agent.service b/packaging/ubuntu/amazon-ssm-agent.service
index 21e87650b8..cf42df560a 100644
--- a/packaging/ubuntu/amazon-ssm-agent.service
+++ b/packaging/ubuntu/amazon-ssm-agent.service
@@ -1,6 +1,9 @@
 [Unit]
-Description=amazon-ssm-agent
-After=network-online.target
+Description=Amazon SSM Agent
+Documentation=https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html
+Wants=network-online.target
+After=network-online.target nss-lookup.target cloud-init.target
+ConditionFileIsExecutable=/usr/bin/amazon-ssm-agent
 
 [Service]
 Type=simple