diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index 1987fef..f2b1174 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -38,6 +38,11 @@ FIRMWARE_armada-385 = " \
                 linux-firmware-ath6k \
                 linux-firmware-ath9k \
                 "
+BT_TOOLS = " \
+                bluez5-obex \
+                bluez5-noinst-tools \
+                ${@bb.utils.contains("MACHINE_FEATURES", "tibluetooth", "tibluetooth", "", d)} \
+           "
 
 IMAGE_INSTALL_append = " \
                 hostapd \
@@ -66,16 +71,15 @@ IMAGE_INSTALL_append = " \
                 curl \
                 less \
                 nmhw-auto-part \
+                libgpiod \
                 ${@bb.utils.contains("MACHINE_FEATURES", "toby-l2", "ublox-gsm-config", "", d)} \
+                ${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "${BT_TOOLS}", "", d)} \
                 ${FIRMWARE} \
                 "
 
 IMAGE_INSTALL_cortex9hf-neon_append = " kernel-devicetree "
 IMAGE_INSTALL_cortex9hf_append = " kernel-devicetree "
 IMAGE_INSTALL_append_am335x-nrhw16 = " \
-                tibluetooth \
-                bluez5-obex \
-                bluez5-noinst-tools \
                 canutils \
                 wakeup-timer \
                 "
@@ -84,20 +88,10 @@ IMAGE_INSTALL_append_armada-385-nrhw18 = " \
                 fpga-image \
                 "
 
-IMAGE_INSTALL_append_am335x-nrhw20 = " \
-                tibluetooth \
-                bluez5-obex \
-                bluez5-noinst-tools \
-                "
-
 IMAGE_INSTALL_append_am335x-nmhw21 = " \
-                tibluetooth \
-                bluez5-obex \
-                bluez5-noinst-tools \
                 can-utils \
                 spitools \
                 socat \
-                libgpiod \
                 battery-test \
                 cryptodev-module \
                 socket-uart \