diff --git a/recipes-core/images/helium-image-default.bb b/recipes-core/images/helium-image-default.bb
index 9166052..18f8e91 100644
--- a/recipes-core/images/helium-image-default.bb
+++ b/recipes-core/images/helium-image-default.bb
@@ -6,50 +6,12 @@ LICENSE = "MIT"
 inherit core-image
 inherit image-buildinfo
 
-# base system packages
-OS_BASE = " \
-	base-files \
-	base-passwd \
-	busybox \
-	busybox-syslog \
-	initscripts \
-	netbase \
-	networkmanager \
-	networkmanager-nmtui \
-	init-ifupdown \
-	tzdata \
-"
-
-# standard userspace tools
-OS_TOOLS = " \
-	dropbear \
-	less \
-	htop \
-	screen \
-	nano \
-"
-
-# system hardening
-HARDENING = " \
-	hidepid \
-"
-
-# helium base packages
-HELIUM_BASE = " \
-	helium-repos \
-	htoprc \
-"
-
-# helium extra tools
-HELIUM_TOOLS = " \
-"
-
 IMAGE_INSTALL += " \
-	${OS_BASE} \
-	${OS_TOOLS} \
-	${HARDENING} \
-	${HELIUM_BASE} \
-	${HELIUM_TOOLS} \
+	packagegroup-system-base \
+	packagegroup-system-tools \
+	packagegroup-hardening \
+	packagegroup-helium-base \
+	packagegroup-helium-tools \
 "
 
 IMAGE_FEATURES += " \
diff --git a/recipes-core/packagegroups/helium-packagegroup.inc b/recipes-core/packagegroups/helium-packagegroup.inc
new file mode 100644
index 0000000..15a9ab2
--- /dev/null
+++ b/recipes-core/packagegroups/helium-packagegroup.inc
@@ -0,0 +1,5 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
diff --git a/recipes-core/packagegroups/packagegroup-hardening.bb b/recipes-core/packagegroups/packagegroup-hardening.bb
new file mode 100644
index 0000000..032977c
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-hardening.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "System hardening package group"
+require helium-packagegroup.inc
+
+RDEPENDS:${PN} = " \
+	hidepid \
+"
diff --git a/recipes-core/packagegroups/packagegroup-helium-base.bb b/recipes-core/packagegroups/packagegroup-helium-base.bb
new file mode 100644
index 0000000..8f6599e
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-helium-base.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Helium base package group"
+require helium-packagegroup.inc
+
+RDEPENDS:${PN} = " \
+	helium-repos \
+	htoprc \
+"
diff --git a/recipes-core/packagegroups/packagegroup-helium-tools.bb b/recipes-core/packagegroups/packagegroup-helium-tools.bb
new file mode 100644
index 0000000..cf3ff9f
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-helium-tools.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Helium tools package group"
+require helium-packagegroup.inc
+
+RDEPENDS:${PN} = " \
+"
diff --git a/recipes-core/packagegroups/packagegroup-system-base.bb b/recipes-core/packagegroups/packagegroup-system-base.bb
new file mode 100644
index 0000000..4aeaca5
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-system-base.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Base system package group"
+require helium-packagegroup.inc
+
+RDEPENDS:${PN} = " \
+	base-files \
+	base-passwd \
+	busybox \
+	busybox-syslog \
+	initscripts \
+	netbase \
+	networkmanager \
+	networkmanager-nmtui \
+	init-ifupdown \
+	tzdata \
+	dropbear \
+"
diff --git a/recipes-core/packagegroups/packagegroup-system-tools.bb b/recipes-core/packagegroups/packagegroup-system-tools.bb
new file mode 100644
index 0000000..185ca13
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-system-tools.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "System tools package group"
+require helium-packagegroup.inc
+
+RDEPENDS:${PN} = " \
+	less \
+	htop \
+	screen \
+	nano \
+"