diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
index ec1355381..9544e2b43 100644
--- a/meta-digi-arm/conf/machine/ccimx91-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
@@ -8,6 +8,28 @@ MACHINEOVERRIDES =. "mx91:${DIGI_FAMILY}:${DIGI_SOM}:"
 # Include the machine configuration for Digi's ConnectCore 9 module
 include conf/machine/include/ccimx9.inc
 
+# Console
+SERIAL_CONSOLES = "115200;ttyLP5"
+
+# Bluetooth tty
+BT_TTY ?= "ttyLP0"
+
+# Firmware
+MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-nxp-wifi-nxpiw612-sdio firmware-murata-nxp', '', d)}"
+MACHINE_FIRMWARE:append = " ethos-u-firmware"
+
+# Wi-Fi
+WIRELESS_MODULE ?= ""
+WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-nxp-wlan', '', d)}"
+HAS_WIFI_VIRTWLANS = "true"
+WLAN_P2P_INTERFACE = "p2p0"
+MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
+
+# XBee
+XBEE_RESET_N_GPIO ?= "gpio2@19"
+XBEE_SLEEP_RQ_GPIO ?= ""
+XBEE_TTY ?= "ttyLP3"
+
 # U-Boot configurations
 UBOOT_CONFIG ??= "ccimx91-dvk"
 UBOOT_CONFIG[ccimx91-dvk] = "ccimx91-dvk_defconfig"
diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
index 184c92c90..a2056b160 100644
--- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
@@ -8,6 +8,28 @@ MACHINEOVERRIDES =. "mx93:${DIGI_FAMILY}:${DIGI_SOM}:"
 # Include the machine configuration for Digi's ConnectCore 9 module
 include conf/machine/include/ccimx9.inc
 
+# Console
+SERIAL_CONSOLES = "115200;ttyLP5"
+
+# Bluetooth tty
+BT_TTY ?= "ttyLP0"
+
+# Firmware
+MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-nxp-wifi-nxpiw612-sdio firmware-murata-nxp', '', d)}"
+MACHINE_FIRMWARE:append = " ethos-u-firmware"
+
+# Wi-Fi
+WIRELESS_MODULE ?= ""
+WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-nxp-wlan', '', d)}"
+HAS_WIFI_VIRTWLANS = "true"
+WLAN_P2P_INTERFACE = "p2p0"
+MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
+
+# XBee
+XBEE_RESET_N_GPIO ?= "gpio2@19"
+XBEE_SLEEP_RQ_GPIO ?= ""
+XBEE_TTY ?= "ttyLP3"
+
 # U-Boot configurations
 UBOOT_CONFIG ??= "ccimx93-dvk"
 UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig"
@@ -53,9 +75,6 @@ FIT_CONF_DEFAULT_DTB = "ccimx93-dvk.dtb"
 # Per-machine DISTRO_FEATURES customization
 MACHINE_DISTRO_FEATURES_REMOVE = "vulkan"
 
-# Add additional firmware
-MACHINE_FIRMWARE:append = " ethos-u-firmware"
-
 # Boot artifacts to be copied from the deploy dir to the installer ZIP
 BOOTABLE_ARTIFACTS = " \
     imx-boot##SIGNED##-ccimx93-dvk.bin \
diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc
index 738396ef4..6b14c4378 100644
--- a/meta-digi-arm/conf/machine/include/ccimx9.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx9.inc
@@ -53,11 +53,6 @@ TRUSTFENCE_SIGN_MODE = "AHAB"
 
 IMX_BOOT_SEEK = "32"
 
-SERIAL_CONSOLES = "115200;ttyLP5"
-
-# Bluetooth tty
-BT_TTY ?= "ttyLP0"
-
 # SWUpdate sw-description configuration
 BOOTFS_EXT ?= ".boot.vfat"
 ROOTFS_EXT ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", ".squashfs", ".ext4.gz", d)}'
@@ -67,21 +62,6 @@ ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3"
 ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs"
 ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS') == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
 
-# Wireless external module
-WIRELESS_MODULE ?= ""
-WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-nxp-wlan', '', d)}"
-HAS_WIFI_VIRTWLANS = "true"
-
-# Machine firmware
-MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-nxp-wifi-nxpiw612-sdio firmware-murata-nxp', '', d)}"
-
-MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
-
-# XBee
-XBEE_RESET_N_GPIO ?= "gpio2@19"
-XBEE_SLEEP_RQ_GPIO ?= ""
-XBEE_TTY ?= "ttyLP3"
-
 # Default overlayfs_etc mount point and type
 OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
 OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7"