diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.19.0.imx.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.19.0.imx.bbappend
new file mode 100644
index 000000000..1ec0dbe22
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.19.0.imx.bbappend
@@ -0,0 +1,5 @@
+# Copyright (C) 2023 Digi International
+
+# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
+SRCBRANCH:ccimx93 = "lf-6.1.1_1.0.0"
+SRCREV:ccimx93 = "01231b7a7ce03cdf9d3f48e7baa0bce17aac28f7"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0001-core-imx-support-ccimx93-dvk.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0001-core-imx-support-ccimx93-dvk.patch
new file mode 100644
index 000000000..4cc8db6dd
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0001-core-imx-support-ccimx93-dvk.patch
@@ -0,0 +1,46 @@
+From: Javier Viguera <javier.viguera@digi.com>
+Date: Mon, 15 May 2023 17:59:54 +0200
+Subject: [PATCH] core: imx: support ccimx93-dvk
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ core/arch/arm/plat-imx/conf.mk           | 6 ++++++
+ core/arch/arm/plat-imx/registers/imx93.h | 1 +
+ 2 files changed, 7 insertions(+)
+
+diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
+index 433313a925b9..9febafb19fbd 100644
+--- a/core/arch/arm/plat-imx/conf.mk
++++ b/core/arch/arm/plat-imx/conf.mk
+@@ -89,6 +89,7 @@ mx8ulp-flavorlist = \
+ 	mx8ulpevk \
+ 
+ mx93-flavorlist = \
++	ccimx93dvk \
+ 	mx93evk \
+ 
+ ifneq (,$(filter $(PLATFORM_FLAVOR),$(mx6ul-flavorlist)))
+@@ -457,6 +458,11 @@ CFG_DDR_SIZE ?= 0x80000000
+ CFG_UART_BASE ?= UART1_BASE
+ endif
+ 
++ifneq (,$(filter $(PLATFORM_FLAVOR),ccimx93dvk))
++CFG_DDR_SIZE ?= 0x40000000
++CFG_UART_BASE ?= UART6_BASE
++endif
++
+ # i.MX6 Solo/SL/SoloX/DualLite/Dual/Quad specific config
+ ifeq ($(filter y, $(CFG_MX6QP) $(CFG_MX6Q) $(CFG_MX6D) $(CFG_MX6DL) $(CFG_MX6S) \
+ 	$(CFG_MX6SL) $(CFG_MX6SLL) $(CFG_MX6SX)), y)
+diff --git a/core/arch/arm/plat-imx/registers/imx93.h b/core/arch/arm/plat-imx/registers/imx93.h
+index e91607537380..66a6408109c2 100644
+--- a/core/arch/arm/plat-imx/registers/imx93.h
++++ b/core/arch/arm/plat-imx/registers/imx93.h
+@@ -9,6 +9,7 @@
+ #define GICR_BASE 0x48040000
+ 
+ #define UART1_BASE 0x44380000
++#define UART6_BASE 0x425a0000
+ #define MU_BASE	   0x47520000
+ #define MU_SIZE	   0x10000
+ 
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.19.0.imx.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.19.0.imx.bbappend
new file mode 100644
index 000000000..ffde98a72
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.19.0.imx.bbappend
@@ -0,0 +1,8 @@
+# Copyright (C) 2023 Digi International
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
+
+# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
+SRC_URI:append:ccimx93 = " file://0001-core-imx-support-ccimx93-dvk.patch"
+SRCBRANCH:ccimx93 = "lf-6.1.1_1.0.0"
+SRCREV:ccimx93 = "ad4e8389bb2c38efe39853925eec571ac778c575"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.19.0.imx.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.19.0.imx.bbappend
new file mode 100644
index 000000000..dd63c202f
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.19.0.imx.bbappend
@@ -0,0 +1,5 @@
+# Copyright (C) 2023 Digi International
+
+# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
+SRCBRANCH:ccimx93 = "lf-6.1.1_1.0.0"
+SRCREV:ccimx93 = "7c314e6a0cec0ba19246eb4f1959859d7a6536d6"