diff --git a/recipes-apps/images/sysmocom-3g-image.bb b/recipes-apps/images/sysmocom-3g-image.bb
index 8700dd4..bfd5a07 100644
--- a/recipes-apps/images/sysmocom-3g-image.bb
+++ b/recipes-apps/images/sysmocom-3g-image.bb
@@ -2,12 +2,14 @@ require sysmocom-image.inc
 
 IMAGE_INSTALL += " task-sysmocom-3g "
  
-# Activate osmo-hlr, osmo-msc, osmo-sgsn and openggsn for 3G
+# Activate osmo-hnbgw, osmo-hlr, osmo-msc, osmo-sgsn and openggsn for 3G
 activate_core() {
 }
 
 activate_systemd_core() {
+	ln -sf ${systemd_unitdir}/system/osmo-hnbgw.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
 	ln -sf ${systemd_unitdir}/system/osmo-msc.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
+	ln -sf ${systemd_unitdir}/system/osmo-bsc-mgcp.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
 	ln -sf ${systemd_unitdir}/system/osmo-sgsn.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
 	ln -sf ${systemd_unitdir}/system/osmo-hlr.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
 	ln -sf ${systemd_unitdir}/system/openggsn.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
diff --git a/recipes-apps/tasks/task-sysmocom-3g.bb b/recipes-apps/tasks/task-sysmocom-3g.bb
index e7bb55d..41a6e18 100644
--- a/recipes-apps/tasks/task-sysmocom-3g.bb
+++ b/recipes-apps/tasks/task-sysmocom-3g.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r1"
+PR = "r2"
 
 RDEPENDS_${PN} = "\
     task-sysmocom-tools \
@@ -14,11 +14,16 @@ RDEPENDS_${PN} = "\
     osmo-sgsn \
     osmo-bsc-mgcp \
     openggsn \
+    dnsmasq \
+    sysmocom-ggsn-config \
+    gprs-routing \
+    sqlite3 \
     "
 
 PREFERRED_PROVIDER_osmo-bsc-mgcp = "osmocom-3g"
 PREFERRED_PROVIDER_osmo-bsc-nat = "osmocom-3g"
 PREFERRED_PROVIDER_osmo-bsc-nitb = "osmocom-3g"
 PREFERRED_PROVIDER_osmo-bsc-gbproxy = "osmocom-3g"
+PREFERRED_PROVIDER_osmo-sgsn = "osmocom-3g"
 
 #PREFERRED_VERSION_osmocom-3g =