diff --git a/recipes-apps/tasks/task-gprscore.bb b/recipes-apps/tasks/task-gprscore.bb
index 98eb987..fd13ae8 100644
--- a/recipes-apps/tasks/task-gprscore.bb
+++ b/recipes-apps/tasks/task-gprscore.bb
@@ -3,10 +3,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 PR = "r1"
 
-RDEPENDS_task-gprscore = "\
+RDEPENDS_${PN} = "\
     openggsn \
     gprs-routing osmo-sgsn \
     sysmocom-ggsn-config \
diff --git a/recipes-apps/tasks/task-sysmocom-bts.bb b/recipes-apps/tasks/task-sysmocom-bts.bb
index ec91bf1..b5abb1a 100644
--- a/recipes-apps/tasks/task-sysmocom-bts.bb
+++ b/recipes-apps/tasks/task-sysmocom-bts.bb
@@ -3,8 +3,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
-ALLOW_EMPTY = "1"
-PR = "r17"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r18"
 
 CALIB = ""
 CALIB_sysmobts-v2 = "sysmobts-calib"
diff --git a/recipes-apps/tasks/task-sysmocom-debug.bb b/recipes-apps/tasks/task-sysmocom-debug.bb
index 5612b9e..c1a7ecd 100644
--- a/recipes-apps/tasks/task-sysmocom-debug.bb
+++ b/recipes-apps/tasks/task-sysmocom-debug.bb
@@ -3,10 +3,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
-ALLOW_EMPTY = "1"
-PR = "r3"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r4"
 
-RDEPENDS_task-sysmocom-debug = "\
+RDEPENDS_${PN} = "\
     dropbear \
     mtd-utils \
     strace \
diff --git a/recipes-apps/tasks/task-sysmocom-e1.bb b/recipes-apps/tasks/task-sysmocom-e1.bb
index f71beb9..998824e 100644
--- a/recipes-apps/tasks/task-sysmocom-e1.bb
+++ b/recipes-apps/tasks/task-sysmocom-e1.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Task for E1 based sysmocom"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-ALLOW_EMPTY = "1"
-PR = "r1"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r2"
 
-RDEPENDS_task-sysmocom-e1 = "\
+RDEPENDS_${PN} = "\
     dahdi-linux \
     dahdi-firmware \
     dahdi-tools \
diff --git a/recipes-apps/tasks/task-sysmocom-tools.bb b/recipes-apps/tasks/task-sysmocom-tools.bb
index 709b5f4..7026a7b 100644
--- a/recipes-apps/tasks/task-sysmocom-tools.bb
+++ b/recipes-apps/tasks/task-sysmocom-tools.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Task for sysmocom external tools"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 PR = "r7"
 
-RDEPENDS_task-sysmocom-tools = "\
+RDEPENDS_${PN} = "\
     lmsensors-scripts \
     dropbear \
     mtd-utils \
diff --git a/recipes-apps/tasks/task-sysmocom.bb b/recipes-apps/tasks/task-sysmocom.bb
index 3d784ae..4f79e54 100644
--- a/recipes-apps/tasks/task-sysmocom.bb
+++ b/recipes-apps/tasks/task-sysmocom.bb
@@ -3,10 +3,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 PR = "r11"
 
-RDEPENDS_task-sysmocom = "\
+RDEPENDS_${PN} = "\
     task-sysmocom-tools \
     osmo-bsc \
     osmo-bsc-mgcp \