diff --git a/tc0-android.xml b/tc0-android.xml
index e2fca5ed296f48f062b4bc03fda64ecc56aa9e2d..70aa707ce33c3c17b2e9feeab72e14fc07dd6281 100644
--- a/tc0-android.xml
+++ b/tc0-android.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <remote fetch="http://android.googlesource.com" name="aosp"/>
-  <remote fetch="https://gitlab.arm.com" name="gitlab"/>
-  
+  <remote fetch="https://git.gitlab.arm.com/" name="arm"/>
+
   <default remote="aosp" revision="master" sync-j="4"/>
-  
+
   <manifest-server url="http://android-smartsync.corp.google.com/android.googlesource.com/manifestserver"/>
-  
+
   <project groups="android,device,yukawa,pdk" name="device/amlogic/yukawa" path="android/device/amlogic/yukawa" revision="45d5fb7c41d51e9d89b823c37b5cb82b1329bdbf"/>
   <project clone-depth="2" groups="android,device,yukawa,pdk" name="device/amlogic/yukawa-kernel" path="android/device/amlogic/yukawa-kernel" revision="73a206d155e93f8be08f6504136c1ebf3db507d0"/>
   <project groups="android,pdk-cw-fs,pdk" name="device/common" path="android/device/common" revision="85a2054f6e4ac15a7e21274bf97e6f18bd9a1811"/>
@@ -1051,8 +1051,8 @@
   <project groups="android,pdk,tradefed" name="platform/tools/tradefederation/prebuilts" path="android/tools/tradefederation/prebuilts" revision="10d2c069a3d6c317198072a99959d3b6f80e942b"/>
   <project groups="android,tools,pdk" name="platform/tools/treble" path="android/tools/treble" revision="70e844441019e6681ec07d070990812eb9eafb59"/>
   <project groups="android,tools,cts,pdk,pdk-cw-fs,pdk-fs" name="platform/tools/trebuchet" path="android/tools/trebuchet" revision="375f839d08f42cde0da7d623a44d0d082610662d"/>
-  <project groups="android" name="arm-reference-solutions/device-profile" path="android/device/arm" remote="gitlab" revision="806b00cb860a74f0d583f15d2108669d14feb2f8"/>
-  <project groups="android" name="arm-reference-solutions/build-scripts" path="android/build-scripts" remote="gitlab" revision="c22f660ba239c56f95007a5a0175662b6de04b47"/>
+  <project groups="android" name="arm-reference-solutions/device-profile" path="android/device/arm" remote="arm" revision="refs/tags/TC0-2021.07.31"/>
+  <project groups="android" name="arm-reference-solutions/build-scripts" path="android/build-scripts" remote="arm" revision="refs/tags/TC0-2021.07.31" />
   <project name="toolchain/benchmark" path="android/toolchain/benchmark" revision="6a2f47fb4d2707263b2d4336cca469d33b64406f"/>
   <project groups="android,pdk" name="toolchain/llvm-project" path="android/external/llvm-project" revision="664b187160dc951c2cea3b69f92decf358d8e75a"/>
   <project groups="android,pdk" name="toolchain/pgo-profiles" path="android/toolchain/pgo-profiles" revision="f76785651c6a6b23bfb8f4e5e801e2abdf923db5"/>
diff --git a/tc0-yocto.xml b/tc0-yocto.xml
index 3833ba19f525b4f0edd8bbfdbb69546f41520eb2..c29ae5cd315f2ee9ab5feb2d1e665b318a872dee 100644
--- a/tc0-yocto.xml
+++ b/tc0-yocto.xml
@@ -3,17 +3,19 @@
   <remote fetch="https://github.com" name="github"/>
   <remote fetch="https://git.yoctoproject.org/git" name="yocto"/>
   <remote fetch="https://git.openembedded.org/" name="openembedded"/>
-  <remote name="linaro" fetch="http://git.linaro.org"/>
   <remote fetch="https://gitlab.com/" name="gitlab" />
+  <remote fetch="https://git.gitlab.arm.com/" name="arm" />
 
-  <project name="landing-teams/working/arm/yocto-platform-config" groups="android,bsp" path="bsp/conf" remote="linaro" revision="refs/tags/TC0-2021.04.23">
+  <project name="arm-reference-solutions/yocto-platform-config" groups="android,bsp" path="bsp/conf" remote="arm" revision="refs/tags/TC0-2021.07.31">
     <linkfile dest="bsp/setup-environment" src="setup-environment"/>
   </project>
-  <project name="meta-yocto" path="bsp/layers/meta-yocto" groups="android,bsp" remote="yocto" revision="269f81c2b2ac64219c65953bc56bd41317a8db0f"/>
-  <project name="bitbake" path="bsp/bitbake" groups="android,bsp" remote="openembedded"  revision="fec2b85689bba1d26ad6f376bc11cc29bb27cbe5"/>
-  <project name="meta-openembedded" path="bsp/layers/meta-openembedded" groups="android,bsp" remote="openembedded" revision="b9dcf17700014dec679307dc1247882dccd439ca"/>
-  <project name="openembedded/community/meta-kernel" path="bsp/layers/meta-kernel" groups="android,bsp" remote="gitlab" revision="d1fb5bccbaece35e3481d73b3858c0d4e3695b9b"/>
-  <project name="openembedded-core" path="bsp/layers/openembedded-core" groups="android,bsp" remote="openembedded" revision="32e754ec89e8f33e5b6e83a8ac359ffc3690282f"/>
-  <project name="landing-teams/working/arm/yocto-recipes" path="bsp/layers/meta-arm" remote="linaro" groups="android,bsp" revision="refs/tags/TC0-2021.04.23"/>
-  <project name="landing-teams/working/arm/model-scripts" path="bsp/run-scripts" remote="linaro"  groups="android,bsp" revision="refs/tags/TC0-2021.04.23"/>
+
+  <project name="meta-yocto" path="bsp/layers/meta-yocto" groups="android,bsp" remote="yocto" revision="0575fa17ecf4d4723a2683c18f6fde921914ae0c"/>
+  <project name="bitbake" path="bsp/bitbake" groups="android,bsp" remote="openembedded"  revision="01825699044c42e87e485e6c64cc1dd9b6f87f48"/>
+  <project name="meta-openembedded" path="bsp/layers/meta-openembedded" groups="android,bsp" remote="openembedded" revision="7d64ce0490e2a8799ab2f64a24b4f63094da4f08"/>
+  <project name="openembedded/community/meta-kernel" path="bsp/layers/meta-kernel" groups="android,bsp" remote="gitlab" revision="4b288396eff43fe9b1a233aed1ce9b48329a2eb6"/>
+  <project name="openembedded-core" path="bsp/layers/openembedded-core" groups="android,bsp" remote="openembedded" revision="cbd17e7a9641d628f4222b3af320d808d7037eea"/>
+  <project name="meta-arm" path="bsp/layers/meta-arm" groups="android,bsp" remote="yocto" revision="4371f0daee7354367d99519884967c45c2759c22"/>
+  <project name="arm-reference-solutions/meta-tc" path="bsp/layers/meta-tc" groups="android,bsp" remote="arm" revision="refs/tags/TC0-2021.07.31"/>
+  <project name="arm-reference-solutions/model-scripts" path="bsp/run-scripts" groups="android,bsp" remote="arm" revision="refs/tags/TC0-2021.07.31"/>
 </manifest>