diff --git a/am43xx_stable.xml b/am43xx_stable.xml
index 43f630e..10e0bc0 100644
--- a/am43xx_stable.xml
+++ b/am43xx_stable.xml
@@ -5,15 +5,15 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <remote fetch="git://git.ti.com/ti-linux-kernel" name="ti-linux"/>
   <remote fetch="git://git.ti.com/ti-u-boot" name="ti-u-boot"/>
-  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0">
+  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="am43xx.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="c7509c9ba90a83c71207bbd8f40f218904842b0b"/>
-  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="b79c87e6f7e2d24f262754845c6fc5f45b71bf15"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="fa9448e5ca17ea67d2ded2a169c58fcf7e243fb4"/>
+  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="340fb36f043fc1c41b987c57350426ca7ee895bf"/>
 </manifest>
diff --git a/am57xx_stable.xml b/am57xx_stable.xml
index 072cb79..8de27b1 100644
--- a/am57xx_stable.xml
+++ b/am57xx_stable.xml
@@ -5,15 +5,15 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <remote fetch="git://git.ti.com/ti-linux-kernel" name="ti-linux"/>
   <remote fetch="git://git.ti.com/ti-u-boot" name="ti-u-boot"/>
-  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0">
+  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="am57xx.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="c7509c9ba90a83c71207bbd8f40f218904842b0b"/>
-  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="b79c87e6f7e2d24f262754845c6fc5f45b71bf15"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="fa9448e5ca17ea67d2ded2a169c58fcf7e243fb4"/>
+  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="340fb36f043fc1c41b987c57350426ca7ee895bf"/>
 </manifest>
diff --git a/default_stable.xml b/default_stable.xml
index 7bc4c09..632d476 100644
--- a/default_stable.xml
+++ b/default_stable.xml
@@ -5,19 +5,19 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <remote fetch="https://github.com/qemu" name="qemu"/>
   <default remote="optee" revision="master"/>
-  <project name="bios_qemu_tz_arm.git" path="bios_qemu_tz_arm" remote="linaro-swg" revision="c076d8e4caa25597e72d81a01b594e3d0c8e7a5f"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0">
+  <project name="bios_qemu_tz_arm.git" path="bios_qemu_tz_arm" remote="linaro-swg" revision="0271acbfa81d93e64c2fdd6ae8b0be14a8c45719"/>
+  <project name="build.git" path="build" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="qemu.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="dtc.git" path="qemu/dtc" remote="qemu" revision="d990b8013889b816ec054c7e07a77db59c56c400"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
-  <project name="optee_benchmark.git" path="optee_benchmark" remote="linaro-swg" revision="refs/tags/2.5.0"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
+  <project name="dtc.git" path="qemu/dtc" remote="qemu" revision="c1e55a5513e9bca41dc78a0f20245cc928596a3a"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="50403184d40d04b3daf140417e031c16c2985eaf"/>
+  <project name="optee_benchmark.git" path="optee_benchmark" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.6.0"/>
   <project name="qemu.git" path="qemu" remote="qemu" revision="199e19ee538eb61fd08b1c1ee5aa838ebdcc968e"/>
   <project name="soc_term.git" path="soc_term" remote="linaro-swg" revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20"/>
 </manifest>
diff --git a/dra7xx_stable.xml b/dra7xx_stable.xml
index 6d7a721..4226468 100644
--- a/dra7xx_stable.xml
+++ b/dra7xx_stable.xml
@@ -5,15 +5,15 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <remote fetch="git://git.ti.com/ti-linux-kernel" name="ti-linux"/>
   <remote fetch="git://git.ti.com/ti-u-boot" name="ti-u-boot"/>
-  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0">
+  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="dra7xx.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="c7509c9ba90a83c71207bbd8f40f218904842b0b"/>
-  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="b79c87e6f7e2d24f262754845c6fc5f45b71bf15"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.6.0"/>
+  <project name="ti-linux-kernel.git" path="linux" remote="ti-linux" revision="fa9448e5ca17ea67d2ded2a169c58fcf7e243fb4"/>
+  <project name="ti-u-boot.git" path="u-boot" remote="ti-u-boot" revision="340fb36f043fc1c41b987c57350426ca7ee895bf"/>
 </manifest>
