diff --git a/device/testing/device-xunlong-orangepi5-plus/APKBUILD b/device/testing/device-xunlong-orangepi5-plus/APKBUILD
index 629d9477f..ca105deb3 100644
--- a/device/testing/device-xunlong-orangepi5-plus/APKBUILD
+++ b/device/testing/device-xunlong-orangepi5-plus/APKBUILD
@@ -2,20 +2,24 @@
 maintainer="WeirdTreeThing <bradyn127@protonmail.com>"
 pkgname=device-xunlong-orangepi5-plus
 pkgdesc="Xunlong Orange Pi 5 Plus"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-postmarketos-rockchip-rk3588
 	postmarketos-base
 	systemd-boot
 "
 makedepends="devicepkg-dev"
 source="deviceinfo kernel-cmdline.conf modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-kernel-stable:kernel_stable
+	$pkgname-kernel-lts:kernel_lts
+	$pkgname-kernel-mainline:kernel_mainline
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -31,8 +35,26 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
+kernel_stable() {
+	pkgdesc="Stable kernel (recommended, best balance between stability and features)"
+	depends="linux-postmarketos-stable"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_lts() {
+	pkgdesc="Long-term maintainance kernel (most stability, not all security fixes & new features)"
+	depends="linux-postmarketos-lts linux-firmware-none"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Upstream development kernel (regular breakage, latest features)"
+	depends="linux-postmarketos-mainline"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
 3bed41bae1a8cf93b2418eda7bbf218a715bae1b33a2c3a10487ef153f4833ad9627126d3bcc7cbd3f06523ac5fb338b28d3134c94f486f9e8aa0b6680323ffe  deviceinfo
 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb  kernel-cmdline.conf
-c787cb2c449bb493375e7c1519f1c6e0c35bce038277ca3032364c4867693f9099050611c0cbd7f22181f33dda11888d1f09e3e5272cf73fe3245aadfe9c2bd8  modules-initfs
+7f673ffb788c07b5ce0d596f36fa1601343f13a01c845f629b585460050958223b88004159cd39fb2ccbfcdff092f5884fa2bbb483d4c7fab98f2f2ca5afd243  modules-initfs
 "
diff --git a/device/testing/device-xunlong-orangepi5-plus/modules-initfs b/device/testing/device-xunlong-orangepi5-plus/modules-initfs
index 6f834a5c7..b4665e6f8 100644
--- a/device/testing/device-xunlong-orangepi5-plus/modules-initfs
+++ b/device/testing/device-xunlong-orangepi5-plus/modules-initfs
@@ -2,3 +2,6 @@ fusb302
 tcpm
 phy_rockchip_usbdp
 typec
+phy_rockchip_naneng_combphy
+phy_rockchip_samsung_hdptx
+rockchipdrm