diff --git a/bootloaders-next.xml b/bootloaders-next.xml
index 5958d0b5467311be932e488e2bfac23d31c159fd..ad03c889f98d89529fa2b5138a9513c558c88246 100644
--- a/bootloaders-next.xml
+++ b/bootloaders-next.xml
@@ -7,8 +7,8 @@
     <project name="android/bootloader/build-bootloaders.git" path="build" remote="baylibre" revision="integ/ti-u-boot-2024.04" />
     <project name="ti-u-boot" path="u-boot" remote="baylibre" revision="integ/ti-u-boot-2024.04" />
     <project name="atf/arm-trusted-firmware.git" path="arm-trusted-firmware" remote="ti" revision="refs/tags/09.02.00.009" clone-depth="1" />
-    <project name="optee/ti-optee-os" path="optee-os" remote="ti" revision="refs/tags/09.02.00.009" />
-    <project name="OP-TEE/optee_test.git" path="optee-ta/optee_test" remote="github" revision="refs/tags/4.1.0" />
+    <project name="OP-TEE/optee_os.git" path="optee-os" remote="github" revision="refs/tags/4.2.0" />
+    <project name="OP-TEE/optee_test.git" path="optee-ta/optee_test" remote="github" revision="refs/tags/4.2.0" />
     <project name="android/aosp/external/kmgk.git" path="optee-ta/kmgk" remote="baylibre" revision="ti-android-14"/>
     <project name="processor-firmware/ti-linux-firmware.git" path="ti-linux-firmware" remote="ti" revision="refs/tags/10.00.06" clone-depth="1"/>
 </manifest>
diff --git a/bootloaders.xml b/bootloaders.xml
index 2b40460fffc2337e433747c30d841986b3725c7e..fa4e3d855a2fd7f7aff807293d2ae9587a82a5c3 100644
--- a/bootloaders.xml
+++ b/bootloaders.xml
@@ -7,8 +7,8 @@
     <project name="android/bootloader/build-bootloaders.git" path="build" remote="baylibre" revision="ti-android-14" />
     <project name="ti-u-boot" path="u-boot" remote="baylibre" revision="integ/ti-u-boot-2023.04" />
     <project name="atf/arm-trusted-firmware.git" path="arm-trusted-firmware" remote="ti" revision="refs/tags/09.02.00.009" clone-depth="1" />
-    <project name="optee/ti-optee-os" path="optee-os" remote="ti" revision="refs/tags/09.02.00.009" />
-    <project name="OP-TEE/optee_test.git" path="optee-ta/optee_test" remote="github" revision="refs/tags/4.1.0" />
+    <project name="OP-TEE/optee_os.git" path="optee-os" remote="github" revision="refs/tags/4.2.0" />
+    <project name="OP-TEE/optee_test.git" path="optee-ta/optee_test" remote="github" revision="refs/tags/4.2.0" />
     <project name="android/aosp/external/kmgk.git" path="optee-ta/kmgk" remote="baylibre" revision="ti-android-14"/>
     <project name="processor-firmware/ti-linux-firmware.git" path="ti-linux-firmware" remote="ti" revision="refs/tags/10.00.06" clone-depth="1"/>
 </manifest>
diff --git a/default.xml b/default.xml
index 24d94e0c7e33b98debfd738edbdf2054f99cc03b..2f084e247fb48990382cb9edf0a8cb6dc668f7b1 100644
--- a/default.xml
+++ b/default.xml
@@ -1423,7 +1423,7 @@
   <project path="external/libcamera" name="external/libcamera" remote="baylibre" revision="ti-android-14" groups="ti" />
 <!-- non AOSP Projects -->
   <project path="external/tinyhal" name="CirrusLogic/tinyhal.git" remote="github" revision="9c5df120b33ca51f05d4f997da659111ab63498e" groups="ti" />
-  <project path="vendor/linaro/optee-os" name="OP-TEE/optee_os" remote="github" revision="012cdca49db398693903e05c42a254a3a0c0d8f2" groups="ti" />
-  <project path="vendor/linaro/optee_client" name="OP-TEE/optee_client.git" remote="github" revision="afbd31d9592e8919cf2b6883e33d80fcc32ccdc2" groups="ti" />
-  <project path="external/optee_test" name="OP-TEE/optee_test.git" remote="github" revision="refs/tags/4.1.0" groups="ti" />
+  <project path="vendor/linaro/optee-os" name="OP-TEE/optee_os" remote="github" revision="refs/tags/4.2.0" groups="ti" />
+  <project path="vendor/linaro/optee_client" name="OP-TEE/optee_client.git" remote="github" revision="refs/tags/4.2.0" groups="ti" />
+  <project path="external/optee_test" name="OP-TEE/optee_test.git" remote="github" revision="refs/tags/4.2.0" groups="ti" />
 </manifest>