diff --git a/distrib/initscripts/a2boot.service.tmpl b/distrib/initscripts/a2boot.service.tmpl
index 8e5c4aca3c1..4e99bbad335 100644
--- a/distrib/initscripts/a2boot.service.tmpl
+++ b/distrib/initscripts/a2boot.service.tmpl
@@ -1,10 +1,8 @@
-# This is experimental service file.
-# See distrib/systemd/README
 # This file is part of Netatalk :NETATALK_VERSION:.
 
 [Unit]
 Description=Apple II boot daemon
-After=syslog.target network.target atalkd.service
+After=network-online.target atalkd.service
 Requires=atalkd.service
 
 [Service]
diff --git a/distrib/initscripts/afpd.service.tmpl b/distrib/initscripts/afpd.service.tmpl
index ed9c77023e9..4159b956e0b 100644
--- a/distrib/initscripts/afpd.service.tmpl
+++ b/distrib/initscripts/afpd.service.tmpl
@@ -2,7 +2,7 @@
 
 [Unit]
 Description=Netatalk AFP fileserver for Macintosh clients
-After=syslog.target network.target slpd.service avahi-daemon.service cnid.service atalkd.service
+After=network-online.target slpd.service avahi-daemon.service cnid.service atalkd.service
 Requires=cnid.service
 
 [Service]
diff --git a/distrib/initscripts/atalkd.service.tmpl b/distrib/initscripts/atalkd.service.tmpl
index 33ca5d77aec..d917bd24e27 100644
--- a/distrib/initscripts/atalkd.service.tmpl
+++ b/distrib/initscripts/atalkd.service.tmpl
@@ -2,7 +2,7 @@
 
 [Unit]
 Description=Netatalk AppleTalk daemon
-After=syslog.target network.target
+After=network-online.target
 
 [Service]
 Type=forking
diff --git a/distrib/initscripts/cnid.service.tmpl b/distrib/initscripts/cnid.service.tmpl
index 297d5af939d..129a8156262 100644
--- a/distrib/initscripts/cnid.service.tmpl
+++ b/distrib/initscripts/cnid.service.tmpl
@@ -2,7 +2,7 @@
 
 [Unit]
 Description=Netatalk CNID database daemon for AFP fileserver
-After=syslog.target network.target
+After=network-online.target
 Before=afpd.service
 Requires=afpd.service
 
diff --git a/distrib/initscripts/papd.service.tmpl b/distrib/initscripts/papd.service.tmpl
index d16045e162c..a38fa2b5c2e 100644
--- a/distrib/initscripts/papd.service.tmpl
+++ b/distrib/initscripts/papd.service.tmpl
@@ -2,7 +2,7 @@
 
 [Unit]
 Description=AppleTalk PAP printer server daemon
-After=syslog.target network.target atalkd.service
+After=network-online.target atalkd.service
 Requires=atalkd.service
 
 [Service]
diff --git a/distrib/initscripts/timelord.service.tmpl b/distrib/initscripts/timelord.service.tmpl
index 6c966e2a3e9..c7548157508 100644
--- a/distrib/initscripts/timelord.service.tmpl
+++ b/distrib/initscripts/timelord.service.tmpl
@@ -2,7 +2,7 @@
 
 [Unit]
 Description=AppleTalk Timelord time server daemon
-After=syslog.target network.target atalkd.service
+After=network-online.target atalkd.service
 Requires=atalkd.service
 
 [Service]