diff --git a/fvp_stable.xml b/fvp_stable.xml
index 5b6f58a..88040ff 100644
--- a/fvp_stable.xml
+++ b/fvp_stable.xml
@@ -6,16 +6,16 @@
   <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <default remote="optee" revision="master"/>
-  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="bdadbc6fc1109110181a417c6aaf6723aa62dc09"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0">
+  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="arm" revision="3b39efa49d9949c80b6e76b99829f84619b46110"/>
+  <project name="build.git" path="build" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="fvp.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="50403184d40d04b3daf140417e031c16c2985eaf"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.6.0"/>
   <project name="working/arm/edk2.git" path="edk2" remote="landing-teams" revision="131aec010f565a747ac51e6a95e30a37b5df15cc"/>
 </manifest>
diff --git a/hikey960_stable.xml b/hikey960_stable.xml
new file mode 100644
index 0000000..1cd55ca
--- /dev/null
+++ b/hikey960_stable.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+  <remote fetch="https://github.com/96boards-hikey" name="96b-hk"/>
+  <remote fetch="https://github.com/96boards" name="96boards"/>
+  <remote fetch="https://github.com/ARM-software" name="arm"/>
+  <remote fetch="git://busybox.net" name="busybox"/>
+  <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
+  <remote fetch="https://github.com/OP-TEE" name="optee"/>
+  <remote fetch="git://git.savannah.gnu.org" name="savannah"/>
+  <remote fetch="git://git.code.sf.net/p/strace" name="sfnet"/>
+  <default remote="optee" revision="master"/>
+  <project name="OpenPlatformPkg" remote="96b-hk" revision="8c2f9655ec46036ed7e412defe851b99fa205b75"/>
+  <project name="arm-trusted-firmware" remote="arm" revision="3b39efa49d9949c80b6e76b99829f84619b46110"/>
+  <project name="build" revision="refs/tags/2.6.0">
+    <linkfile dest="build/Makefile" src="hikey960.mk"/>
+  </project>
+  <project name="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
+  <project name="code" path="strace" remote="sfnet" revision="69c68ef5bf588fe22f1e76cc6464c70227418da7"/>
+  <project name="edk2" remote="96b-hk" revision="19f735580a73a349e46214f22be5688ad834a334"/>
+  <project name="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="grub" remote="savannah" revision="e54c99aaff5e5f6f5d3b06028506c57e66d8ef77"/>
+  <project name="l-loader" remote="96b-hk" revision="8f9ac6cca2787a5a683989bdd96f6dcd4629a30a"/>
+  <project name="linux" remote="96b-hk" revision="0e82bc3b3afaf5c154c781a5f62e1e9000e94e6a"/>
+  <project name="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test" revision="refs/tags/2.6.0"/>
+  <project name="patches_hikey" remote="linaro-swg" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96"/>
+  <project name="tools-images-hikey960" remote="96b-hk" revision="ccb401f726346355e948ec776a411ad037bab4cc"/>
+</manifest>
diff --git a/hikey_debian_stable.xml b/hikey_debian_stable.xml
index 001476e..2b60613 100644
--- a/hikey_debian_stable.xml
+++ b/hikey_debian_stable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
   <remote fetch="https://github.com/96boards-hikey" name="96b-hk"/>
-  <remote fetch="https://github.com/96boards" name="96boards"/>
+  <remote fetch="https://github.com/ARM-software" name="arm"/>
   <remote fetch="https://github.com/Linaro" name="linaro"/>
   <remote fetch="https://git.linaro.org" name="linaro-git"/>
   <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
@@ -9,21 +9,22 @@
   <remote fetch="git://git.savannah.gnu.org" name="savannah"/>
   <remote fetch="git://git.code.sf.net/p/strace" name="sfnet"/>
   <default remote="optee" revision="master"/>
-  <project name="OpenPlatformPkg" remote="96b-hk" revision="56dec05002f6870928336da5da99d1e1027692e8"/>
-  <project name="arm-trusted-firmware" remote="96b-hk" revision="fb1158a365e2bf5bba638cde950678fddf67fe60"/>
-  <project name="build" revision="refs/tags/2.5.0">
+  <project name="OpenPlatformPkg" remote="96b-hk" revision="8c2f9655ec46036ed7e412defe851b99fa205b75"/>
+  <project name="arm-trusted-firmware" remote="arm" revision="3b39efa49d9949c80b6e76b99829f84619b46110"/>
+  <project name="atf-fastboot" remote="96b-hk" revision="5b0d44c057bc0005965da990e8add72670810996"/>
+  <project name="build" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="hikey_debian.mk"/>
   </project>
