diff --git a/config/systemd/omc.service b/config/systemd/omc.service
index 2dfc6c7c..ae27cb61 100644
--- a/config/systemd/omc.service
+++ b/config/systemd/omc.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=OMC Service
 After=network-online.target mysql.service kvdb.service
+Wants=network-online.target
+RequiresMountsFor=/usr/local/omc
 
 [Service]
 Type=simple
@@ -8,8 +10,10 @@ LimitNOFILE=65535
 LimitNPROC=65535
 
 Restart=always
+RestartSec=10
+StartLimitIntervalSec=60
+StartLimitBurst=3
 ExecStart=/usr/local/omc/bin/restagent -c /usr/local/omc/etc/restconf.yaml
-RestartSec=2
 RestartPreventExitStatus=SIGTERM SIGKILL
 ExecReload=/bin/kill -HUP $MAINPID
 
diff --git a/config/systemd/restagent.service b/config/systemd/restagent.service
index 4bdbeadd..6f789ad4 100644
--- a/config/systemd/restagent.service
+++ b/config/systemd/restagent.service
@@ -1,6 +1,8 @@
 [Unit]
-Description=PSAP  rest agent daemon
+Description=PSAP rest agent daemon
 After=network-online.target mysql.service kvdb.service
+Wants=network-online.target
+RequiresMountsFor=/usr/local/omc
 
 [Service]
 Type=simple
@@ -8,8 +10,10 @@ LimitNOFILE=65535
 LimitNPROC=65535
 
 Restart=always
+RestartSec=10
+StartLimitIntervalSec=60
+StartLimitBurst=3
 ExecStart=/usr/local/omc/bin/restagent -c /usr/local/omc/etc/restconf.yaml
-RestartSec=2
 RestartPreventExitStatus=SIGTERM SIGKILL
 ExecReload=/bin/kill -HUP $MAINPID