diff --git a/am43xx.xml b/am43xx.xml
index aca2597..2d47cc4 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.22.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/am57xx.xml b/am57xx.xml
index ab7fa33..ea07e06 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.22.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/default.xml b/default.xml
index c545339..da2f33d 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.22.0" clone-depth="1" />
+        <project path="optee_os"            name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"          name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"               name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/dra7xx.xml b/dra7xx.xml
index 896b523..c604a04 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.22.0" clone-depth="1" />
+        <project path="optee_os"       name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"     name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"          name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"      name="buildroot/buildroot.git"             revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/fvp-ts.xml b/fvp-ts.xml
index f3dd829..f06a6a8 100644
--- a/fvp-ts.xml
+++ b/fvp-ts.xml
@@ -8,7 +8,7 @@
         <!-- OP-TEE gits -->
         <!-- Need to remove and re-add to replace Makefile symlink -->
         <remove-project path="build"                    name="OP-TEE/build.git" />
-        <project        path="build"                    name="OP-TEE/build.git">
+        <project        path="build"                    name="OP-TEE/build.git" revision="refs/tags/3.22.0" clone-depth="1">
                 <linkfile src="fvp-psa-sp.mk" dest="build/Makefile" />
         </project>
 
diff --git a/fvp.xml b/fvp.xml
index 017fdd8..d8244d3 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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/hikey.xml b/hikey.xml
index c23289d..edbdf46 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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.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 d1f277e..371ea62 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.22.0" clone-depth="1" />
+        <project path="optee_os"              name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"            name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                 name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.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/2022.11.1" 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.22.0" clone-depth="1" />
         <project path="l-loader"              name="96boards-hikey/l-loader.git"              revision="6560d22743d5ec904ff043d87f7f794336076085" />
         <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 addaf14..35bc0a2 100644
--- a/imx.xml
+++ b/imx.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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/juno.xml b/juno.xml
index 78e882d..bcfe679 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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/poplar.xml b/poplar.xml
index d8ac878..ec200ca 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.22.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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+        <project path="linux"                name="linaro-swg/linux.git"                  revision="refs/tags/optee-3.22.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 cb42abd..a32eb47 100644
--- a/qemu_v8.xml
+++ b/qemu_v8.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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.22.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/rockpi4.xml b/rockpi4.xml
index c357763..db571d3 100644
--- a/rockpi4.xml
+++ b/rockpi4.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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.22.0" clone-depth="1">
                 <linkfile src="rockpi4.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.22.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.22.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/rpi3.xml b/rpi3.xml
index 0e2fc17..3216226 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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.22.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.17" 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.22.0" clone-depth="1"/>
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/stm32mp1.xml b/stm32mp1.xml
index 8c326a1..ddfd59f 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.22.0" clone-depth="1" />
+        <project path="optee_docs"          name="OP-TEE/optee_docs.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_os"            name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"          name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"               name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+        <project path="optee_benchmark"      name="linaro-swg/optee_benchmark.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_examples"       name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
         <!-- Misc gits -->
         <project path="buildroot"            name="buildroot/buildroot.git" revision="refs/tags/2022.11.1" clone-depth="1" />
diff --git a/synquacer.xml b/synquacer.xml
index 99a11c7..1a71ca9 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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="build"                name="OP-TEE/build.git" revision="refs/tags/3.22.0" clone-depth="1">
                 <linkfile src="synquacer.mk" dest="build/Makefile" />
         </project>
 
diff --git a/verdin.xml b/verdin.xml
index efbfec1..f243516 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.22.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.22.0" clone-depth="1" />
+        <project path="optee_os"             name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+        <project path="optee_test"           name="OP-TEE/optee_test.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
 
         <!-- temp igoropaniuk gits -->
         <project path="linux"                name="igoropaniuk/linux"               revision="mainline_verdin" clone-depth="1" />
diff --git a/versal.xml b/versal.xml
index 57a7c08..23e7b43 100644
--- a/versal.xml
+++ b/versal.xml
@@ -4,17 +4,17 @@
 	<default remote="github" revision="master" />
 
 	<!-- OP-TEE gits -->
-	<project path="optee_os"		name="OP-TEE/optee_os.git" />
-	<project path="optee_client"		name="OP-TEE/optee_client.git" />
-	<project path="optee_docs"		name="OP-TEE/optee_docs.git" />
-	<project path="optee_test"		name="OP-TEE/optee_test.git" />
-	<project path="build"			name="OP-TEE/build.git" >
+	<project path="optee_os"		name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1" />
+	<project path="optee_client"		name="OP-TEE/optee_client.git" revision="refs/tags/3.22.0" clone-depth="1" />
+	<project path="optee_docs"		name="OP-TEE/optee_docs.git" revision="refs/tags/3.22.0" clone-depth="1" />
+	<project path="optee_test"		name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+	<project path="build"			name="OP-TEE/build.git" revision="refs/tags/3.22.0" clone-depth="1" >
 		<linkfile src="versal.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.22.0" clone-depth="1" />
+	<project path="optee_examples"		name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
 	<!-- Foundries.io gits - upstream work in progress -->
 	<project path="arm-trusted-firmware"	name="foundriesio/arm-trusted-firmware.git"  revision="refs/heads/xlnx-v2.7-versal"/>
diff --git a/zynqmp.xml b/zynqmp.xml
index 3491d97..947fcda 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.22.0" clone-depth="1" />
+	<project path="optee_docs"	name="OP-TEE/optee_docs.git" revision="refs/tags/3.22.0" clone-depth="1" />
+	<project path="optee_os"	name="OP-TEE/optee_os.git" revision="refs/tags/3.22.0" clone-depth="1"/>
+	<project path="optee_test"	name="OP-TEE/optee_test.git" revision="refs/tags/3.22.0" clone-depth="1" />
+	<project path="build"		name="OP-TEE/build.git" revision="refs/tags/3.22.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.22.0" clone-depth="1" />
+	<project path="optee_examples"	name="linaro-swg/optee_examples.git" revision="refs/tags/3.22.0" clone-depth="1" />
 
 	<!-- Xilinx gits -->
 	<project path="arm-trusted-firmware"	name="Xilinx/arm-trusted-firmware" />