diff --git a/meta-telephony/recipes-osmocom/meta/meta-toolchain-osmo.bb b/meta-telephony/recipes-osmocom/meta/meta-toolchain-osmo.bb
index 566ec26726..6755fb693e 100644
--- a/meta-telephony/recipes-osmocom/meta/meta-toolchain-osmo.bb
+++ b/meta-telephony/recipes-osmocom/meta/meta-toolchain-osmo.bb
@@ -1,5 +1,4 @@
-#TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg"
-TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target"
+TOOLCHAIN_TARGET_OSMOTASK ?= "packagegroup-core-standalone-osmo-sdk-target"
 TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}"
 TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}"
 TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}"
diff --git a/meta-telephony/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/meta-telephony/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb
similarity index 85%
rename from meta-telephony/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb
rename to meta-telephony/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb
index 41a95b120a..dd5072b5be 100644
--- a/meta-telephony/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb
+++ b/meta-telephony/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb
@@ -13,11 +13,11 @@ ALLOW_EMPTY_${PN} = "1"
 # will need to skip this test.
 INSANE_SKIP_${PN} += "dev-deps"
 
-require task-sdk-osmo.inc
+require packagegroup-sdk-osmo.inc
 
 PACKAGES = "${PN} ${PN}-dbg"
 
 RDEPENDS_${PN} = "\
-    task-core-standalone-sdk-target \
+    packagegroup-core-standalone-sdk-target \
     ${SDK-OSMO} \
     ${SDK-EXTRAS}"
diff --git a/meta-telephony/recipes-osmocom/tasks/task-osmocom.bb b/meta-telephony/recipes-osmocom/packagegroup/packagegroup-osmocom.bb
similarity index 60%
rename from meta-telephony/recipes-osmocom/tasks/task-osmocom.bb
rename to meta-telephony/recipes-osmocom/packagegroup/packagegroup-osmocom.bb
index 1cec91fe59..d95d76fd8e 100644
--- a/meta-telephony/recipes-osmocom/tasks/task-osmocom.bb
+++ b/meta-telephony/recipes-osmocom/packagegroup/packagegroup-osmocom.bb
@@ -5,7 +5,12 @@ DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
 PR = "r2"
 
-RDEPENDS_task-osmocom = "\
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-osmocom"
+RREPLACES_${PN} = "task-osmocom"
+RCONFLICTS_${PN} = "task-osmocom"
+
+RDEPENDS_${PN} = "\
     libosmocore \
     "
 
diff --git a/meta-telephony/recipes-osmocom/tasks/task-sdk-osmo.inc b/meta-telephony/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc
similarity index 100%
rename from meta-telephony/recipes-osmocom/tasks/task-sdk-osmo.inc
rename to meta-telephony/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc
diff --git a/meta-telephony/recipes-telephony/tasks/task-telephony-all.bb b/meta-telephony/recipes-telephony/tasks/task-telephony-all.bb
index 284d66904b..cc1ca0b010 100644
--- a/meta-telephony/recipes-telephony/tasks/task-telephony-all.bb
+++ b/meta-telephony/recipes-telephony/tasks/task-telephony-all.bb
@@ -3,14 +3,14 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "\
         libosmo-abis \
         libosmo-sccp \
         libosmocore \
         openbsc \
-        task-osmocom \
+        packagegroup-osmocom \
         openggsn \
         misdn-utils \
         dahdi-linux \