diff --git a/packages/etc/systemd/system/edge-ntopng@.service.in b/packages/etc/systemd/system/edge-ntopng@.service.in
index 4c8a666..5299d22 100644
--- a/packages/etc/systemd/system/edge-ntopng@.service.in
+++ b/packages/etc/systemd/system/edge-ntopng@.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=n2n edge process, on %I
-After=network.target syslog.target
-Wants=
+After=network-online.target syslog.target
+Wants=network-online.target
 BindsTo=ntopng.service
 
 [Service]
diff --git a/packages/etc/systemd/system/edge.service.in b/packages/etc/systemd/system/edge.service.in
index c6c1867..b72fbd3 100644
--- a/packages/etc/systemd/system/edge.service.in
+++ b/packages/etc/systemd/system/edge.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=n2n edge process
-After=network.target syslog.target
-Wants=
+After=network-online.target syslog.target
+Wants=network-online.target
 
 [Service]
 Type=simple
diff --git a/packages/etc/systemd/system/edge@.service.in b/packages/etc/systemd/system/edge@.service.in
index 42516c5..2539046 100644
--- a/packages/etc/systemd/system/edge@.service.in
+++ b/packages/etc/systemd/system/edge@.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=n2n edge process, on %I
-After=network.target syslog.target
-Wants=
+After=network-online.target syslog.target
+Wants=network-online.target
 
 [Service]
 Type=simple
diff --git a/packages/etc/systemd/system/supernode.service.in b/packages/etc/systemd/system/supernode.service.in
index 9bf2653..789d7ef 100644
--- a/packages/etc/systemd/system/supernode.service.in
+++ b/packages/etc/systemd/system/supernode.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=n2n supernode process
-After=network.target syslog.target
-Wants=
+After=network-online.target syslog.target
+Wants=network-online.target
 
 [Service]
 Type=simple