diff --git a/netxms-agent.service b/netxms-agent.service
index bf174fd..fdea9e4 100644
--- a/netxms-agent.service
+++ b/netxms-agent.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=NetXMS agent
+After=network.target
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/nxagentd -S
 PIDFile=/var/run/nxagentd.pid
 LimitCORE=infinity
-Restart=on-failure
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/netxms-reporting.service b/netxms-reporting.service
index dcf0995..02a4835 100644
--- a/netxms-reporting.service
+++ b/netxms-reporting.service
@@ -1,10 +1,11 @@
 [Unit]
 Description=NetXMS reporting server
+After=network.target
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/nxreportd
-Restart=on-failure
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/netxms-server.service b/netxms-server.service
index 5228a17..a297d41 100644
--- a/netxms-server.service
+++ b/netxms-server.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=NetXMS core server
+After=network.target
 # StartLimitIntervalSec=0 # since systemd v230
 
 [Service]
@@ -8,7 +9,7 @@ ExecStart=/usr/bin/netxmsd -S
 PIDFile=/var/run/netxmsd.pid
 LimitNOFILE=65535
 LimitCORE=infinity
-Restart=on-failure
+Restart=always
 RestartSec=30
 TimeoutSec=900
 StartLimitInterval=0 # depricated in v230