diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service
index e7a9e184848..4575fde6153 100644
--- a/pkg/kamailio/deb/bionic/kamailio.service
+++ b/pkg/kamailio/deb/bionic/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio (OpenSER) - the Open Source SIP Server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=forking
@@ -15,7 +16,7 @@ EnvironmentFile=-/etc/default/kamailio.d/*
 PIDFile=/var/run/kamailio/kamailio.pid
 # ExecStart requires a full absolute path
 ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
-Restart=on-abort
+Restart=on-failure
 # /var/run/kamailio in tmpfs
 RuntimeDirectory=kamailio
 RuntimeDirectoryMode=0750
diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service
index e7a9e184848..4575fde6153 100644
--- a/pkg/kamailio/deb/buster/kamailio.service
+++ b/pkg/kamailio/deb/buster/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio (OpenSER) - the Open Source SIP Server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=forking
@@ -15,7 +16,7 @@ EnvironmentFile=-/etc/default/kamailio.d/*
 PIDFile=/var/run/kamailio/kamailio.pid
 # ExecStart requires a full absolute path
 ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
-Restart=on-abort
+Restart=on-failure
 # /var/run/kamailio in tmpfs
 RuntimeDirectory=kamailio
 RuntimeDirectoryMode=0750
diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service
index e7a9e184848..4575fde6153 100644
--- a/pkg/kamailio/deb/debian/kamailio.service
+++ b/pkg/kamailio/deb/debian/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio (OpenSER) - the Open Source SIP Server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=forking
@@ -15,7 +16,7 @@ EnvironmentFile=-/etc/default/kamailio.d/*
 PIDFile=/var/run/kamailio/kamailio.pid
 # ExecStart requires a full absolute path
 ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
-Restart=on-abort
+Restart=on-failure
 # /var/run/kamailio in tmpfs
 RuntimeDirectory=kamailio
 RuntimeDirectoryMode=0750
diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service
index e7a9e184848..4575fde6153 100644
--- a/pkg/kamailio/deb/jessie/kamailio.service
+++ b/pkg/kamailio/deb/jessie/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio (OpenSER) - the Open Source SIP Server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=forking
@@ -15,7 +16,7 @@ EnvironmentFile=-/etc/default/kamailio.d/*
 PIDFile=/var/run/kamailio/kamailio.pid
 # ExecStart requires a full absolute path
 ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
-Restart=on-abort
+Restart=on-failure
 # /var/run/kamailio in tmpfs
 RuntimeDirectory=kamailio
 RuntimeDirectoryMode=0750
diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service
index e7a9e184848..4575fde6153 100644
--- a/pkg/kamailio/deb/sid/kamailio.service
+++ b/pkg/kamailio/deb/sid/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio (OpenSER) - the Open Source SIP Server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=forking
@@ -15,7 +16,7 @@ EnvironmentFile=-/etc/default/kamailio.d/*
 PIDFile=/var/run/kamailio/kamailio.pid
 # ExecStart requires a full absolute path
 ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
-Restart=on-abort
+Restart=on-failure
 # /var/run/kamailio in tmpfs
 RuntimeDirectory=kamailio
 RuntimeDirectoryMode=0750
diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service
index e7a9e184848..4575fde6153 100644
--- a/pkg/kamailio/deb/stretch/kamailio.service
+++ b/pkg/kamailio/deb/stretch/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio (OpenSER) - the Open Source SIP Server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=forking
@@ -15,7 +16,7 @@ EnvironmentFile=-/etc/default/kamailio.d/*
 PIDFile=/var/run/kamailio/kamailio.pid
 # ExecStart requires a full absolute path
 ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
-Restart=on-abort
+Restart=on-failure
 # /var/run/kamailio in tmpfs
 RuntimeDirectory=kamailio
 RuntimeDirectoryMode=0750
diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service
index e7a9e184848..4575fde6153 100644
--- a/pkg/kamailio/deb/xenial/kamailio.service
+++ b/pkg/kamailio/deb/xenial/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio (OpenSER) - the Open Source SIP Server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=forking
@@ -15,7 +16,7 @@ EnvironmentFile=-/etc/default/kamailio.d/*
 PIDFile=/var/run/kamailio/kamailio.pid
 # ExecStart requires a full absolute path
 ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
-Restart=on-abort
+Restart=on-failure
 # /var/run/kamailio in tmpfs
 RuntimeDirectory=kamailio
 RuntimeDirectoryMode=0750
diff --git a/pkg/kamailio/oracle/el7/kamailio.service b/pkg/kamailio/oracle/el7/kamailio.service
index 63d6da747c0..8192488b537 100644
--- a/pkg/kamailio/oracle/el7/kamailio.service
+++ b/pkg/kamailio/oracle/el7/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio SIP router server daemon
-After=syslog.target network.target auditd.service
+Wants=network-online.target
+After=syslog.target network-online.target auditd.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/kamailio