diff --git a/tc2-bsp.xml b/tc2-bsp.xml
index a2cb6d5e2f310a6d57eed5280f965eb51e3ec7bd..0a7d36afefa2bc61696333913e5b6ad1ebc3daa6 100644
--- a/tc2-bsp.xml
+++ b/tc2-bsp.xml
@@ -11,7 +11,7 @@
   <project path="src/rss/tf-m-tests"     name="TF-M/tf-m-tests.git"                   groups="android, bsp, trusty" revision="710c64046b50f092312855bb29d4045d813d8578" remote="tfo" />
   <project path="src/SCP-firmware"       name="ARM-software/SCP-firmware.git"         groups="android, bsp, trusty" revision="7ee99e48c1c3209b1a8ab98d88f9d1be009894cd" remote="github" />
   <project path="src/trusted-firmware-a" name="TF-A/trusted-firmware-a.git"           groups="android, bsp, trusty" revision="e95abc4c01822ef43e9e874d63d6596dc0b57279" remote="tfo" />
-  <project path="src/u-boot"             name="u-boot/u-boot.git"                     groups="android, bsp, trusty" revision="refs/tags/v2022.01"                       remote="github" />
+  <project path="src/u-boot"             name="u-boot/u-boot.git"                     groups="android, bsp, trusty" revision="refs/tags/v2022.04"                       remote="github" />
   <project path="src/hafnium"            name="hafnium/hafnium.git"                   groups="android, bsp, trusty" revision="dd0561820946fe23bcd57cc129140437f72102a5" remote="tfo" />
   <project path="src/linux"              name="kernel/common.git"                     groups="android, bsp, trusty" revision="e8b3f31d7a60648343ecbd45ab58dbcfc425b22c" remote="aosp" />
   <project path="src/optee_client"       name="OP-TEE/optee_client.git"               groups="android, bsp, trusty" revision="refs/tags/3.18.0"                         remote="github" />
@@ -19,6 +19,6 @@
   <project path="src/optee_test"         name="OP-TEE/optee_test.git"                 groups="android, bsp, trusty" revision="d09b43bcc61d740c6ab81392edc1da7ae69e5a5f" remote="github" />
   <project path="src/buildroot"          name="buildroot/buildroot.git"               groups="android, bsp, trusty" revision="730baf05bfebac721bf5002d72787937a4da6378" remote="github" />
   <project path="src/mbedtls"            name="ARMmbed/mbedtls.git"                   groups="android, bsp, trusty" revision="refs/tags/mbedtls-2.28.0"                 remote="github" />
-  <project path="src/arm-ffa-user"       name="linux-arm/linux-trusted-services.git"  groups="android, bsp, trusty" revision="6a6c6206dd78228333547989dce7283ef62d1353" remote="arm" />
-  <project path="src/trusted-services"   name="TS/trusted-services.git"               groups="android, bsp, trusty" revision="22c47a9355ea4096f85939c45ff69bb45d31e90c" remote="tfo" />
+  <project path="src/arm-ffa-tee"        name="linux-arm/linux-trusted-services.git"  groups="android, bsp, trusty" revision="6eab9191e172e992376b64b6b6d9aa2fcaec18bb" remote="arm" />
+  <project path="src/trusted-services"   name="TS/trusted-services.git"               groups="android, bsp, trusty" revision="1b0c520279445fc4d85fc582eda5e5ff5f380c39" remote="tfo" />
 </manifest>