diff --git a/config/boards/coolpi-cm5.csc b/config/boards/coolpi-cm5.csc
index d5d52fc328..ae6c70bb4f 100644
--- a/config/boards/coolpi-cm5.csc
+++ b/config/boards/coolpi-cm5.csc
@@ -21,7 +21,7 @@ function post_family_config_branch_edge__coolpi-cm5_use_mainline_uboot() {
 	declare -g BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # Kwiboo U-Boot
 	unset BOOTBRANCH
 	unset BOOTPATCHDIR
-	declare -g BOOTBRANCH_BOARD="tag:v2024.07-rc2"                        # commit: 52835266d3e as of v2024.07-rc2
+	declare -g BOOTBRANCH_BOARD="tag:v2024.07"                        # commit: 52835266d3e as of v2024.07-rc2
 	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
diff --git a/config/boards/lubancat2.csc b/config/boards/lubancat2.csc
index 67c05d0308..5e865b7224 100644
--- a/config/boards/lubancat2.csc
+++ b/config/boards/lubancat2.csc
@@ -16,7 +16,7 @@ function post_family_config_branch_edge__lubancat_2_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07-rc5"
+	declare -g BOOTBRANCH="tag:v2024.07"
 	declare -g BOOTPATCHDIR="v2024.07"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
diff --git a/config/boards/nanopi-r6c.csc b/config/boards/nanopi-r6c.csc
index 8583268b7c..c696057782 100644
--- a/config/boards/nanopi-r6c.csc
+++ b/config/boards/nanopi-r6c.csc
@@ -37,7 +37,7 @@ function post_family_config__nanopi_r6c_use_mainline_uboot() {
 	declare -g BOOTCONFIG="generic-rk3588_defconfig"             # Use generic defconfig which should boot all RK3588 boards
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07-rc4"
+	declare -g BOOTBRANCH="tag:v2024.07"
 	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
index 5a3b2af896..cb71147909 100644
--- a/config/boards/orangepi5-plus.conf
+++ b/config/boards/orangepi5-plus.conf
@@ -35,7 +35,7 @@ function post_family_config_branch_edge__orangepi5plus_use_mainline_uboot() {
 	declare -g BOOTCONFIG="orangepi-5-plus-rk3588_defconfig"      # override the default for the board/family
 	declare -g BOOTDELAY=1                                        # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"  # We ❤️ mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07-rc4"
+	declare -g BOOTBRANCH="tag:v2024.07"
 	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
 	declare -g BOOTDIR="u-boot-${BOARD}"                          # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
diff --git a/config/boards/quartz64a.csc b/config/boards/quartz64a.csc
index d12149d289..086a476018 100644
--- a/config/boards/quartz64a.csc
+++ b/config/boards/quartz64a.csc
@@ -15,7 +15,7 @@ function post_family_config__quartz64_a_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07-rc5"
+	declare -g BOOTBRANCH="tag:v2024.07"
 	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
diff --git a/config/boards/quartz64b.csc b/config/boards/quartz64b.csc
index bd2abd2a5b..12a42d595f 100644
--- a/config/boards/quartz64b.csc
+++ b/config/boards/quartz64b.csc
@@ -15,7 +15,7 @@ function post_family_config__quartz64_b_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07-rc5"
+	declare -g BOOTBRANCH="tag:v2024.07"
 	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
diff --git a/config/boards/station-m1.csc b/config/boards/station-m1.csc
index b439e052b2..e4647140af 100644
--- a/config/boards/station-m1.csc
+++ b/config/boards/station-m1.csc
@@ -22,7 +22,7 @@ function post_family_config__station_m1_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07-rc5"
+	declare -g BOOTBRANCH="tag:v2024.07"
 	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
diff --git a/config/boards/station-p2.csc b/config/boards/station-p2.csc
index a223af5e98..a167cc1661 100644
--- a/config/boards/station-p2.csc
+++ b/config/boards/station-p2.csc
@@ -25,7 +25,7 @@ function post_family_config__station_p2_use_mainline_uboot() {
 
 	declare -g BOOTCONFIG="generic-rk3568_defconfig"             # Use generic defconfig which should boot all RK3568 boards
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07-rc5"
+	declare -g BOOTBRANCH="tag:v2024.07"
 	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency