diff --git a/contrib/systemd/osmo-msc.service b/contrib/systemd/osmo-msc.service
index 2c81ebae5..7cebb1468 100644
--- a/contrib/systemd/osmo-msc.service
+++ b/contrib/systemd/osmo-msc.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Osmocom Mobile Switching Center (MSC)
-Wants=osmo-hlr
-After=osmo-hlr
+Wants=osmo-hlr.service
+After=osmo-hlr.service
+After=osmo-hnbgw.service
 
 [Service]
 Type=simple
diff --git a/contrib/systemd/osmo-sgsn.service b/contrib/systemd/osmo-sgsn.service
index 674d78656..bf6a8e098 100644
--- a/contrib/systemd/osmo-sgsn.service
+++ b/contrib/systemd/osmo-sgsn.service
@@ -1,5 +1,8 @@
 [Unit]
 Description=OpenBSC SGSN
+Wants=osmo-hlr.service
+After=osmo-hlr.service
+After=osmo-hnbgw.service
 
 [Service]
 Type=simple