-  <project name="burn-boot" remote="96boards" revision="db522b114fdec4d06d0a1705501fedc277903453"/>
+  <project name="burn-boot" remote="96b-hk" revision="bee2ea1660f3a03df8d391fb75aa08dbc3441856"/>
   <project name="ci/debian-kernel-packaging" path="debian-kernel-packaging" remote="linaro-git" revision="14c6e0022cfdbd757a7be5a0d950efe043cdec9f"/>
-  <project name="code" path="strace" remote="sfnet" revision="735c2ad872047e5d66c28eab2dc1aae31aac96ab"/>
-  <project name="edk2" remote="96b-hk" revision="202895d521a168dfaea4c9ae4521049913d37e9d"/>
+  <project name="code" path="strace" remote="sfnet" revision="69c68ef5bf588fe22f1e76cc6464c70227418da7"/>
+  <project name="edk2" remote="96b-hk" revision="19f735580a73a349e46214f22be5688ad834a334"/>
   <project name="grub" remote="savannah" revision="e54c99aaff5e5f6f5d3b06028506c57e66d8ef77"/>
-  <project name="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="l-loader" remote="96b-hk" revision="cddd213c1b820d5f224d20b38581c504552dd59e"/>
-  <project name="optee_client" revision="refs/tags/2.5.0"/>
-  <project name="optee_os" revision="refs/tags/2.5.0"/>
-  <project name="optee_test" revision="refs/tags/2.5.0"/>
-  <project name="patches_hikey" remote="linaro-swg" revision="93d4254c66003cacd9f7e84dd6b5831ab43b5265"/>
+  <project name="l-loader" remote="96b-hk" revision="8f9ac6cca2787a5a683989bdd96f6dcd4629a30a"/>
+  <project name="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test" revision="refs/tags/2.6.0"/>
+  <project name="patches_hikey" remote="linaro-swg" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96"/>
   <project name="rpk" path="linux" remote="linaro" revision="04ec80a78dbc970cf921abc02910d2148cec6dbb"/>
 </manifest>
diff --git a/hikey_stable.xml b/hikey_stable.xml
index b075da5..2ce50d1 100644
--- a/hikey_stable.xml
+++ b/hikey_stable.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
   <remote fetch="https://github.com/96boards-hikey" name="96b-hk"/>
-  <remote fetch="https://github.com/96boards" name="96boards"/>
+  <remote fetch="https://github.com/ARM-software" name="arm"/>
   <remote fetch="git://busybox.net" name="busybox"/>
   <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <remote fetch="git://git.savannah.gnu.org" name="savannah"/>
   <remote fetch="git://git.code.sf.net/p/strace" name="sfnet"/>
   <default remote="optee" revision="master"/>
-  <project name="arm-trusted-firmware" remote="96b-hk" revision="fb1158a365e2bf5bba638cde950678fddf67fe60"/>
-  <project name="build" revision="refs/tags/2.5.0">
+  <project name="OpenPlatformPkg" remote="96b-hk" revision="8c2f9655ec46036ed7e412defe851b99fa205b75"/>
+  <project name="arm-trusted-firmware" remote="arm" revision="3b39efa49d9949c80b6e76b99829f84619b46110"/>
+  <project name="atf-fastboot" remote="96b-hk" revision="5b0d44c057bc0005965da990e8add72670810996"/>
+  <project name="build" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="hikey.mk"/>
   </project>
-  <project name="burn-boot" remote="96boards" revision="db522b114fdec4d06d0a1705501fedc277903453"/>
+  <project name="burn-boot" remote="96b-hk" revision="bee2ea1660f3a03df8d391fb75aa08dbc3441856"/>
   <project name="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="code" path="strace" remote="sfnet" revision="735c2ad872047e5d66c28eab2dc1aae31aac96ab"/>
-  <project name="edk2" remote="96boards" revision="7da6cdf18127ee52e79f3cf990c8d630fd037784"/>
-  <project name="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
+  <project name="code" path="strace" remote="sfnet" revision="69c68ef5bf588fe22f1e76cc6464c70227418da7"/>
+  <project name="edk2" remote="96b-hk" revision="19f735580a73a349e46214f22be5688ad834a334"/>
+  <project name="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
   <project name="grub" remote="savannah" revision="e54c99aaff5e5f6f5d3b06028506c57e66d8ef77"/>
