diff --git a/build.sh b/build.sh
index 63676ccbe10..83fe12a9d64 100755
--- a/build.sh
+++ b/build.sh
@@ -173,12 +173,20 @@ function build_kernel() {
 		local SECURITY_LEVEL=`get_build_var PLATFORM_SECURITY_PATCH`
 		local IMAGE_PATH=rockdev/Image-${PRODUCT}
 		local REL_OUT=$(realpath $OUT --relative-to=.)
+		local RAMDISK_IMG=$OUT/ramdisk.img
+
+		if [ "$(get_build_var BOARD_USES_RECOVERY_AS_BOOT)" = true ]; then
+			RAMDISK_IMG=$OUT/ramdisk-recovery.img
+		fi
+		if [ -n "${TARGET_BUILD_VARIANT}" ]; then
+			BOOT_CMDLINE+=" buildvariant=${TARGET_BUILD_VARIANT}"
+		fi
 
 		FA_RunCmd cp -af $KERNEL_DIR/arch/arm64/boot/Image $OUT/kernel
 		[ -f $OUT/dtb.img ] && DTB_IMG_ARGS="--dtb $OUT/dtb.img"
 
 		mkbootimg --kernel $OUT/kernel \
-			--ramdisk $OUT/ramdisk.img ${DTB_IMG_ARGS} \
+			--ramdisk ${RAMDISK_IMG} ${DTB_IMG_ARGS} \
 			--cmdline "$BOOT_CMDLINE" \
 			--os_version 12 --os_patch_level $SECURITY_LEVEL \
 			--header_version 2 \
diff --git a/device/friendlyelec/nanopi3/build.sh b/device/friendlyelec/nanopi3/build.sh
index 63676ccbe10..83fe12a9d64 100755
--- a/device/friendlyelec/nanopi3/build.sh
+++ b/device/friendlyelec/nanopi3/build.sh
@@ -173,12 +173,20 @@ function build_kernel() {
 		local SECURITY_LEVEL=`get_build_var PLATFORM_SECURITY_PATCH`
 		local IMAGE_PATH=rockdev/Image-${PRODUCT}
 		local REL_OUT=$(realpath $OUT --relative-to=.)
+		local RAMDISK_IMG=$OUT/ramdisk.img
+
+		if [ "$(get_build_var BOARD_USES_RECOVERY_AS_BOOT)" = true ]; then
+			RAMDISK_IMG=$OUT/ramdisk-recovery.img
+		fi
+		if [ -n "${TARGET_BUILD_VARIANT}" ]; then
+			BOOT_CMDLINE+=" buildvariant=${TARGET_BUILD_VARIANT}"
+		fi
 
 		FA_RunCmd cp -af $KERNEL_DIR/arch/arm64/boot/Image $OUT/kernel
 		[ -f $OUT/dtb.img ] && DTB_IMG_ARGS="--dtb $OUT/dtb.img"
 
 		mkbootimg --kernel $OUT/kernel \
-			--ramdisk $OUT/ramdisk.img ${DTB_IMG_ARGS} \
+			--ramdisk ${RAMDISK_IMG} ${DTB_IMG_ARGS} \
 			--cmdline "$BOOT_CMDLINE" \
 			--os_version 12 --os_patch_level $SECURITY_LEVEL \
 			--header_version 2 \