diff --git a/am43xx.xml b/am43xx.xml
index 665e1f9..42510fe 100644
--- a/am43xx.xml
+++ b/am43xx.xml
@@ -6,15 +6,15 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="am43xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples" name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />
diff --git a/am57xx.xml b/am57xx.xml
index 6a18130..5973055 100644
--- a/am57xx.xml
+++ b/am57xx.xml
@@ -6,15 +6,15 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="am57xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples" name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />
diff --git a/default.xml b/default.xml
index 734dbf0..8b8c351 100644
--- a/default.xml
+++ b/default.xml
@@ -6,20 +6,20 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"            name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"          name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"               name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="qemu.mk" dest="build/Makefile" />
                 <linkfile src="../toolchains/aarch32/bin/arm-linux-gnueabihf-gdb" dest="build/gdb" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
         <project path="soc_term"             name="linaro-swg/soc_term.git"               revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20" />
-        <project path="u-boot"               name="linaro-swg/u-boot.git"                 revision="optee" />
+        <project path="u-boot"               name="linaro-swg/u-boot.git"                 revision="6c35bd586b65d4ff6a86afc6536496cdb8095c3a" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />
diff --git a/dra7xx.xml b/dra7xx.xml
index 8f17336..e6cbddd 100644
--- a/dra7xx.xml
+++ b/dra7xx.xml
@@ -6,15 +6,15 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="dra7xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples" name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />
diff --git a/fvp.xml b/fvp.xml
index b429cd3..5fa1808 100644
--- a/fvp.xml
+++ b/fvp.xml
@@ -7,16 +7,16 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="fvp.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />
diff --git a/hikey.xml b/hikey.xml
index 39d3167..766d522 100644
--- a/hikey.xml
+++ b/hikey.xml
@@ -7,16 +7,16 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="hikey.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
         <project path="patches_hikey"        name="linaro-swg/patches_hikey.git"          revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
 
         <!-- Misc gits -->
diff --git a/hikey960.xml b/hikey960.xml
index b830279..0b870db 100644
--- a/hikey960.xml
+++ b/hikey960.xml
@@ -7,15 +7,15 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"              name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"            name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"                 name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="hikey960.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples"        name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"        name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
         <project path="patches_hikey"         name="linaro-swg/patches_hikey.git"             revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
 
         <!-- Misc gits -->
diff --git a/juno.xml b/juno.xml
index 612d0bc..55ecc34 100644
--- a/juno.xml
+++ b/juno.xml
@@ -7,16 +7,16 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="juno.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />
diff --git a/poplar.xml b/poplar.xml
index 84649e6..b666c99 100644
--- a/poplar.xml
+++ b/poplar.xml
@@ -7,15 +7,15 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="build"                name="OP-TEE/build.git" >
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1" >
                 <linkfile src="poplar.mk" dest="build/Makefile" />
         </project>
-        <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="optee_client"         name="OP-TEE/optee_client.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
 
         <!-- 96boards-poplar gits -->
         <project path="linux"                name="96boards-poplar/linux.git"             revision="poplar-4.9" clone-depth="1" />
diff --git a/qemu_v8.xml b/qemu_v8.xml
index bc9afec..8aa8af5 100644
--- a/qemu_v8.xml
+++ b/qemu_v8.xml
@@ -6,18 +6,18 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="qemu_v8.mk" dest="build/Makefile" />
                 <linkfile src="../toolchains/aarch64/bin/aarch64-linux-gnu-gdb" dest="build/gdb" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="9823b258b332b4ac98e05fa23448bbc9e937b24c" />
-        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git"/>
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.7.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
         <project path="soc_term"             name="linaro-swg/soc_term.git"               revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20" />
 
         <!-- Misc gits -->
diff --git a/rpi3.xml b/rpi3.xml
index 5ae147a..6a0f397 100644
--- a/rpi3.xml
+++ b/rpi3.xml
@@ -6,10 +6,10 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="rpi3.mk" dest="build/Makefile" />
                 <linkfile src="rpi3/debugger/pi3.cfg" dest="build/pi3.cfg" />
                 <linkfile src="../toolchains/aarch64/bin/aarch64-linux-gnu-gdb" dest="build/gdb" />
@@ -17,8 +17,8 @@
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="rpi3-optee-4.14" clone-depth="1" />
-        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git"/>
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.7.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.7.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="95942f5fcd35d783a49adce621ccf33480f1c88c" />
diff --git a/synquacer.xml b/synquacer.xml
index e322608..b4401e5 100644
--- a/synquacer.xml
+++ b/synquacer.xml
@@ -6,10 +6,10 @@
         <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="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.7.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.7.0" clone-depth="1">
                 <linkfile src="synquacer.mk" dest="build/Makefile" />
         </project>