diff --git a/am43xx.xml b/am43xx.xml
index 1f0e295..7898a9c 100644
--- a/am43xx.xml
+++ b/am43xx.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.1.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
                 <linkfile src="am43xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="gen_rootfs"     name="linaro-swg/gen_rootfs.git"           revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
-        <project path="optee_examples" name="linaro-swg/optee_examples.git"       revision="master" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.0" clone-depth="1"       revision="master" />
 
         <!-- Misc gits -->
         <project path="busybox"        name="mirror/busybox.git"                  revision="refs/tags/1_24_0" clone-depth="1" />
diff --git a/am57xx.xml b/am57xx.xml
index f09c3ef..6ac96e4 100644
--- a/am57xx.xml
+++ b/am57xx.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.1.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
                 <linkfile src="am57xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="gen_rootfs"     name="linaro-swg/gen_rootfs.git"           revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
-        <project path="optee_examples" name="linaro-swg/optee_examples.git"       revision="master" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.0" clone-depth="1"       revision="master" />
 
         <!-- Misc gits -->
         <project path="busybox"        name="mirror/busybox.git"                  revision="refs/tags/1_24_0" clone-depth="1" />
diff --git a/default.xml b/default.xml
index fc7b20b..22a57fd 100644
--- a/default.xml
+++ b/default.xml
@@ -5,18 +5,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.1.0" clone-depth="1" />
+        <project path="optee_os"           name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"         name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"              name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
                 <linkfile src="qemu.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="bios_qemu_tz_arm"   name="linaro-swg/bios_qemu_tz_arm.git" revision="0271acbfa81d93e64c2fdd6ae8b0be14a8c45719" />
         <project path="linux"              name="linaro-swg/linux.git"            revision="6e954e2f2cbd412f7bc874bb9145f69713194e52" />
-        <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.1.0" clone-depth="1" />
+        <project path="optee_examples"     name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.0" clone-depth="1" />
         <project path="soc_term"           name="linaro-swg/soc_term.git"         revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20" />
 
         <!-- Misc gits -->
diff --git a/dra7xx.xml b/dra7xx.xml
index 3f06c05..b1de445 100644
--- a/dra7xx.xml
+++ b/dra7xx.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.1.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
 		<linkfile src="dra7xx.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="gen_rootfs"     name="linaro-swg/gen_rootfs.git"           revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
-        <project path="optee_examples" name="linaro-swg/optee_examples.git"       revision="master" />
+        <project path="optee_examples" name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.0" clone-depth="1"       revision="master" />
 
         <!-- Misc gits -->
         <project path="busybox"        name="mirror/busybox.git"                  revision="refs/tags/1_24_0" clone-depth="1" />
diff --git a/fvp.xml b/fvp.xml
index a03a2e4..88f452d 100644
--- a/fvp.xml
+++ b/fvp.xml
@@ -6,17 +6,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.1.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
                 <linkfile src="fvp.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="gen_rootfs"           name="linaro-swg/gen_rootfs.git"             revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
         <project path="linux"                name="linaro-swg/linux.git"                  revision="6e954e2f2cbd412f7bc874bb9145f69713194e52" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="arm-trusted-firmware" name="ARM-software/arm-trusted-firmware.git" revision="refs/tags/v1.5-rc2" clone-depth="1" />
diff --git a/hikey.xml b/hikey.xml
index a4110fb..d7d3395 100644
--- a/hikey.xml
+++ b/hikey.xml
@@ -6,17 +6,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.1.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
                 <linkfile src="hikey.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="gen_rootfs"           name="linaro-swg/gen_rootfs.git"             revision="d5429c154fb81fdae75886d505c385b2f0bb7153"/>
         <project path="linux"                name="linaro-swg/linux.git"                  revision="6e954e2f2cbd412f7bc874bb9145f69713194e52" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.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 c33027d..e64ec07 100644
--- a/hikey960.xml
+++ b/hikey960.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.1.0" clone-depth="1" />
+        <project path="optee_os"              name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"            name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"                 name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
                 <linkfile src="hikey960.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="gen_rootfs"            name="linaro-swg/gen_rootfs.git"                revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
-        <project path="optee_examples"        name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"        name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.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 88716d4..495200b 100644
--- a/juno.xml
+++ b/juno.xml
@@ -6,17 +6,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.1.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
                 <linkfile src="juno.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="gen_rootfs"           name="linaro-swg/gen_rootfs.git"             revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
         <project path="linux"                name="linaro-swg/linux.git"                  revision="6e954e2f2cbd412f7bc874bb9145f69713194e52"/>
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="arm-trusted-firmware" name="ARM-software/arm-trusted-firmware.git" revision="refs/tags/v1.5" clone-depth="1" />
diff --git a/qemu_v8.xml b/qemu_v8.xml
index d3f1b4a..cdb33fd 100644
--- a/qemu_v8.xml
+++ b/qemu_v8.xml
@@ -5,10 +5,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.1.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.1.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>
@@ -16,8 +16,8 @@
         <!-- linaro-swg gits -->
         <project path="gen_rootfs"           name="linaro-swg/gen_rootfs.git"             revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
         <project path="linux"                name="linaro-swg/linux.git"                  revision="6e954e2f2cbd412f7bc874bb9145f69713194e52" />
-        <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.1.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.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 15e100b..d9761b6 100644
--- a/rpi3.xml
+++ b/rpi3.xml
@@ -5,10 +5,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.1.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.1.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" />
@@ -19,8 +19,8 @@
         <project path="arm-trusted-firmware" name="linaro-swg/arm-trusted-firmware.git" revision="1da4e15529a32fa244f5e3effc9a90549beb1a26"/>
         <project path="gen_rootfs"           name="linaro-swg/gen_rootfs.git"           revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
         <project path="linux"                name="linaro-swg/linux.git"                revision="7d976fc52ae3f04618062967948e626166f1904a" />
-        <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.1.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.0" clone-depth="1" />
                  <!-- U-Boot, cannot use refs/tags, since we need current tip and that is not tagged  -->
         <project path="u-boot"               name="linaro-swg/u-boot.git"               revision="bc6d93cf5eee9fc979a7c5141ff6312bed2835a2"/>
 
diff --git a/travis.xml b/travis.xml
index c4ee3ae..f6d8c6b 100644
--- a/travis.xml
+++ b/travis.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_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.1.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.1.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.1.0" clone-depth="1">
                 <linkfile src="qemu.mk" dest="build/Makefile" />
         </project>
 
         <!-- linaro-swg gits -->
         <project path="bios_qemu_tz_arm"     name="linaro-swg/bios_qemu_tz_arm.git" revision="refs/heads/master" clone-depth="1" />
         <project path="linux"                name="linaro-swg/linux.git"            revision="refs/heads/optee" clone-depth="1" />
-        <project path="optee_examples"       name="linaro-swg/optee_examples.git" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.1.0" clone-depth="1" />
         <project path="soc_term"             name="linaro-swg/soc_term.git"         revision="refs/heads/master" clone-depth="1" />
 
         <!-- Misc gits -->