diff --git a/qemu_v8.xml b/qemu_v8.xml
index d85559e6c..ad84b959a 100644
--- a/qemu_v8.xml
+++ b/qemu_v8.xml
@@ -6,24 +6,24 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"         name="OP-TEE/optee_client.git" />
-        <project path="optee_os"             name="OP-TEE/optee_os.git" />
-        <project path="optee_test"           name="OP-TEE/optee_test.git" />
-        <project path="build"                name="OP-TEE/build.git">
+        <project path="optee_client"         name="OP-TEE/optee_client.git" revision="nxp-sdp" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git"     revision="nxp-sdp" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git"   revision="nxp-sdp" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git"        revision="nxp-sdp" clone-depth="1">
                 <linkfile src="qemu_v8.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="optee" clone-depth="1" />
+        <project path="linux"                name="linaro-swg/linux.git"                         revision="nxp-sdp" clone-depth="1" />
         <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git"/>
         <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
 
         <!-- Misc gits -->
-        <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2022.11.1" clone-depth="1" />
-        <project path="mbedtls"              name="Mbed-TLS/mbedtls.git"                   revision="refs/tags/mbedtls-2.26.0" clone-depth="1" />
-        <project path="optee_rust"           name="apache/incubator-teaclave-trustzone-sdk.git"            revision="4031e7282a8f398f54faa19acb2b84fab05de877" />
-        <project path="qemu"                 name="qemu/qemu.git"                         revision="refs/tags/v8.0.0" clone-depth="1" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.9" clone-depth="1" remote="tfo" />
-        <project path="hafnium"   name="hafnium/hafnium.git"           revision="refs/tags/v2.9" clone-depth="1" remote="tfo" />
-        <project path="u-boot"               name="u-boot.git"                            revision="refs/tags/v2023.07.02" remote="u-boot" clone-depth="1" />
+        <project path="buildroot"            name="buildroot/buildroot.git"                      revision="refs/tags/2022.11.1" clone-depth="1" />
+        <project path="mbedtls"              name="Mbed-TLS/mbedtls.git"                         revision="refs/tags/mbedtls-2.26.0" clone-depth="1" />
+        <project path="optee_rust"           name="apache/incubator-teaclave-trustzone-sdk.git"  revision="4031e7282a8f398f54faa19acb2b84fab05de877" />
+        <project path="qemu"                 name="qemu/qemu.git"                                revision="refs/tags/v8.0.0" clone-depth="1" />
+        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"                  revision="refs/tags/v2.9" clone-depth="1" remote="tfo" />
+        <project path="hafnium"              name="hafnium/hafnium.git"                          revision="refs/tags/v2.9" clone-depth="1" remote="tfo" />
+        <project path="u-boot"               name="u-boot.git"                                   revision="refs/tags/v2023.07.02" remote="u-boot" clone-depth="1" />
 </manifest>