diff --git a/recipes-apps/images/sysmocom-image.inc b/recipes-apps/images/sysmocom-image.inc
index 7c68b18..16b03c5 100644
--- a/recipes-apps/images/sysmocom-image.inc
+++ b/recipes-apps/images/sysmocom-image.inc
@@ -1,5 +1,5 @@
 DEPENDS = "${MACHINE_EXTRA_RDEPENDS} util-linux-native"
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom-2g task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
 IMAGE_LINGUAS = " "
 IMAGE_FEATURES += " package-management "
 LICENSE = "MIT"
diff --git a/recipes-apps/images/sysmocom-nitb-image.bb b/recipes-apps/images/sysmocom-nitb-image.bb
index 80f90e7..89fec9c 100644
--- a/recipes-apps/images/sysmocom-nitb-image.bb
+++ b/recipes-apps/images/sysmocom-nitb-image.bb
@@ -1,5 +1,7 @@
 require sysmocom-image.inc
 
+IMAGE_INSTALL += " task-sysmocom-2g "
+
 # This variant of the image will run osmo-bts and osmo-nitb
 activate_nitb() {
 	echo "NO_START=0" > ${IMAGE_ROOTFS}/etc/default/osmo-nitb
diff --git a/recipes-apps/tasks/task-sysmocom-3g.bb b/recipes-apps/tasks/task-sysmocom-3g.bb
new file mode 100644
index 0000000..e7bb55d
--- /dev/null
+++ b/recipes-apps/tasks/task-sysmocom-3g.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Task for sysmocom 3G"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = " \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+DEPENDS = "virtual/kernel"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r1"
+
+RDEPENDS_${PN} = "\
+    task-sysmocom-tools \
+    osmo-hnbgw \
+    osmo-hlr \
+    osmo-msc \
+    osmo-sgsn \
+    osmo-bsc-mgcp \
+    openggsn \
+    "
+
+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_VERSION_osmocom-3g =