diff --git a/meta-bsp/conf/machine/include/imx-base-extend.inc b/meta-bsp/conf/machine/include/imx-base-extend.inc
index 956d94471c..b0d79dad48 100644
--- a/meta-bsp/conf/machine/include/imx-base-extend.inc
+++ b/meta-bsp/conf/machine/include/imx-base-extend.inc
@@ -45,22 +45,22 @@ PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.115.imx"
 PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.115.imx"
 PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.115.imx"
 
-PREFERRED_VERSION_optee-client:mx6-nxp-bsp ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-client:mx7-nxp-bsp ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-os:mx6-nxp-bsp     ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-os:mx7-nxp-bsp     ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-os:mx9-nxp-bsp     ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-test:mx6-nxp-bsp   ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-test:mx7-nxp-bsp   ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-test:mx9-nxp-bsp   ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-os-tadevkit:mx6-nxp-bsp   ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-os-tadevkit:mx7-nxp-bsp   ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-os-tadevkit:mx8-nxp-bsp   ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-os-tadevkit:mx9-nxp-bsp   ??= "3.21.0.imx"
+PREFERRED_VERSION_optee-client:mx6-nxp-bsp ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-client:mx7-nxp-bsp ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os:mx6-nxp-bsp     ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os:mx7-nxp-bsp     ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os:mx9-nxp-bsp     ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-test:mx6-nxp-bsp   ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-test:mx7-nxp-bsp   ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-test:mx9-nxp-bsp   ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os-tadevkit:mx6-nxp-bsp   ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os-tadevkit:mx7-nxp-bsp   ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os-tadevkit:mx8-nxp-bsp   ??= "4.0.0.imx"
+PREFERRED_VERSION_optee-os-tadevkit:mx9-nxp-bsp   ??= "4.0.0.imx"
 
 PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.7.0.imx"
 PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.7.0.imx"