diff --git a/am43xx.xml b/am43xx.xml
index e223793d7..a79463fb7 100644
--- a/am43xx.xml
+++ b/am43xx.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="ti" fetch="git://git.ti.com" />
+  <remote name="ti" fetch="git://git.ti.com"/>
 
-        <include name="common.xml" />
-        <project path="build"          name="OP-TEE/build.git">
-                <linkfile src="am43xx.mk" dest="build/Makefile" />
-        </project>
-        <remove-project                name="linaro-swg/linux.git" />
+  <include name="common.xml"/>
 
-        <project path="linux"          name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti" />
-        <project path="u-boot"         name="ti-u-boot/ti-u-boot.git"             revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="am43xx.mk" dest="build/Makefile"/>
+  </project>
+
+  <remove-project name="linaro-swg/linux.git"/>
+
+  <project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti"/>
+  <project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti"/>
 </manifest>
diff --git a/am57xx.xml b/am57xx.xml
index e1f9b2438..a6503e974 100644
--- a/am57xx.xml
+++ b/am57xx.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="ti" fetch="git://git.ti.com" />
+  <remote name="ti" fetch="git://git.ti.com"/>
 
-        <include name="common.xml" />
-        <project path="build"          name="OP-TEE/build.git">
-                <linkfile src="am57xx.mk" dest="build/Makefile" />
-        </project>
-        <remove-project                name="linaro-swg/linux.git" />
+  <include name="common.xml"/>
 
-        <project path="linux"          name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti" />
-        <project path="u-boot"         name="ti-u-boot/ti-u-boot.git"             revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="am57xx.mk" dest="build/Makefile"/>
+  </project>
+
+  <remove-project name="linaro-swg/linux.git"/>
+
+  <project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti"/>
+  <project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti"/>
 </manifest>
diff --git a/common.xml b/common.xml
index 2e6a45841..db780165b 100644
--- a/common.xml
+++ b/common.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="github" fetch="https://github.com" />
-        <default remote="github" revision="master" />
+  <remote name="github" fetch="https://github.com"/>
 
-        <!-- 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" />
+  <default remote="github" revision="master" sync-j="4" clone-depth="1"/>
 
-        <!-- 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" />
+  <!-- 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"/>
 
-        <!-- buildroot git -->
-        <project path="buildroot"            name="buildroot/buildroot.git"               revision="refs/tags/2023.11.1" clone-depth="1" />
+  <!-- linaro-swg gits -->
+  <project path="linux" name="linaro-swg/linux.git" revision="optee"/>
+  <project path="optee_examples" name="linaro-swg/optee_examples.git"/>
+
+  <!-- buildroot git -->
+  <project path="buildroot" name="buildroot/buildroot.git" revision="refs/tags/2023.11.1"/>
 </manifest>
diff --git a/default.xml b/default.xml
index 4a5841ea1..a2e775bc0 100644
--- a/default.xml
+++ b/default.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="tfo"    fetch="https://git.trustedfirmware.org" />
-        <remote name="u-boot" fetch="https://gitlab.denx.de/u-boot" />
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
+  <remote name="u-boot" fetch="https://gitlab.denx.de/u-boot"/>
 
-        <include name="common.xml" />
-        <project path="build"               name="OP-TEE/build.git">
-                <linkfile src="qemu.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <project path="qemu"                 name="qemu/qemu.git"                         revision="refs/tags/v7.0.0" clone-depth="1" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.6" remote="tfo" />
-        <project path="u-boot"               name="u-boot.git"                            revision="refs/tags/v2020.04" remote="u-boot" clone-depth="1" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="qemu.mk" dest="build/Makefile"/>
+  </project>
+
+  <project path="qemu" name="qemu/qemu.git" revision="refs/tags/v7.0.0"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
+  <project path="u-boot" name="u-boot.git" revision="refs/tags/v2020.04" remote="u-boot" />
 </manifest>
diff --git a/dra7xx.xml b/dra7xx.xml
index 3d1f5f169..96d22d425 100644
--- a/dra7xx.xml
+++ b/dra7xx.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="ti" fetch="git://git.ti.com" />
+  <remote name="ti" fetch="git://git.ti.com"/>
 
