diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index 5db4343..6abe094 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -36,8 +36,7 @@ IMAGE_INSTALL_append = " \
                 pciutils \
                 kernel-modules \
                 kernel-devicetree \
-                networkmanager \
-                modemmanager \
+                packagegroup-netmodule-linux \
                 parted \
                 rng-tools \
                 glibc-utils \
@@ -50,7 +49,6 @@ IMAGE_INSTALL_append = " \
                 curl \
                 less \
                 nmhw-auto-part \
-                libgpiod \
                 ${@bb.utils.contains("MACHINE_FEATURES", "wwan", "${WWAN_TOOLS}", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "${BT_TOOLS}", "", d)} \
                 ${FIRMWARE} \
@@ -121,11 +119,3 @@ OSTREE_BRANCHNAME = "${LAYERSERIES_CORENAMES}-${MACHINE}"
 
 BUILDNAME = "${DISTRO_VERSION};${DATETIME};${PN}"
 
-TOOLCHAIN_TARGET_TASK_append = " \
-    cpputest-staticdev \
-    libnmapp-staticdev \
-"
-TOOLCHAIN_HOST_TASK_append = " \
-    nativesdk-cpputest-staticdev \
-    nativesdk-libnmapp-staticdev \
-"
diff --git a/recipes-core/packagegroups/packagegroup-netmodule-linux.bb b/recipes-core/packagegroups/packagegroup-netmodule-linux.bb
new file mode 100644
index 0000000..541a80a
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-netmodule-linux.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Netmodule Linux Packages"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS_${PN} += " \
+    modemmanager \
+    networkmanager \
+    libgpiod \
+    gnss-mgr \
+"
diff --git a/recipes-core/sdk/netmodule-linux-sdk.bb b/recipes-core/sdk/netmodule-linux-sdk.bb
new file mode 100644
index 0000000..cc29c42
--- /dev/null
+++ b/recipes-core/sdk/netmodule-linux-sdk.bb
@@ -0,0 +1,12 @@
+SUMMARY = "NetModule Linux SDK"
+
+LICENSE = "MIT"
+
+inherit populate_sdk
+
+TOOLCHAIN_TARGET_TASK_append = " \
+    packagegroup-netmodule-linux \
+    cpputest-staticdev \
+    libnmapp-staticdev \
+"
+