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 49e60da78..fbbeb82ae 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,11 +8,11 @@ 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 59ce1c267568..c4855d7f5e82 100644
+index 9bbee908fe80..8eba2f6d917a 100644
 --- a/plat/imx/imx93/include/platform_def.h
 +++ b/plat/imx/imx93/include/platform_def.h
-@@ -53,7 +53,7 @@
- #define MAX_MMAP_REGIONS		16
+@@ -61,7 +61,7 @@
+ #define MAX_MMAP_REGIONS		17
  #endif
  
 -#define IMX_LPUART_BASE			0x44380000
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
index ef98ab91a..162111c5b 100644
--- 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
@@ -7,6 +7,7 @@ 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"
+# Tag: lf-6.1.36-2.1.0
+SRCREV = "1a3beeab6484343a4bd0ee08e947d142db4a5ae6"
 
 COMPATIBLE_MACHINE = "(ccimx93)"