-        <include name="common.xml" />
-        <project path="build"          name="OP-TEE/build.git">
-                <linkfile src="dra7xx.mk" dest="build/Makefile" />
-        </project>
-        <remove-project                name="linaro-swg/linux.git" />
+  <include name="common.xml"/>
 
-        <project path="linux"          name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti" />
-        <project path="u-boot"         name="ti-u-boot/ti-u-boot.git"             revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="dra7xx.mk" dest="build/Makefile"/>
+  </project>
+
+  <remove-project name="linaro-swg/linux.git"/>
+
+  <project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti"/>
+  <project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti"/>
 </manifest>
diff --git a/fvp-ts.xml b/fvp-ts.xml
index 9a5b02d9b..c22c22e6d 100644
--- a/fvp-ts.xml
+++ b/fvp-ts.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <include name="fvp.xml" />
+  <include name="fvp.xml"/>
 
-        <remote name="arm-gitlab" fetch="https://git.gitlab.arm.com" />
-        <remote name="kernel-org" fetch="https://git.kernel.org" />
+  <remote name="arm-gitlab" fetch="https://git.gitlab.arm.com"/>
+  <remote name="kernel-org" fetch="https://git.kernel.org"/>
 
-        <!-- 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">
-                <linkfile src="fvp-psa-sp.mk" dest="build/Makefile" />
-        </project>
+  <!-- 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">
+    <linkfile src="fvp-psa-sp.mk" dest="build/Makefile"/>
+  </project>
 
-        <!-- linaro-swg gits -->
-        <!-- Replace Linux with mainline version -->
-        <remove-project path="linux"                    name="linaro-swg/linux.git" />
-        <project        path="linux"                    name="pub/scm/linux/kernel/git/stable/linux.git"        revision="refs/tags/v6.1.34"    clone-depth="1" remote="kernel-org" />
+  <!-- linaro-swg gits -->
+  <!-- Replace Linux with mainline version -->
+  <remove-project path="linux" name="linaro-swg/linux.git"/>
+  <project path="linux" name="pub/scm/linux/kernel/git/stable/linux.git" revision="refs/tags/v6.1.34" remote="kernel-org"/>
 
-        <!-- Misc gits -->
-        <!-- The fTPM is not used in this config -->
-        <remove-project path="ms-tpm-20-ref"            name="microsoft/ms-tpm-20-ref" />
-        <!-- Add Trusted Services Linux drivers -->
-        <project        path="linux-arm-ffa-user"       name="linux-arm/linux-trusted-services.git"     revision="refs/tags/debugfs-v5.0.1"     clone-depth="1" remote="arm-gitlab" />
-        <project        path="linux-arm-ffa-tee"        name="linux-arm/linux-trusted-services.git"     revision="refs/tags/tee-v2.0.0"         clone-depth="1" remote="arm-gitlab" />
-        <!-- Add Trusted Services project -->
-        <project        path="trusted-services"         name="TS/trusted-services.git"                  revision="refs/tags/v1.0.0"     remote="tfo" />
+  <!-- Misc gits -->
+  <!-- The fTPM is not used in this config -->
+  <remove-project path="ms-tpm-20-ref" name="microsoft/ms-tpm-20-ref"/>
+  <!-- Add Trusted Services Linux drivers -->
+  <project path="linux-arm-ffa-user" name="linux-arm/linux-trusted-services.git" revision="refs/tags/debugfs-v5.0.1" remote="arm-gitlab"/>
+  <project path="linux-arm-ffa-tee" name="linux-arm/linux-trusted-services.git" revision="refs/tags/tee-v2.0.0" remote="arm-gitlab"/>
+  <!-- Add Trusted Services project -->
+  <project path="trusted-services" name="TS/trusted-services.git" revision="refs/tags/v1.0.0" remote="tfo"/>
 </manifest>