-  <project name="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="l-loader" remote="96b-hk" revision="cddd213c1b820d5f224d20b38581c504552dd59e"/>
-  <project name="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
-  <project name="optee_client" revision="refs/tags/2.5.0"/>
-  <project name="optee_os" revision="refs/tags/2.5.0"/>
-  <project name="optee_test" revision="refs/tags/2.5.0"/>
-  <project name="patches_hikey" remote="linaro-swg" revision="93d4254c66003cacd9f7e84dd6b5831ab43b5265"/>
+  <project name="l-loader" remote="96b-hk" revision="8f9ac6cca2787a5a683989bdd96f6dcd4629a30a"/>
+  <project name="linux" remote="linaro-swg" revision="50403184d40d04b3daf140417e031c16c2985eaf"/>
+  <project name="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test" revision="refs/tags/2.6.0"/>
+  <project name="patches_hikey" remote="linaro-swg" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96"/>
 </manifest>
diff --git a/juno_stable.xml b/juno_stable.xml
index 76e6505..be4895f 100644
--- a/juno_stable.xml
+++ b/juno_stable.xml
@@ -7,17 +7,17 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <remote fetch="git://git.denx.de" name="u-boot"/>
   <default remote="optee" revision="master"/>
-  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="bdadbc6fc1109110181a417c6aaf6723aa62dc09"/>
+  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="arm" revision="3b39efa49d9949c80b6e76b99829f84619b46110"/>
   <project name="arm/vexpress-firmware.git" path="vexpress-firmware" remote="linaro" revision="cad383a2c4ffeb9192605fda54c07fd1aa09a1b0"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0">
+  <project name="build.git" path="build" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="juno.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
-  <project name="u-boot.git" path="u-boot" remote="u-boot" revision="7e09145ea2e985511c660bdf567b61614acd75b3"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="50403184d40d04b3daf140417e031c16c2985eaf"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.6.0"/>
+  <project name="u-boot.git" path="u-boot" remote="u-boot" revision="4c7a211046a3956058b512edd8533f7df031cc4a"/>
 </manifest>
diff --git a/mt8173-evb_stable.xml b/mt8173-evb_stable.xml
index 4521d4d..18eb283 100644
--- a/mt8173-evb_stable.xml
+++ b/mt8173-evb_stable.xml
@@ -5,16 +5,16 @@
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
   <default remote="optee" revision="master"/>
   <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="8b2410cd5ab9189337379a9449c0f5588ae9b4a6"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0">
+  <project name="build.git" path="build" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="mediatek.mk"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
   <project name="evb-utils.git" path="evb-utils" remote="linaro-swg" revision="5494df3c6881739ff2faff636379aaef569c0281"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="50403184d40d04b3daf140417e031c16c2985eaf"/>
   <project name="mtk_tools.git" path="mtk_tools" remote="linaro-swg" revision="1460d821a19c7c81520605801026747e6be0e20e"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.6.0"/>
 </manifest>
diff --git a/qemu_v8_stable.xml b/qemu_v8_stable.xml
index 8f6061a..8ea1df6 100644
--- a/qemu_v8_stable.xml
+++ b/qemu_v8_stable.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
+  <remote fetch="https://github.com/ARM-software" name="arm"/>
   <remote fetch="git://busybox.net" name="busybox"/>
   <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
   <remote fetch="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds" name="linux"/>
@@ -8,21 +9,22 @@
   <remote fetch="http://git.code.sf.net/p/strace" name="sfnet"/>
   <remote fetch="https://github.com/tianocore" name="tianocore"/>
   <default remote="optee" revision="master"/>
-  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="bdadbc6fc1109110181a417c6aaf6723aa62dc09"/>
-  <project name="build.git" path="build" revision="refs/tags/2.5.0">
+  <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="arm" revision="3b39efa49d9949c80b6e76b99829f84619b46110"/>
+  <project name="build.git" path="build" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="qemu_v8.mk"/>
     <linkfile dest="build/gdb" src="../toolchains/aarch64/bin/aarch64-linux-gnu-gdb"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="code" path="strace" remote="sfnet" revision="735c2ad872047e5d66c28eab2dc1aae31aac96ab"/>
