diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index a185a77727..072d8d120e 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -197,8 +197,9 @@ payloads/external/GRUB2/grub2/build/default_payload.elf: grub2
 
 # U-Boot
 
-payloads/external/U-Boot/build/u-boot/u-boot.bin u-boot: $(DOTCONFIG)
+payloads/external/U-Boot/build/u-boot.bin u-boot: $(DOTCONFIG)
 	$(MAKE) -C payloads/external/U-Boot \
+			STABLE_COMMIT_ID=$(CONFIG_UBOOT_STABLE_COMMIT_ID) \
 			CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \
 			CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)
 
diff --git a/payloads/external/U-Boot/Kconfig b/payloads/external/U-Boot/Kconfig
index 01dbc950d6..06b4b73849 100644
--- a/payloads/external/U-Boot/Kconfig
+++ b/payloads/external/U-Boot/Kconfig
@@ -5,12 +5,16 @@ config PAYLOAD_SPECIFIC_OPTIONS
 	select PAYLOAD_IS_FLAT_BINARY
 	select WANT_LINEAR_FRAMEBUFFER
 
+config UBOOT_STABLE_COMMIT_ID
+	string
+	default "v2021.07"
+
 choice
 	prompt "U-Boot version"
 	default UBOOT_STABLE
 
 config UBOOT_STABLE
-	bool "v2019.4"
+	bool "v2021.07"
 	help
 	  Stable U-Boot version
 
diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile
index daadb3e934..07b6f48609 100644
--- a/payloads/external/U-Boot/Makefile
+++ b/payloads/external/U-Boot/Makefile
@@ -1,7 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-STABLE_COMMIT_ID=v2021.07
-
 TAG-$(CONFIG_UBOOT_MASTER)=origin/master
 TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID)
 
@@ -25,7 +23,7 @@ all: build
 
 $(project_dir):
 	echo "    Cloning $(project_name) from Git"
-	git clone --depth 1 $(project_git_repo) $(project_dir)
+	git clone $(project_git_repo) -b $(TAG-y) $(project_dir)
 
 fetch: $(project_dir)
 ifeq ($(CONFIG_UBOOT_MASTER),y)