diff --git a/fvp.xml b/fvp.xml
index 128a80ae6..8f9d7855e 100644
--- a/fvp.xml
+++ b/fvp.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="savannah" fetch="https://git.savannah.gnu.org/git" />
-        <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
+  <remote name="savannah" fetch="https://git.savannah.gnu.org/git"/>
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="fvp.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <project path="edk2"                 name="tianocore/edk2.git"                    revision="dd4cae4d82c7477273f3da455084844db5cca0c0" />
-        <project path="edk2-platforms"       name="tianocore/edk2-platforms.git"          revision="02daa58c21f89628b4d8c76f95f3a554289149bc" />
-        <project path="grub"                 name="grub.git"                              revision="refs/tags/grub-2.02" clone-depth="1" remote="savannah" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.9" clone-depth="1" remote="tfo" />
-        <project path="mbedtls"              name="Mbed-TLS/mbedtls.git"                  revision="refs/tags/mbedtls-3.4.0" />
-
-        <!-- fTPM implementation -->
-        <project path="ms-tpm-20-ref"        name="microsoft/ms-tpm-20-ref"               revision="98b60a44aba79b15fcce1c0d1e46cf5918400f6a" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="fvp.mk" dest="build/Makefile"/>
+  </project>
 
+  <project path="edk2" name="tianocore/edk2.git" revision="dd4cae4d82c7477273f3da455084844db5cca0c0"/>
+  <project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="02daa58c21f89628b4d8c76f95f3a554289149bc"/>
+  <project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" remote="tfo"/>
+  <project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-3.4.0"/>
+  <!-- fTPM implementation -->
+  <project path="ms-tpm-20-ref" name="microsoft/ms-tpm-20-ref" revision="98b60a44aba79b15fcce1c0d1e46cf5918400f6a"/>
 </manifest>
diff --git a/hikey.xml b/hikey.xml
index e4751d37d..30ca335fe 100644
--- a/hikey.xml
+++ b/hikey.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="savannah" fetch="https://git.savannah.gnu.org/git" />
-        <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
+  <remote name="savannah" fetch="https://git.savannah.gnu.org/git"/>
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="hikey.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <project path="patches_hikey"        name="linaro-swg/patches_hikey.git"          revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="hikey.mk" dest="build/Makefile"/>
+  </project>
 
-        <!-- Misc gits -->
-        <project path="atf-fastboot"         name="96boards-hikey/atf-fastboot.git"       revision="d75cfac3877be68bb5e36be3fc57ba597a2d3710" />
-        <project path="burn-boot"            name="96boards-hikey/burn-boot.git"          revision="7dcbfb1f1496756294b3068e6e2370a9399dcea2" />
-        <project path="busybox"              name="mirror/busybox.git"                    revision="refs/tags/1_24_0" 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="l-loader"             name="96boards-hikey/l-loader.git"           revision="6560d22743d5ec904ff043d87f7f794336076085" />
-        <project path="OpenPlatformPkg"      name="96boards-hikey/OpenPlatformPkg.git"    revision="245344ea5421ba126e1eb76484d00b590a4a78f7" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
+  <project path="patches_hikey" name="linaro-swg/patches_hikey.git" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96"/>
+
+  <!-- Misc gits -->
+  <project path="atf-fastboot" name="96boards-hikey/atf-fastboot.git" revision="d75cfac3877be68bb5e36be3fc57ba597a2d3710"/>
+  <project path="burn-boot" name="96boards-hikey/burn-boot.git" revision="7dcbfb1f1496756294b3068e6e2370a9399dcea2"/>
+  <project path="busybox" name="mirror/busybox.git" revision="refs/tags/1_24_0"/>
+  <project path="edk2" name="96boards-hikey/edk2.git" revision="77326b5a153513c826d5a50363eace6ef6b59413"/>
+  <project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
+  <project path="l-loader" name="96boards-hikey/l-loader.git" revision="6560d22743d5ec904ff043d87f7f794336076085"/>
+  <project path="OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" revision="245344ea5421ba126e1eb76484d00b590a4a78f7"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
 </manifest>
diff --git a/hikey960.xml b/hikey960.xml
index 3acc9b626..a84ab9ca0 100644
--- a/hikey960.xml
+++ b/hikey960.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="savannah" fetch="https://git.savannah.gnu.org/git" />
-        <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
+  <remote name="savannah" fetch="https://git.savannah.gnu.org/git"/>
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
 
-        <include name="common.xml" />
-        <project path="build"                 name="OP-TEE/build.git">
-                <linkfile src="hikey960.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <!-- linaro-swg gits -->
-        <project path="patches_hikey"         name="linaro-swg/patches_hikey.git"             revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="hikey960.mk" dest="build/Makefile"/>
+  </project>
 
-        <!-- Misc gits -->
-        <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="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" />
-        <project path="trusted-firmware-a"    name="TF-A/trusted-firmware-a.git"              revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
+  <!-- linaro-swg gits -->
+  <project path="patches_hikey" name="linaro-swg/patches_hikey.git" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96"/>
+
+  <!-- Misc gits -->
+  <project path="edk2" name="96boards-hikey/edk2.git" revision="77326b5a153513c826d5a50363eace6ef6b59413"/>
+  <project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
+  <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"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
 </manifest>
diff --git a/imx.xml b/imx.xml
index ac88ec188..f65ca872f 100644
--- a/imx.xml
+++ b/imx.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="linaro" fetch="https://git.linaro.org" />
-        <remote name="tfo"    fetch="https://git.trustedfirmware.org" />
+  <remote name="linaro" fetch="https://git.linaro.org"/>
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="imx.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <!-- Misc gits -->
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
-        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="refs/tags/v2020.10-rc2" clone-depth="1" />
-        <project path="imx-mkimage"          name="nxp-imx/imx-mkimage.git"                       revision="refs/tags/rel_imx_5.4.24_2.1.0" clone-depth="1" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="imx.mk" dest="build/Makefile"/>
+  </project>
+
+  <!-- Misc gits -->
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
+  <project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2020.10-rc2"/>
+  <project path="imx-mkimage" name="nxp-imx/imx-mkimage.git" revision="refs/tags/rel_imx_5.4.24_2.1.0"/>
 </manifest>
diff --git a/juno.xml b/juno.xml
index 3bae764ee..94ed7f7e6 100644
--- a/juno.xml
+++ b/juno.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="tfo"    fetch="https://git.trustedfirmware.org" />
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="juno.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
-        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="refs/tags/v2018.03" clone-depth="1" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="juno.mk" dest="build/Makefile"/>
+  </project>
+
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
+  <project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2018.03"/>
 </manifest>
diff --git a/poplar.xml b/poplar.xml
index 2f6658f26..a07865b5f 100644
--- a/poplar.xml
+++ b/poplar.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
-        <remote name="denx"     fetch="https://gitlab.denx.de" />
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
+  <remote name="denx" fetch="https://gitlab.denx.de"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git" >
-                <linkfile src="poplar.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <!-- 96boards-poplar gits -->
-        <project path="l-loader"             name="96boards-poplar/l-loader.git"          revision="master" clone-depth="1" />
-        <project path="poplar-tools"         name="96boards-poplar/poplar-tools.git"      revision="master" clone-depth="1" />
-        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="697758e7c81131da6db0e3b10515019fe3aca8c9" clone-depth="1" remote="denx" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="poplar.mk" dest="build/Makefile"/>
+  </project>
 
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
+  <!-- 96boards-poplar gits -->
+  <project path="l-loader" name="96boards-poplar/l-loader.git" revision="master"/>
+  <project path="poplar-tools" name="96boards-poplar/poplar-tools.git" revision="master"/>
+  <project path="u-boot" name="u-boot/u-boot.git" revision="697758e7c81131da6db0e3b10515019fe3aca8c9" remote="denx"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
 </manifest>
diff --git a/qemu_v8.xml b/qemu_v8.xml
index b3dd5b729..1d91119e6 100644
--- a/qemu_v8.xml
+++ b/qemu_v8.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
-        <remote name="u-boot"   fetch="https://source.denx.de/u-boot" />
-        <remote name="xenbits"  fetch="https://xenbits.xen.org/" />
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
+  <remote name="u-boot" fetch="https://source.denx.de/u-boot"/>
+  <remote name="xenbits" fetch="https://xenbits.xen.org/"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="qemu_v8.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <!-- Misc gits -->
-        <project path="mbedtls"              name="Mbed-TLS/mbedtls.git"                   revision="refs/tags/mbedtls-2.26.0" clone-depth="1" />
-        <project path="optee_rust"           name="apache/incubator-teaclave-trustzone-sdk.git"            revision="bc6ae8911b6ae093e8369a53a42b8c99307f7dc5" />
-        <project path="qemu"                 name="qemu/qemu.git"                         revision="refs/tags/v8.1.2" clone-depth="1" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.10" clone-depth="1" remote="tfo" />
-        <project path="hafnium"   name="hafnium/hafnium.git"           revision="refs/tags/v2.10" clone-depth="1" remote="tfo" />
-        <project path="u-boot"               name="u-boot.git"                            revision="refs/tags/v2023.07.02" remote="u-boot" clone-depth="1" />
-        <project path="xen"                 name="git-http/xen.git"                         revision="refs/tags/RELEASE-4.18.0" clone-depth="1" remote="xenbits" />
-        <project path="SCP-firmware"         name="ARM-software/SCP-firmware.git"         revision="refs/tags/v2.13.0" clone-depth="1" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="qemu_v8.mk" dest="build/Makefile"/>
+  </project>
+
+  <!-- Misc gits -->
+  <project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-2.26.0"/>
+  <project path="optee_rust" name="apache/incubator-teaclave-trustzone-sdk.git" revision="bc6ae8911b6ae093e8369a53a42b8c99307f7dc5"/>
+  <project path="qemu" name="qemu/qemu.git" revision="refs/tags/v8.1.2"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.10" remote="tfo"/>
+  <project path="hafnium" name="hafnium/hafnium.git" revision="refs/tags/v2.10" remote="tfo"/>
+  <project path="u-boot" name="u-boot.git" revision="refs/tags/v2023.07.02" remote="u-boot"/>
+  <project path="xen" name="git-http/xen.git" revision="refs/tags/RELEASE-4.18.0" remote="xenbits"/>
+  <project path="SCP-firmware" name="ARM-software/SCP-firmware.git" revision="refs/tags/v2.13.0"/>
 </manifest>
diff --git a/rockpi4.xml b/rockpi4.xml
index 2eca4b3e4..c3651ba7c 100644
--- a/rockpi4.xml
+++ b/rockpi4.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
-        <remote name="u-boot"   fetch="https://source.denx.de/u-boot" />
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
+  <remote name="u-boot" fetch="https://source.denx.de/u-boot"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="rockpi4.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <project path="rkdeveloptool"        name="rockchip-linux/rkdeveloptool" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.7" clone-depth="1" remote="tfo" />
-        <project path="u-boot"               name="u-boot.git"                            revision="refs/tags/v2022.10" remote="u-boot" clone-depth="1" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="rockpi4.mk" dest="build/Makefile"/>
+  </project>
+
+  <project path="rkdeveloptool" name="rockchip-linux/rkdeveloptool"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.7" remote="tfo"/>
+  <project path="u-boot" name="u-boot.git" revision="refs/tags/v2022.10" remote="u-boot"/>
 </manifest>
diff --git a/rpi3.xml b/rpi3.xml
index 01456eba3..033218ccd 100644
--- a/rpi3.xml
+++ b/rpi3.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="rpi3.mk" dest="build/Makefile" />
-                <linkfile src="rpi3/debugger/pi3.cfg" dest="build/pi3.cfg" />
-        </project>
-        <remove-project                      name="linaro-swg/linux.git" />
-        <project path="linux"                name="linaro-swg/linux.git"                  revision="rpi3-optee-6.7" clone-depth="1" />
+  <include name="common.xml"/>
 
-        <!-- Misc gits -->
-        <project path="firmware"             name="raspberrypi/firmware.git"              revision="refs/tags/1.20190401" clone-depth="1" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
-        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="refs/tags/v2021.10" clone-depth="1" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="rpi3.mk" dest="build/Makefile"/>
+    <linkfile src="rpi3/debugger/pi3.cfg" dest="build/pi3.cfg"/>
+  </project>
+
+  <remove-project name="linaro-swg/linux.git"/>
+  <project path="linux" name="linaro-swg/linux.git" revision="rpi3-optee-6.7"/>
+
+  <!-- Misc gits -->
+  <project path="firmware" name="raspberrypi/firmware.git" revision="refs/tags/1.20190401"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
+  <project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2021.10"/>
 </manifest>
