diff --git a/templates/lighthouse.service.j2 b/templates/lighthouse.service.j2
index 52f1474..a0d2f38 100644
--- a/templates/lighthouse.service.j2
+++ b/templates/lighthouse.service.j2
@@ -1,12 +1,13 @@
 [Unit]
-Description=Nebula Lighthouse
-Wants=basic.target
-After=basic.target network.target
+Description=Nebula overlay networking tool - Lighthouse
+Wants=basic.target network-online.target nss-lookup.target time-sync.target
+After=basic.target network.target network-online.target
+Before=sshd.service
 
 [Service]
+Type=notify
+NotifyAccess=main
 SyslogIdentifier=nebula
-StandardOutput=syslog
-StandardError=syslog
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStart=/opt/nebula/nebula -config /opt/nebula/config.yml
 Restart=always
@@ -14,3 +15,4 @@ RestartSec=42s
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/templates/node.service.j2 b/templates/node.service.j2
index a28544a..50be4b0 100644
--- a/templates/node.service.j2
+++ b/templates/node.service.j2
@@ -1,12 +1,13 @@
 [Unit]
-Description=nebula
-Wants=basic.target
-After=basic.target network.target
+Description=Nebula overlay networking tool
+Wants=basic.target network-online.target nss-lookup.target time-sync.target
+After=basic.target network.target network-online.target
+Before=sshd.service
 
 [Service]
+Type=notify
+NotifyAccess=main
 SyslogIdentifier=nebula
-StandardOutput=syslog
-StandardError=syslog
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStart=/opt/nebula/nebula -config /opt/nebula/config.yml
 Restart=always