diff --git a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb
index 633cc3667..4eb53f084 100644
--- a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb
+++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb
@@ -8,6 +8,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 PR = "r0"
 
+inherit packagegroup
+
 #
 # Set by the machine configuration with packages essential for device bootup
 #
@@ -28,12 +30,6 @@ VIRTUAL-RUNTIME_network-utils ?= "ethtool"
 VIRTUAL-RUNTIME_snmp-manager ?= ""
 #VIRTUAL-RUNTIME_snmp-manager ?= "net-snmp-server"
 
-PACKAGES = "\
-	packagegroup-del-network \
-	packagegroup-del-network-dbg \
-	packagegroup-del-network-dev \
-    "
-
 RDEPENDS_${PN} = "\
 	bridge-utils \
 	ppp \
diff --git a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb
index 1b5d95dad..11272a028 100644
--- a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb
+++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb
@@ -8,18 +8,14 @@ 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 = "\
-	packagegroup-del-wireless \
-	packagegroup-del-wireless-dbg \
-	packagegroup-del-wireless-dev \
-    "
-
 RDEPENDS_${PN} = "\
 	wpa-supplicant \
 	wireless-tools \
diff --git a/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb
index be597732c..4458c7346 100644
--- a/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb
+++ b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb
@@ -9,6 +9,8 @@ DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"
 PR = "r0"
 
+inherit packagegroup
+
 #
 # Set by the machine configuration with packages essential for device bootup
 #
@@ -23,12 +25,6 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
 VIRTUAL-RUNTIME_initscripts ?= "initscripts"
 VIRTUAL-RUNTIME_keymaps ?= "keymaps"
 
-PACKAGES = "\
-	packagegroup-del-core \
-	packagegroup-del-core-dbg \
-	packagegroup-del-core-dev \
-    "
-
 RDEPENDS_${PN} = "\
     base-files \
     base-passwd \
diff --git a/meta-digi-del/recipes-core/packagegroups/packagegroup-del-debug.bb b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-debug.bb
index dfb04f28a..de5288a6b 100644
--- a/meta-digi-del/recipes-core/packagegroups/packagegroup-del-debug.bb
+++ b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-debug.bb
@@ -8,18 +8,14 @@ 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 = "\
-	packagegroup-del-debug \
-	packagegroup-del-debug-dbg \
-	packagegroup-del-debug-dev \
-    "
-
 RDEPENDS_${PN} = "\
     packagegroup-core-tools-debug \
     memwatch \
diff --git a/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-audio.bb b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-audio.bb
index 6ae1c83e9..4771266d6 100644
--- a/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-audio.bb
+++ b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-audio.bb
@@ -8,11 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 PR = "r0"
 
-PACKAGES = "\
-	packagegroup-del-audio \
-	packagegroup-del-audio-dbg \
-	packagegroup-del-audio-dev \
-    "
+inherit packagegroup
 
 RDEPENDS_${PN} = "\
     alsa-lib \
diff --git a/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb
index 673917343..a8ae5f2f6 100644
--- a/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb
+++ b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb
@@ -8,11 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 PR = "r0"
 
-PACKAGES = "\
-	packagegroup-del-gstreamer \
-	packagegroup-del-gstreamer-dbg \
-	packagegroup-del-gstreamer-dev \
-    "
+inherit packagegroup
 
 VIRTUAL_RUNTIME_gst-fsl-plugin = "\
 	gst-fsl-plugin \