diff --git a/stm32mp1.xml b/stm32mp1.xml
index c0a204ae9..1dd4fc5bb 100644
--- a/stm32mp1.xml
+++ b/stm32mp1.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="tfo"    fetch="https://git.trustedfirmware.org" />
-        <remote name="u-boot" fetch="https://source.denx.de" />
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
+  <remote name="u-boot" fetch="https://source.denx.de"/>
 
-        <include name="common.xml" />
-        <project path="build"               name="OP-TEE/build.git" >
-                <linkfile src="stm32mp1.mk" dest="build/Makefile" />
-        </project>
+  <include name="common.xml"/>
 
-        <!-- Misc gits -->
-        <project path="edk2"                 name="tianocore/edk2.git" revision="refs/tags/edk2-stable202211" sync-s="true" clone-depth="1" />
-        <project path="edk2-platforms"       name="tianocore/edk2-platforms.git" revision="70b67dc9ab89689f26ad5e68a5efeac509a12115" sync-s="true" clone-depth="1" />
-        <project path="mbedtls"              name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-2.28.1" clone-depth="1" />
-        <project path="scp-firmware"         name="ARM-software/SCP-firmware.git" revision="refs/tags/v2.13.0" clone-depth="1" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" remote="tfo" clone-depth="1" />
-        <project path="u-boot"               name="u-boot/u-boot.git" revision="refs/tags/v2024.01-rc1" remote="u-boot" clone-depth="1" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="stm32mp1.mk" dest="build/Makefile"/>
+  </project>
+
+  <!-- Misc gits -->
+  <project path="edk2" name="tianocore/edk2.git" revision="refs/tags/edk2-stable202211" sync-s="true"/>
+  <project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="70b67dc9ab89689f26ad5e68a5efeac509a12115" sync-s="true"/>
+  <project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-2.28.1"/>
+  <project path="scp-firmware" name="ARM-software/SCP-firmware.git" revision="refs/tags/v2.13.0"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" remote="tfo"/>
+  <project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2024.01-rc1" remote="u-boot"/>
 </manifest>
diff --git a/synquacer.xml b/synquacer.xml
index 72cfa3b4f..5b30929e4 100644
--- a/synquacer.xml
+++ b/synquacer.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-        <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
+  <remote name="tfo" fetch="https://git.trustedfirmware.org"/>
 
-        <include name="common.xml" />
-        <project path="build"                name="OP-TEE/build.git">
-                <linkfile src="synquacer.mk" dest="build/Makefile" />
-        </project>
-        <include name="include/linaro-swg.xml" />
-        <remove-project                      name="buildroot/buildroot.git" />
+  <include name="common.xml"/>
 
-        <!-- Misc gits -->
-        <project path="SCP-firmware"         name="ARM-software/SCP-firmware.git"         revision="56d4f515bcf1bc1b843abe343e9cf9dc44898ca2" />
-        <project path="edk2"                 name="tianocore/edk2.git"                    revision="21d9dc21f81828538af02ca9c2d86a36551b0771" />
-        <project path="edk2-non-osi"         name="tianocore/edk2-non-osi.git"            revision="596043ffb61d5f74a9eb334eaa4df683fa975c92" />
-        <project path="edk2-platforms"       name="tianocore/edk2-platforms.git"          revision="22d5f499135a0b43bfb723a983f93c3148d68494" />
-        <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="synquacer.mk" dest="build/Makefile"/>
+  </project>
+
+  <include name="include/linaro-swg.xml"/>
+  <remove-project name="buildroot/buildroot.git"/>
+
+  <!-- Misc gits -->
+  <project path="SCP-firmware" name="ARM-software/SCP-firmware.git" revision="56d4f515bcf1bc1b843abe343e9cf9dc44898ca2"/>
+  <project path="edk2" name="tianocore/edk2.git" revision="21d9dc21f81828538af02ca9c2d86a36551b0771"/>
+  <project path="edk2-non-osi" name="tianocore/edk2-non-osi.git" revision="596043ffb61d5f74a9eb334eaa4df683fa975c92"/>
+  <project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="22d5f499135a0b43bfb723a983f93c3148d68494"/>
+  <project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
 </manifest>
