diff --git a/support/systemd/nextepc-hssd.service.in b/support/systemd/nextepc-hssd.service.in
index d4a7d66d0..3fb21521d 100644
--- a/support/systemd/nextepc-hssd.service.in
+++ b/support/systemd/nextepc-hssd.service.in
@@ -1,10 +1,11 @@
 [Unit]
 Description=NextEPC HSS Daemon
-After=networking.service
+After=networking.service mongodb.service
 
 [Service]
 Type=simple
 Restart=always
+ExecStartPre=/bin/sleep 2
 ExecStart=@BIN_DIR@/nextepc-hssd -f @SYSCONF_DIR@/nextepc/hss.conf
 RestartSec=2
 RestartPreventExitStatus=1
diff --git a/support/systemd/nextepc-pcrfd.service.in b/support/systemd/nextepc-pcrfd.service.in
index b9c59a495..a99a9b67d 100644
--- a/support/systemd/nextepc-pcrfd.service.in
+++ b/support/systemd/nextepc-pcrfd.service.in
@@ -1,10 +1,11 @@
 [Unit]
 Description=NextEPC PCRF Daemon
-After=networking.service
+After=networking.service mongodb.service
 
 [Service]
 Type=simple
 Restart=always
+ExecStartPre=/bin/sleep 2
 ExecStart=@BIN_DIR@/nextepc-pcrfd -f @SYSCONF_DIR@/nextepc/pcrf.conf
 RestartSec=2
 RestartPreventExitStatus=1
diff --git a/support/systemd/nextepc-pgwd.service.in b/support/systemd/nextepc-pgwd.service.in
index 5e040b248..2ea2226c5 100644
--- a/support/systemd/nextepc-pgwd.service.in
+++ b/support/systemd/nextepc-pgwd.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=NextEPC S-GW Daemon
+Description=NextEPC P-GW Daemon
 After=networking.service
 
 [Service]