diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/environment.d-optee-sdk.sh b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/environment.d-optee-sdk.sh
new file mode 100644
index 000000000..c929f303a
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/environment.d-optee-sdk.sh
@@ -0,0 +1,3 @@
+export TEEC_EXPORT=$SDKTARGETSYSROOT/usr
+export TA_DEV_KIT_DIR=$SDKTARGETSYSROOT/usr/include/optee/export-user_ta_#OPTEE_ARCH#
+export LIBGCC_LOCATE_CFLAGS=--sysroot=$SDKTARGETSYSROOT
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
index 67d5a5ccf..2338caf72 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
@@ -10,6 +10,7 @@ SRC_URI = " \
     file://0007-allow-setting-sysroot-for-clang.patch \
     file://0001-core-imx-support-ccimx93-dvk.patch \
     file://0002-core-ccimx93-enable-AES_HUK-trusted-application.patch \
+    file://environment.d-optee-sdk.sh \
 "
 SRCBRANCH = "lf-6.1.55_2.2.0"
 # Tag: lf-6.1.55-2.2.0
@@ -22,8 +23,15 @@ do_compile:append:ccimx93 () {
 }
 do_compile[cleandirs] += "${B}-A0"
 
+do_install:append:ccimx93 () {
+	mkdir -p ${D}/environment-setup.d
+	sed -e "s,#OPTEE_ARCH#,${OPTEE_ARCH},g" ${WORKDIR}/environment.d-optee-sdk.sh > ${D}/environment-setup.d/optee-sdk.sh
+}
+
 do_deploy:append:ccimx93 () {
     cp ${B}-A0/core/tee-raw.bin ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}_a0.bin
 }
 
+FILES:${PN}-staticdev += "/environment-setup.d/"
+
 COMPATIBLE_MACHINE = "(ccimx93)"