diff --git a/versal.xml b/versal.xml
index 4d62f57b4..1bd1e41d7 100644
--- a/versal.xml
+++ b/versal.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-	<include name="common.xml" />
-	<project path="build"                   name="OP-TEE/build.git" >
-			<linkfile src="versal.mk" dest="build/Makefile" />
-	</project>
+  <include name="common.xml"/>
 
-	<remove-project                         name="linaro-swg/linux.git" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="versal.mk" dest="build/Makefile"/>
+  </project>
 
-	<!-- Private maintainer git - Xilinx adoption work is in progress -->
-	<project path="arm-trusted-firmware"	name="ldts/arm-trusted-firmware.git"  revision="refs/heads/xlnx-v2.7-versal"/>
+  <remove-project name="linaro-swg/linux.git"/>
 
-	<!-- Xilinx gits -->
-	<project path="u-boot"			name="Xilinx/u-boot-xlnx.git"	revision="refs/tags/xilinx-v2022.1"/>
-	<project path="linux"			name="Xilinx/linux-xlnx.git"	revision="refs/tags/xilinx-v2022.1"/>
-	<project path="bootgen"			name="Xilinx/bootgen.git"	revision="refs/tags/xilinx_v2022.1"/>
+  <!-- Private maintainer git - Xilinx adoption work is in progress -->
+  <project path="arm-trusted-firmware" name="ldts/arm-trusted-firmware.git" revision="refs/heads/xlnx-v2.7-versal"/>
+
+  <!-- Xilinx gits -->
+  <project path="u-boot" name="Xilinx/u-boot-xlnx.git" revision="refs/tags/xilinx-v2022.1"/>
+  <project path="linux" name="Xilinx/linux-xlnx.git" revision="refs/tags/xilinx-v2022.1"/>
+  <project path="bootgen" name="Xilinx/bootgen.git" revision="refs/tags/xilinx_v2022.1"/>
 </manifest>
diff --git a/zynqmp.xml b/zynqmp.xml
index 2ab183cc5..2d9c4de8b 100644
--- a/zynqmp.xml
+++ b/zynqmp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-	<include name="common.xml" />
-	<project path="build"           name="OP-TEE/build.git" >
-		<linkfile src="zynqmp.mk" dest="build/Makefile" />
-	</project>
+  <include name="common.xml"/>
 
-	<remove-project                 name="linaro-swg/linux.git" />
+  <project path="build" name="OP-TEE/build.git">
+    <linkfile src="zynqmp.mk" dest="build/Makefile"/>
+  </project>
 
-	<!-- Xilinx gits -->
-	<project path="arm-trusted-firmware"	name="Xilinx/arm-trusted-firmware" />
-	<project path="u-boot-xlnx"		name="Xilinx/u-boot-xlnx"		revision="refs/tags/xilinx-v2021.1"/>
-	<project path="linux-xlnx"		name="Xilinx/linux-xlnx"		revision="refs/tags/xilinx-v2021.1"/>
-	<project path="bootgen"			name="Xilinx/bootgen"			revision="refs/tags/xilinx_v2021.1"/>
+  <remove-project name="linaro-swg/linux.git"/>
+
+  <!-- Xilinx gits -->
+  <project path="arm-trusted-firmware" name="Xilinx/arm-trusted-firmware"/>
+  <project path="u-boot-xlnx" name="Xilinx/u-boot-xlnx" revision="refs/tags/xilinx-v2021.1"/>
+  <project path="linux-xlnx" name="Xilinx/linux-xlnx" revision="refs/tags/xilinx-v2021.1"/>
+  <project path="bootgen" name="Xilinx/bootgen" revision="refs/tags/xilinx_v2021.1"/>
 </manifest>