diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc
index 2de67f4688..dc6f14df93 100644
--- a/config/sources/families/include/sunxi64_common.inc
+++ b/config/sources/families/include/sunxi64_common.inc
@@ -24,14 +24,17 @@ case $BRANCH in
 
 	legacy)
 		declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH="tag:v6.1.69"
 		;;
 
 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH="tag:v6.6.8"
 		;;
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH="tag:v6.7-rc6"
 		;;
 esac
 
diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc
index aa72d527cc..8caa98dec4 100644
--- a/config/sources/families/include/sunxi_common.inc
+++ b/config/sources/families/include/sunxi_common.inc
@@ -25,14 +25,17 @@ case $BRANCH in
 
 	legacy)
 		declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH="tag:v6.1.69"
 		;;
 
 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH="tag:v6.6.8"
 		;;
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH="tag:v6.7-rc6"
 		;;
 esac
 
diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh
index 2ba7f8f7af..17bba411be 100644
--- a/config/sources/mainline-kernel.conf.sh
+++ b/config/sources/mainline-kernel.conf.sh
@@ -13,17 +13,6 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() {
 	fi
 }
 
-# Maintained by @viraniac
-function mainline_kernel_decide_version__sunxi_fixed_versions() {
-	[[ "${LINUXFAMILY}" != "sunxi" && "${LINUXFAMILY}" != "sunxi64" ]] && return 0 # only for sunxi/sunxi64
-	case "${KERNEL_MAJOR_MINOR}" in
-		"6.1") declare -g KERNELBRANCH="tag:v6.1.69" ;;
-		"6.6") declare -g KERNELBRANCH="tag:v6.6.8" ;;
-		"6.7") declare -g KERNELBRANCH="tag:v6.7-rc6" ;;
-	esac
-	display_alert "mainline-kernel" "Using fixed version for sunxi/sunxi64 KERNELBRANCH='${KERNELBRANCH}'" "info"
-}
-
 # Maintained by @paolosabatino
 function mainline_kernel_decide_version__rockchip_32bit_fixed_versions() {
 	[[ "${LINUXFAMILY}" != "rockchip" ]] && return 0 # only for rockchip armhf 32-bit