diff --git a/meta-digi-del/classes/del-image.bbclass b/meta-digi-del/classes/del-image.bbclass
index 503e46023..a620e3cd0 100644
--- a/meta-digi-del/classes/del-image.bbclass
+++ b/meta-digi-del/classes/del-image.bbclass
@@ -7,7 +7,7 @@ PACKAGE_GROUP_del-gstreamer = "packagegroup-del-gstreamer"
 PACKAGE_GROUP_del-network = "packagegroup-del-network"
 PACKAGE_GROUP_del-wireless = "packagegroup-del-wireless"
 PACKAGE_GROUP_del-debug = "packagegroup-del-debug"
-PACKAGE_GROUP_del-bluetooth = "task-del-bluetooth"
+PACKAGE_GROUP_del-bluetooth = "packagegroup-del-bluetooth"
 
 ## DEL rootfs final tuning
 del_rootfs_tuning() {
diff --git a/meta-digi-del/recipes-connectivity/tasks/task-del-bluetooth.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-bluetooth.bb
similarity index 69%
rename from meta-digi-del/recipes-connectivity/tasks/task-del-bluetooth.bb
rename to meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-bluetooth.bb
index 07e4233b1..564962a1e 100644
--- a/meta-digi-del/recipes-connectivity/tasks/task-del-bluetooth.bb
+++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-bluetooth.bb
@@ -1,31 +1,27 @@
 #
 # Copyright (C) 2012 Digi International.
 #
-DESCRIPTION = "Bluetooth task for DEL image"
+DESCRIPTION = "Bluetooth packagegroup for DEL image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 PR = "r0"
 
+inherit packagegroup
+
 #
 # Set by the machine configuration with packages essential for device bootup
 #
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
-PACKAGES = "\
-	task-del-bluetooth \
-	task-del-bluetooth-dbg \
-	task-del-bluetooth-dev \
-    "
-
-RDEPENDS_task-del-bluetooth = "\
+RDEPENDS_${PN} = "\
 	btfilter \
 	bluez4 \
 	${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
 
-RRECOMMENDS_task-del-bluetooth = "\
+RRECOMMENDS_${PN} = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"