diff --git a/config/boards/khadas-vim3l.conf b/config/boards/khadas-vim3l.conf
index e11310414..e0f95b8c1 100644
--- a/config/boards/khadas-vim3l.conf
+++ b/config/boards/khadas-vim3l.conf
@@ -7,3 +7,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-sm1-khadas-vim3l.dtb"
+
+# For the usage of uboot 2022.01 for vim3l; 2022.10 is known to have issues; while 22.04 works.
+# 22.07 does not work either. v2022.07-rc1 not working either. So between 22.04 and 22.07-rc1 something broke.
+# Known problem pointed out by Neil, https://lore.kernel.org/all/258575a1-8c55-3229-f27a-d608a7aad0ec@baylibre.com/
+BOOTBRANCH_BOARD="tag:v2022.04"
diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc
index 9e00b0b10..0fcf4c085 100644
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@@ -5,7 +5,7 @@ LINUXFAMILY=meson64
 ARCH=arm64
 SERIALCON=ttyAML0
 SRC_LOADADDR='LOADADDR=0x1080000'
-BOOTBRANCH="tag:v2022.07"
+BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:v2022.07"}"
 OVERLAY_PREFIX='meson'
 
 # this family does not need it