diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index b0c384352..32bdc68ee 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -52,6 +52,10 @@ MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma-imx7d"
 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)}"
 
+# For the ccimx8x, we generate images for both the B0 and the C0 revisions of
+# the i.MX8X silicon, so deploy both versions of the firmware.
+SECO_FIRMWARE_NAME:ccimx8x = "mx8qx*0-ahab-container.img"
+
 MACHINE_EXTRA_RDEPENDS += " \
     e2fsprogs-mke2fs \
     e2fsprogs-resize2fs \
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/ccimx8x-seco-fw.inc b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/ccimx8x-seco-fw.inc
deleted file mode 100644
index 060c610ed..000000000
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/ccimx8x-seco-fw.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# For the ccimx8x, we generate images for both the B0 and the C0 revisions of
-# the i.MX8X silicon, so deploy both versions of the firmware.
-SECO_FIRMWARE_NAME:ccimx8x = "mx8qx*0-ahab-container.img"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_%.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_%.bbappend
deleted file mode 100644
index 341995bc7..000000000
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-seco/imx-seco_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright (C) 2013-2021 Digi International.
-require ccimx8x-seco-fw.inc