diff --git a/am43xx.xml b/am43xx.xml
index dee4d54..bf3c543 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.15.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.15.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.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/am57xx.xml b/am57xx.xml
index 2360c1c..8f79d05 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.15.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.15.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.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/default.xml b/default.xml
index 4db71f8..b2cf70f 100644
--- a/default.xml
+++ b/default.xml
@@ -7,17 +7,17 @@
         <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.15.0" clone-depth="1" />
+        <project path="optee_os"            name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"          name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"               name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1">
                 <linkfile src="qemu.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="optee" 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="linux"                name="linaro-swg/linux.git"                  revision="refs/tags/optee-3.15.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/dra7xx.xml b/dra7xx.xml
index 3093e49..80d2581 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.15.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.15.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.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/fvp.xml b/fvp.xml
index 7e95ee2..3126df5 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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1">
                 <linkfile src="fvp.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="optee" clone-depth="1" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="linux"                name="linaro-swg/linux.git"                  revision="refs/tags/optee-3.15.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/hikey.xml b/hikey.xml
index 1f9f80d..cf022e6 100644
--- a/hikey.xml
+++ b/hikey.xml
@@ -7,17 +7,17 @@
         <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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1">
                 <linkfile src="hikey.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="optee" 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="linux"                name="linaro-swg/linux.git"                  revision="refs/tags/optee-3.15.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.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 6250ed7..1afe1c2 100644
--- a/hikey960.xml
+++ b/hikey960.xml
@@ -7,22 +7,22 @@
         <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.15.0" clone-depth="1" />
+        <project path="optee_os"              name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"            name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"                 name="OP-TEE/build.git" revision="refs/tags/3.15.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.15.0" clone-depth="1" />
         <project path="patches_hikey"         name="linaro-swg/patches_hikey.git"             revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
 
         <!-- Misc gits -->
         <project path="buildroot"             name="buildroot/buildroot.git"                  revision="refs/tags/2021.08" clone-depth="1" />
         <project path="edk2"                  name="96boards-hikey/edk2.git"                  revision="77326b5a153513c826d5a50363eace6ef6b59413" />
         <project path="grub"                  name="grub.git"                                 revision="refs/tags/grub-2.02" clone-depth="1" remote="savannah" />
-        <project path="linux"                 name="linaro-swg/linux.git"                     revision="optee" clone-depth="1" />
+        <project path="linux"                 name="linaro-swg/linux.git"                     revision="refs/tags/optee-3.15.0" clone-depth="1" />
         <project path="l-loader"              name="96boards-hikey/l-loader.git"              revision="a0c5d726cd2a9984f1cb98f0123969cfccce990d" />
         <project path="OpenPlatformPkg"       name="96boards-hikey/OpenPlatformPkg.git"       revision="245344ea5421ba126e1eb76484d00b590a4a78f7" />
         <project path="tools-images-hikey960" name="96boards-hikey/tools-images-hikey960.git" revision="a10d2bf1dca7a1be50fc60e58ed93253c95de076" />
diff --git a/imx.xml b/imx.xml
index 865ce3b..f86dd93 100644
--- a/imx.xml
+++ b/imx.xml
@@ -8,16 +8,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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1">
                 <linkfile src="imx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="optee" clone-depth="1" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="linux"                name="linaro-swg/linux.git"                  revision="refs/tags/optee-3.15.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/juno.xml b/juno.xml
index c0ecd2e..e7c7f13 100644
--- a/juno.xml
+++ b/juno.xml
@@ -6,16 +6,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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1">
                 <linkfile src="juno.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="optee" clone-depth="1" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="linux"                name="linaro-swg/linux.git"                  revision="refs/tags/optee-3.15.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/poplar.xml b/poplar.xml
index 49d91e3..6482b33 100644
--- a/poplar.xml
+++ b/poplar.xml
@@ -7,16 +7,16 @@
         <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.15.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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
         <!-- linaro-swg gits -->
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="optee" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="linux"                name="linaro-swg/linux.git"                  revision="refs/tags/optee-3.15.0" clone-depth="1" />
 
         <!-- 96boards-poplar gits -->
         <project path="l-loader"             name="96boards-poplar/l-loader.git"          revision="master" clone-depth="1" />
