diff --git a/default.xml b/default.xml
index 61eac3d..d0f7a28 100644
--- a/default.xml
+++ b/default.xml
@@ -1,7 +1,6 @@
 <?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" />
 
         <include name="common.xml" />
         <project path="build"               name="OP-TEE/build.git">
@@ -10,5 +9,5 @@
 
         <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/v2024.07" remote="u-boot" clone-depth="1" />
+        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="refs/tags/v2024.07" clone-depth="1" />
 </manifest>
diff --git a/fvp.xml b/fvp.xml
index 9065337..8b7ed0e 100644
--- a/fvp.xml
+++ b/fvp.xml
@@ -1,7 +1,6 @@
 <?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" />
 
         <include name="common.xml" />
         <project path="build"                name="OP-TEE/build.git">
@@ -11,5 +10,5 @@
         <project path="hafnium"              name="hafnium/hafnium.git"                   revision="a33eca9976006ac9b08ed4afe6260a2e8b9d2b3a" clone-depth="1" remote="tfo" />
         <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.11" clone-depth="1" remote="tfo" />
         <project path="mbedtls"              name="Mbed-TLS/mbedtls.git"                  revision="refs/tags/mbedtls-3.6.0" />
-        <project path="u-boot"               name="u-boot.git"                            revision="refs/tags/v2024.04" remote="u-boot" clone-depth="1" />
+        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="refs/tags/v2024.04" clone-depth="1" />
 </manifest>
diff --git a/poplar.xml b/poplar.xml
index 9962c17..4b87ee2 100644
--- a/poplar.xml
+++ b/poplar.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
         <remote name="tfo"      fetch="https://git.trustedfirmware.org" />
-        <remote name="denx"     fetch="https://source.denx.de" />
 
         <include name="common.xml" />
         <project path="build"                name="OP-TEE/build.git" >
@@ -11,7 +10,7 @@
         <!-- 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="u-boot"               name="u-boot/u-boot.git"                     revision="697758e7c81131da6db0e3b10515019fe3aca8c9" 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" />
 </manifest>
diff --git a/qemu_v8.xml b/qemu_v8.xml
index 1e85246..1d14d71 100644
--- a/qemu_v8.xml
+++ b/qemu_v8.xml
@@ -1,7 +1,6 @@
 <?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" />
 
         <include name="common.xml" />
         <project path="build"                name="OP-TEE/build.git">
@@ -14,7 +13,7 @@
         <project path="hafnium"              name="TF-Hafnium/hafnium.git"                   revision="refs/tags/v2.12" clone-depth="1" />
         <project path="trusted-firmware-a"   name="TrustedFirmware-A/trusted-firmware-a.git"           revision="refs/tags/v2.13-rc0" clone-depth="1" />
         <project path="mbedtls"              name="Mbed-TLS/mbedtls.git"                  revision="refs/tags/mbedtls-3.6.0" clone-depth="1" />
-        <project path="u-boot"               name="u-boot.git"                            revision="refs/tags/v2025.07-rc1" remote="u-boot" clone-depth="1" />
+        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="refs/tags/v2025.07-rc1"  clone-depth="1" />
         <project path="xen"                  name="xen-project/xen.git"                   revision="refs/tags/RELEASE-4.20.0" clone-depth="1" />
         <project path="SCP-firmware"         name="linaro-swg/SCP-firmware.git"             revision="refs/tags/v2.16.0" clone-depth="1" />
 
diff --git a/rockpi4.xml b/rockpi4.xml
index d029dd3..b3b6d65 100644
--- a/rockpi4.xml
+++ b/rockpi4.xml
@@ -1,7 +1,6 @@
 <?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" />
 
         <include name="common.xml" />
         <project path="build"                name="OP-TEE/build.git">
@@ -10,5 +9,5 @@
 
         <project path="rkdeveloptool"        name="rockchip-linux/rkdeveloptool" />
         <project path="trusted-firmware-a"   name="TF-A/trusted-firmware-a.git"           revision="refs/tags/v2.10.0" clone-depth="1" remote="tfo" />
-        <project path="u-boot"               name="u-boot.git"                            revision="refs/tags/v2025.01" remote="u-boot" clone-depth="1" />
+        <project path="u-boot"               name="u-boot/u-boot.git"                     revision="refs/tags/v2025.01" clone-depth="1" />
 </manifest>
diff --git a/stm32mp1.xml b/stm32mp1.xml
index 971f849..77a3994 100644
--- a/stm32mp1.xml
+++ b/stm32mp1.xml
@@ -1,7 +1,6 @@
 <?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="arm-gitlab" fetch="https://git.gitlab.arm.com/" />
 
         <include name="common.xml" />
@@ -15,5 +14,5 @@
         <project path="mbedtls"              name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-2.28.1" clone-depth="1" />
         <project path="scp-firmware"         name="firmware/SCP-firmware.git" revision="refs/tags/v2.15.0" remote="arm-gitlab" 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="u-boot"               name="u-boot/u-boot.git" revision="refs/tags/v2024.01-rc1" clone-depth="1" />
 </manifest>