diff --git a/config/systemd/captrace.service b/config/systemd/captrace.service
index abd354d4..83e39782 100644
--- a/config/systemd/captrace.service
+++ b/config/systemd/captrace.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Capture trace data from NF daemon
-After=network-online.target
+After=network-online.target mysql.service
 
 [Service]
 Type=simple
@@ -9,7 +9,7 @@ LimitNOFILE=65535
 Restart=always
 ExecStart=/usr/local/omc/bin/captrace -c /usr/local/omc/etc/capconf.yaml
 RestartSec=2
-RestartPreventExitStatus=1
+RestartPreventExitStatus=SIGTERM SIGKILL
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/config/systemd/crontask.service b/config/systemd/crontask.service
index 941d2bf6..d9266203 100644
--- a/config/systemd/crontask.service
+++ b/config/systemd/crontask.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Cron task daemon
-After=network-online.target
+After=network-online.target mysql.service
 
 [Service]
 Type=simple
@@ -9,7 +9,7 @@ LimitNOFILE=65535
 Restart=always
 ExecStart=/usr/local/omc/bin/crontask -c /usr/local/omc/etc/crontask.yaml
 RestartSec=2
-RestartPreventExitStatus=1
+RestartPreventExitStatus=SIGTERM SIGKILL
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/config/systemd/restagent.service b/config/systemd/restagent.service
index c44fe656..51a495ee 100644
--- a/config/systemd/restagent.service
+++ b/config/systemd/restagent.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=REST agent daemon
-After=network-online.target
+After=network-online.target mysql.service
 
 [Service]
 Type=simple
@@ -9,7 +9,7 @@ LimitNOFILE=65535
 Restart=always
 ExecStart=/usr/local/omc/bin/restagent -c /usr/local/omc/etc/restconf.yaml
 RestartSec=2
-RestartPreventExitStatus=1
+RestartPreventExitStatus=SIGTERM SIGKILL
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/config/systemd/sshsvc.service b/config/systemd/sshsvc.service
index 9cb931c0..7b8b6df5 100644
--- a/config/systemd/sshsvc.service
+++ b/config/systemd/sshsvc.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=SSH MML service daemon
-After=network-online.target
+After=network-online.target mysql.service
 
 [Service]
 Type=simple
@@ -9,7 +9,7 @@ LimitNOFILE=65535
 Restart=always
 ExecStart=/usr/local/omc/bin/sshsvc -c /usr/local/omc/etc/sshsvc.yaml
 RestartSec=2
-RestartPreventExitStatus=1
+RestartPreventExitStatus=SIGTERM SIGKILL
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]