diff --git a/qemu_v8.xml b/qemu_v8.xml
index 911bea0..4ffbc2d 100644
--- a/qemu_v8.xml
+++ b/qemu_v8.xml
@@ -7,17 +7,17 @@
         <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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.15.0" 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="optee_benchmark"      name="linaro-swg/optee_benchmark.git"/>
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="linux"                name="linaro-swg/linux.git"                  revision="refs/tags/optee-3.15.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.15.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/rpi3.xml b/rpi3.xml
index 1162c46..b3ed390 100644
--- a/rpi3.xml
+++ b/rpi3.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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1">
                 <linkfile src="rpi3.mk" dest="build/Makefile" />
                 <linkfile src="rpi3/debugger/pi3.cfg" dest="build/pi3.cfg" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="linux"                name="linaro-swg/linux.git"                  revision="rpi3-optee-5.4" 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.15.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/stm32mp1.xml b/stm32mp1.xml
index 121e559..9c8f652 100644
--- a/stm32mp1.xml
+++ b/stm32mp1.xml
@@ -7,18 +7,18 @@
         <default remote="github" revision="master" />
 
         <!-- OP-TEE gits -->
-        <project path="optee_client"        name="OP-TEE/optee_client.git" />
-        <project path="optee_docs"          name="OP-TEE/optee_docs.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.15.0" clone-depth="1" />
+        <project path="optee_docs"          name="OP-TEE/optee_docs.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_os"            name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"          name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"               name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1" >
                 <linkfile src="stm32mp1.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
-        <project path="linux"                name="linaro-swg/linux.git" revision="optee" 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="linux"                name="linaro-swg/linux.git" revision="refs/tags/optee-3.15.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git" revision="refs/tags/2021.08" clone-depth="1" />
diff --git a/synquacer.xml b/synquacer.xml
index 67368d0..f2431b0 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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1">
                 <linkfile src="synquacer.mk" dest="build/Makefile" />
         </project>
 
diff --git a/verdin.xml b/verdin.xml
index 75ff04b..b181df1 100644
--- a/verdin.xml
+++ b/verdin.xml
@@ -5,15 +5,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.15.0" clone-depth="1" >
                 <linkfile src="verdin.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.15.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.15.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.15.0" clone-depth="1" />
 
         <!-- temp igoropaniuk gits -->
         <project path="linux"                name="igoropaniuk/linux"               revision="mainline_verdin" clone-depth="1" />
diff --git a/zynqmp.xml b/zynqmp.xml
index 73aa412..b38b296 100644
--- a/zynqmp.xml
+++ b/zynqmp.xml
@@ -5,17 +5,17 @@
 	<default remote="github" revision="master" />
 
 	<!-- OP-TEE gits -->
-	<project path="optee_client"	name="OP-TEE/optee_client.git" />
-	<project path="optee_docs"	name="OP-TEE/optee_docs.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.15.0" clone-depth="1" />
+	<project path="optee_docs"	name="OP-TEE/optee_docs.git" revision="refs/tags/3.15.0" clone-depth="1" />
+	<project path="optee_os"	name="OP-TEE/optee_os.git" revision="refs/tags/3.15.0" clone-depth="1"/>
+	<project path="optee_test"	name="OP-TEE/optee_test.git" revision="refs/tags/3.15.0" clone-depth="1" />
+	<project path="build"		name="OP-TEE/build.git" revision="refs/tags/3.15.0" clone-depth="1" >
 		<linkfile src="zynqmp.mk" dest="build/Makefile" />
 	</project>
 
 	<!-- linaro-swg gits -->
-	<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.15.0" clone-depth="1" />
+	<project path="optee_examples"	name="linaro-swg/optee_examples.git" revision="refs/tags/3.15.0" clone-depth="1" />
 
 	<!-- Xilinx gits -->
 	<project path="arm-trusted-firmware"	name="Xilinx/arm-trusted-firmware" />