diff --git a/external/config/boards/orangepi900.conf b/external/config/boards/orangepi900.conf
new file mode 100644
index 0000000..6c8b115
--- /dev/null
+++ b/external/config/boards/orangepi900.conf
@@ -0,0 +1,14 @@
+# Rockchip RK3588 SoC
+BOARD_NAME="Orange Pi 900"
+BOARDFAMILY="rockchip-rk3588"
+BOOTCONFIG="orangepi_900_defconfig"
+KERNEL_TARGET="legacy"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-orangepi-900.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SUPPORT_SPI="yes"
+SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
+DISTRIB_TYPE_LEGACY="bullseye bookworm bionic focal jammy"
+BOOTFS_TYPE="fat"
+REVISION="1.0.0"
diff --git a/external/config/sources/families/include/rockchip64_common.inc b/external/config/sources/families/include/rockchip64_common.inc
index 312fe5f..efe6e52 100644
--- a/external/config/sources/families/include/rockchip64_common.inc
+++ b/external/config/sources/families/include/rockchip64_common.inc
@@ -57,7 +57,7 @@ if [[ $BOARD =~ orangepir1plus|orangepir1plus-lts ]]; then
 	MINILOADER_BLOB='rk33/rk322xh_miniloader_v2.50.bin'
 	BL31_BLOB='rk33/rk322xh_bl31_v1.44.elf'
 
-elif [[ $BOARD =~ orangepi5|orangepi5b|orangepi5plus|orangepitab ]]; then
+elif [[ $BOARDFAMILY == "rockchip-rk3588" ]]; then
 
         BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
         DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin}"
@@ -113,7 +113,7 @@ uboot_custom_postprocess()
 
 	if [[ $BOOT_SUPPORT_SPI == yes ]]; then
 
-		if [[ $BOARD =~ orangepi5|orangepi5b|orangepi5plus|orangepitab ]]; then
+		if [[ $BOARDFAMILY == "rockchip-rk3588" ]]; then
 
 			tools/mkimage -n rk3588 -T rksd -d $RKBIN_DIR/$DDR_BLOB:spl/u-boot-spl.bin idbloader.img
 			dd if=/dev/zero of=rkspi_loader.img bs=1M count=0 seek=4
@@ -242,7 +242,7 @@ family_tweaks()
 	[[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s
 
 	[[ "$BRANCH" =~ legacy|current ]] && rk3399_gpu_vpu_tweaks
-	[[ "$BRANCH" =~ legacy && "$BOARD" =~ orangepi5|orangepi5b|orangepi5plus|orangepitab ]] && rk3588_gpu_vpu_tweaks
+	[[ "$BRANCH" =~ legacy && $BOARDFAMILY == "rockchip-rk3588" ]] && rk3588_gpu_vpu_tweaks
 
 	#if [[ ${BOARD} == orangepi800 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} =~ bullseye|bookworm ]]; then
 
diff --git a/external/config/sources/families/rockchip-rk3588.conf b/external/config/sources/families/rockchip-rk3588.conf
index 43270e0..624bfb6 100644
--- a/external/config/sources/families/rockchip-rk3588.conf
+++ b/external/config/sources/families/rockchip-rk3588.conf
@@ -74,9 +74,13 @@ family_tweaks_s() {
 		rsync -a --chown=root:root "${EXTER}"/packages/bsp/rk3588/* ${SDCARD}/
 	fi
 
-	if [[ ${BOARD} == orangepi5plus ]]; then
+	if [[ ${BOARD} =~ orangepi5plus|orangepi900 ]]; then
 
-		rsync -a --chown=root:root "${EXTER}"/packages/bsp/orangepi5plus/* ${SDCARD}/
+		if [[ ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} == kde-plasma ]]; then
+			rsync -a --chown=root:root --exclude=etc/pulse "${EXTER}"/packages/bsp/orangepi5plus/* ${SDCARD}/
+		else
+			rsync -a --chown=root:root "${EXTER}"/packages/bsp/orangepi5plus/* ${SDCARD}/
+		fi
 		cp /home/orangepi/orangepi-build/external/cache/sources/linuxpg "${SDCARD}"/opt/ -rfa
 	fi
 
diff --git a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
index af76094..b197f0b 100755
--- a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
+++ b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
@@ -97,7 +97,7 @@ prepare_board() {
 		rockpro64|renegade-elite|pinebook-pro|station-p1)
 			BOARDFAMILY=rk3399
 			;;
-		orangepi5|orangepi5b|orangepi5plus|orangepitab)
+		orangepi5|orangepi5b|orangepi5plus|orangepitab|orangepi900)
 			[[ $BOARD =~ orangepi5|orangepi5b ]] && echo host > /sys/kernel/debug/usb/fc000000.usb/mode
 
 			if [[ -c /dev/mpp_service ]]; then