diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0005-ccimx93-use-UART6-for-the-default-console.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0005-ccimx93-use-UART6-for-the-default-console.patch
index 3bc032412..49e60da78 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0005-ccimx93-use-UART6-for-the-default-console.patch
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0005-ccimx93-use-UART6-for-the-default-console.patch
@@ -8,12 +8,12 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/plat/imx/imx93/include/platform_def.h b/plat/imx/imx93/include/platform_def.h
-index a820c27a5b49..a563d8852d23 100644
+index 59ce1c267568..c4855d7f5e82 100644
 --- a/plat/imx/imx93/include/platform_def.h
 +++ b/plat/imx/imx93/include/platform_def.h
-@@ -47,7 +47,7 @@
- #define MAX_XLAT_TABLES			12
+@@ -53,7 +53,7 @@
  #define MAX_MMAP_REGIONS		16
+ #endif
  
 -#define IMX_LPUART_BASE			0x44380000
 +#define IMX_LPUART_BASE			0x425a0000
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.6.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
similarity index 77%
rename from meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.6.bbappend
rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
index 838934f26..9d804184b 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.6.bbappend
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -2,18 +2,16 @@
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI:append = " \
+SRC_URI:append:ccimx8m = " \
     file://0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch \
     file://0002-imx8mm-Disable-M4-debug-console.patch \
     file://0003-imx8mn-Define-UART1-as-console-for-boot-stage.patch \
     file://0004-imx8mn-Disable-M7-debug-console.patch \
+"
+SRC_URI:append:ccimx93 = " \
     file://0005-ccimx93-use-UART6-for-the-default-console.patch \
 "
 
-# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
-SRCREV:ccimx93 = "616a4588f333522d50a55bedd2b9a90a51474a75"
-SRC_URI:remove:ccimx93 = "file://0001-Makefile-Suppress-array-bounds-error.patch"
-
 BOOT_TOOLS = "imx-boot-tools"
 
 do_deploy:append() {
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb
new file mode 100644
index 000000000..ef98ab91a
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb
@@ -0,0 +1,12 @@
+# Copyright 2023 Digi International Inc.
+
+#
+# Reuse meta-freescale's imx-atf_2.6.bb
+#
+require recipes-bsp/imx-atf/imx-atf_2.6.bb
+
+SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf_v2.8"
+SRCREV = "99195a23d3aef485fb8f10939583b1bdef18881c"
+
+COMPATIBLE_MACHINE = "(ccimx93)"