diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc
index 525de6725..23f07ccb0 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6.inc
@@ -20,21 +20,13 @@ STORAGE_MEDIA = "mmc"
 # Wireless external module
 WIRELESS_MODULE ?= ""
 
-# Firmware
-MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx6q"
-MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q"
-MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d"
-
 MACHINE_EXTRA_RDEPENDS += " \
     e2fsprogs-mke2fs \
     e2fsprogs-resize2fs \
     parted \
 "
 
-MACHINE_EXTRA_RRECOMMENDS += " \
-    ${MACHINE_FIRMWARE} \
-    ${WIRELESS_MODULE} \
-"
+MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
 
 MACHINE_FEATURES += "accel-graphics wifi bluetooth pci"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index 3e7bc79bb..d3d18ed42 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -22,8 +22,7 @@ WIRELESS_MODULE ?= ""
 WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
 HAS_WIFI_VIRTWLANS = "true"
 
-# Firmware
-MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx6q"
+# Machine firmware
 MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
 MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
 
@@ -32,10 +31,7 @@ MACHINE_EXTRA_RDEPENDS += " \
     mtd-utils-ubifs \
 "
 
-MACHINE_EXTRA_RRECOMMENDS += " \
-    ${MACHINE_FIRMWARE} \
-    ${WIRELESS_MODULE} \
-"
+MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
 
 MACHINE_FEATURES += "wifi bluetooth cryptochip mca"
 MACHINE_FEATURES:remove:use-mainline-bsp = "wifi"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc
index a78eb6206..5d7b62240 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8m.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc
@@ -34,8 +34,7 @@ WIRELESS_MODULE ?= ""
 WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
 HAS_WIFI_VIRTWLANS = "true"
 
-# Firmware
-MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn"
+# Machine firmware
 MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
 MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
 
@@ -46,10 +45,7 @@ MACHINE_EXTRA_RDEPENDS += " \
     xbee-init \
 "
 
-MACHINE_EXTRA_RRECOMMENDS += " \
-    ${MACHINE_FIRMWARE} \
-    ${WIRELESS_MODULE} \
-"
+MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
 
 MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip mca optee"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index 66f457243..4a18f5d11 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -47,8 +47,7 @@ WIRELESS_MODULE ?= ""
 WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
 HAS_WIFI_VIRTWLANS = "true"
 
-# Firmware
-MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma-imx7d"
+# Machine firmware
 MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}"
 MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}"
 
@@ -63,10 +62,7 @@ MACHINE_EXTRA_RDEPENDS += " \
     xbee-init \
 "
 
-MACHINE_EXTRA_RRECOMMENDS += " \
-    ${MACHINE_FIRMWARE} \
-    ${WIRELESS_MODULE} \
-"
+MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
 
 MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip pci mca"
 
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index 5f5af3da8..19deabe9d 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -190,6 +190,18 @@ IMX_EXTRA_FIRMWARE:mx8m-generic-bsp  = "firmware-imx-8m"
 IMX_EXTRA_FIRMWARE:mx8x-generic-bsp  = "imx-sc-firmware imx-seco"
 IMX_EXTRA_FIRMWARE:mx93-generic-bsp  = "firmware-imx-9 firmware-sentinel"
 
+# Firmware
+MACHINE_FIRMWARE ?= ""
+MACHINE_FIRMWARE:append:mx6-generic-bsp      = " firmware-imx-sdma-imx6q"
+MACHINE_FIRMWARE:append:mx6q-generic-bsp     = " firmware-imx-vpu-imx6q"
+MACHINE_FIRMWARE:append:mx6dl-generic-bsp    = " firmware-imx-vpu-imx6d firmware-imx-epdc"
+MACHINE_FIRMWARE:append:mx8mm-generic-bsp    = " firmware-imx-sdma-imx7d"
+MACHINE_FIRMWARE:append:mx8mn-generic-bsp    = " firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn"
+MACHINE_FIRMWARE:append:mx8qxp-generic-bsp   = " firmware-imx-sdma-imx7d firmware-imx-vpu-imx8"
+MACHINE_FIRMWARE:append:mx8dx-generic-bsp    = " firmware-imx-sdma-imx7d firmware-imx-vpu-imx8"
+
+MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
+
 # Extra audio support
 IMX_ALSA_EXTRA = ""
 IMX_ALSA_EXTRA:imx-nxp-bsp = "imx-alsa-plugins"