diff --git a/recipes-core/images/netmodule-linux-image-dev.bb b/recipes-core/images/netmodule-linux-image-dev.bb
index 0d926e2..69b137f 100644
--- a/recipes-core/images/netmodule-linux-image-dev.bb
+++ b/recipes-core/images/netmodule-linux-image-dev.bb
@@ -56,6 +56,6 @@ IMAGE_INSTALL_append = " \
                 board-descriptor \
                 tmate \
                 imu-setup \
-                ${@bb.utils.contains("MACHINE_FEATURES", "toby-l2", "ublox-gsm-fw-update", "", d)} \
+                ${@bb.utils.contains("WWAN_VENDORS", "ublox", "ublox-gsm-fw-update", "", d)} \
                 "
 OSTREE_BRANCHNAME = "${LAYERSERIES_CORENAMES}-${MACHINE}-dev"
diff --git a/recipes-core/images/netmodule-linux-image-minimal.bb b/recipes-core/images/netmodule-linux-image-minimal.bb
index f8c6cd3..a3b4e16 100644
--- a/recipes-core/images/netmodule-linux-image-minimal.bb
+++ b/recipes-core/images/netmodule-linux-image-minimal.bb
@@ -25,7 +25,7 @@ IMAGE_INSTALL = " \
     ncurses-terminfo-base \
     kernel-devicetree \
     haveged \
-    ${@bb.utils.contains("MACHINE_FEATURES", "toby-l2", "ublox-gsm-config", "", d)} \
+    ${@bb.utils.contains("MACHINE_FEATURES", "wwan", "wwan-config", "", d)} \
     "
 
 LICENSE = "BSD"
diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index 4ae0ca5..0f26958 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -11,6 +11,10 @@ IMAGE_FEATURES_append = " \
                 ssh-server-openssh \
                 "
 
+WWAN_TOOLS = " \
+                modemmanager \
+                wwan-config \
+            "
 BT_TOOLS = " \
                 bluez5-obex \
                 bluez5-noinst-tools \
@@ -46,7 +50,7 @@ IMAGE_INSTALL_append = " \
                 less \
                 nmhw-auto-part \
                 libgpiod \
-                ${@bb.utils.contains("MACHINE_FEATURES", "toby-l2", "ublox-gsm-config", "", d)} \
+                ${@bb.utils.contains("MACHINE_FEATURES", "wwan", "${WWAN_TOOLS}", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "${BT_TOOLS}", "", d)} \
                 ${FIRMWARE} \
                 wireless-regdb-static \