diff --git a/VERSION b/VERSION
index 906042feda..5c8b16f6b9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-21.02.0-trunk
+20.11.5
diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index b5c710db7a..50c905b538 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -8,7 +8,8 @@ BOOTDELAY=0
 OVERLAY_PREFIX='rockchip'
 SERIALCON=${SERIALCON:=$([ $BRANCH == "legacy" ] && echo "ttyFIQ0:1500000" || echo "ttyS2:1500000")}
 GOVERNOR="ondemand"
-BOOTBRANCH="tag:v2020.10"
+BOOTBRANCH="tag:v2020.07"
+[[ $BOARD == nanopi-r4s ]] && BOOTBRANCH="tag:v2020.10"
 PACKAGE_LIST_FAMILY="ethtool"
 
 RKBIN_DIR="$SRC/cache/sources/rkbin-tools"