diff --git a/config/boards/lubancat2.csc b/config/boards/lubancat2.csc
index dbd350353b..67c05d0308 100644
--- a/config/boards/lubancat2.csc
+++ b/config/boards/lubancat2.csc
@@ -12,16 +12,18 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 
 # Mainline U-Boot
-function post_family_config_branch_edge__lubancat2_use_mainline_uboot() {
-	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
+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 BOOTPATCHDIR="v2024.07"
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
-	declare -g BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # Kwiboo U-Boot
-	unset BOOTBRANCH
-	declare BOOTPATCHDIR="v2024.07-lubancat2" 			      # empty, no patchs needed
-	declare -g BOOTBRANCH_BOARD="tag:v2024.07-rc3"                        # commit: a7f0154c4128 as of v2024.07-rc3
-	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"
-	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
+
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
 
 	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {