diff --git a/recipes-osmocom/osmocom-3g/osmocom-3g.inc b/recipes-osmocom/osmocom-3g/osmocom-3g.inc
index 87c110b..956d05c 100644
--- a/recipes-osmocom/osmocom-3g/osmocom-3g.inc
+++ b/recipes-osmocom/osmocom-3g/osmocom-3g.inc
@@ -10,7 +10,7 @@
 	   file://osmo-bsc_mgcp.init \
 	   file://osmo-sgsn.init"
 
-INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r2.${META_TELEPHONY_OSMO_INC}"
 
 
 EXTRA_OECONF += " --enable-iu --enable-smpp --enable-mgcp-transcoding --with-g729"
@@ -37,9 +37,9 @@
 
 	# Install systemd files and enable on sysinit
 	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${S}/contrib/systemd/osmo-msc.service ${D}${systemd_unitdir}/system/
-	install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service ${D}${systemd_unitdir}/system/
-	install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${WORKDIR}/osmo-msc.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${WORKDIR}/osmo-sgsn.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${WORKDIR}/osmo-bsc-mgcp.service ${D}${systemd_unitdir}/system/
 
 	install -d ${D}/var/lib/osmocom
 }
diff --git a/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc-mgcp.service b/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc-mgcp.service
new file mode 100644
index 0000000..b1277d5
--- /dev/null
+++ b/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc-mgcp.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenBSC MGCP
+After=networking.service
+
+[Service]
+Type=simple
+Restart=always
+ExecStart=/usr/bin/osmo-bsc_mgcp -s -c /etc/osmocom/osmo-bsc-mgcp.cfg
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.service b/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.service
new file mode 100644
index 0000000..53e83e8
--- /dev/null
+++ b/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Osmocom Mobile Switching Center (MSC)
+Wants=osmo-hlr.service
+After=osmo-hlr.service
+After=networking.service
+
+[Service]
+Type=simple
+Restart=always
+ExecStart=/usr/bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.service b/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.service
new file mode 100644
index 0000000..0641e57
--- /dev/null
+++ b/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=OpenBSC SGSN
+Wants=osmo-hlr.service
+After=osmo-hlr.service
+After=networking.service
+
+[Service]
+Type=simple
+Restart=always
+ExecStart=/usr/bin/osmo-sgsn -c /etc/osmocom/osmo-sgsn.cfg
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target