-  <project name="dtc.git" path="qemu/dtc" remote="qemu" revision="d990b8013889b816ec054c7e07a77db59c56c400"/>
+  <project name="code" path="strace" remote="sfnet" revision="69c68ef5bf588fe22f1e76cc6464c70227418da7"/>
+  <project name="dtc.git" path="qemu/dtc" remote="qemu" revision="c1e55a5513e9bca41dc78a0f20245cc928596a3a"/>
   <project name="edk2.git" path="edk2" remote="tianocore" revision="f7bd152c2a05bd75471305184c25f14f01ccf0b7"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="cc2e97bbe2ed6290df25087d8967429071abb214"/>
-  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.5.0"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="50403184d40d04b3daf140417e031c16c2985eaf"/>
+  <project name="optee_benchmark.git" path="optee_benchmark" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.6.0"/>
   <project name="qemu.git" path="qemu" remote="qemu" revision="199e19ee538eb61fd08b1c1ee5aa838ebdcc968e"/>
   <project name="soc_term.git" path="soc_term" remote="linaro-swg" revision="5493a6e7c264536f5ca63fe7511e5eed991e4f20"/>
 </manifest>
diff --git a/rpi3_stable.xml b/rpi3_stable.xml
index 0c7ac75..7d1472b 100644
--- a/rpi3_stable.xml
+++ b/rpi3_stable.xml
@@ -3,18 +3,22 @@
   <remote fetch="https://github.com/mirror" name="busybox_mirror"/>
   <remote fetch="https://github.com/linaro-swg" name="linaro-swg"/>
   <remote fetch="https://github.com/OP-TEE" name="optee"/>
+  <remote fetch="https://github.com/raspberrypi" name="raspberrypi"/>
+  <default remote="optee" revision="master"/>
   <project name="arm-trusted-firmware.git" path="arm-trusted-firmware" remote="linaro-swg" revision="1da4e15529a32fa244f5e3effc9a90549beb1a26"/>
-  <project name="build.git" path="build" remote="optee" revision="refs/tags/2.5.0">
+  <project name="build.git" path="build" revision="refs/tags/2.6.0">
     <linkfile dest="build/Makefile" src="rpi3.mk"/>
     <linkfile dest="build/pi3.cfg" src="rpi3/debugger/pi3.cfg"/>
     <linkfile dest="build/gdb" src="../toolchains/aarch64/bin/aarch64-linux-gnu-gdb"/>
   </project>
   <project name="busybox.git" path="busybox" remote="busybox_mirror" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02"/>
-  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="cb8c7736a46d1ff459f159b2115395d504c96b45"/>
-  <project name="hello_world.git" path="hello_world" remote="linaro-swg" revision="2c15acb431bcde20beb0277c3acdab6d0b4894ef"/>
-  <project name="linux.git" path="linux" remote="linaro-swg" revision="9f38d0f9d4aa32c8c2802be600d002eea222f9d1"/>
-  <project name="optee_client.git" path="optee_client" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="optee_os.git" path="optee_os" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="optee_test.git" path="optee_test" remote="optee" revision="refs/tags/2.5.0"/>
-  <project name="u-boot.git" path="u-boot" remote="linaro-swg" revision="10577db76e77a513180388df1f176a6642143c84"/>
+  <project clone-depth="1" name="firmware.git" path="firmware" remote="raspberrypi" revision="3fb63c413cabfddb7fb9ed286bfc62abe73cc310"/>
+  <project name="gen_rootfs.git" path="gen_rootfs" remote="linaro-swg" revision="fe617d470e45778c909038bf3e7ca15174a4f893"/>
+  <project name="linux.git" path="linux" remote="linaro-swg" revision="7d976fc52ae3f04618062967948e626166f1904a"/>
+  <project name="optee_benchmark.git" path="optee_benchmark" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_client.git" path="optee_client" revision="refs/tags/2.6.0"/>
+  <project name="optee_examples.git" path="optee_examples" remote="linaro-swg" revision="refs/tags/2.6.0"/>
+  <project name="optee_os.git" path="optee_os" revision="refs/tags/2.6.0"/>
+  <project name="optee_test.git" path="optee_test" revision="refs/tags/2.6.0"/>
+  <project name="u-boot.git" path="u-boot" remote="linaro-swg" revision="bc6d93cf5eee9fc979a7c5141ff6312bed2835a2"/>
 </manifest>