diff --git a/device/testing/device-xiaomi-daisy/APKBUILD b/device/testing/device-xiaomi-daisy/APKBUILD
index 2ce25d87c..5c202d41e 100644
--- a/device/testing/device-xiaomi-daisy/APKBUILD
+++ b/device/testing/device-xiaomi-daisy/APKBUILD
@@ -4,15 +4,20 @@
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-qcom-msm8953 mkbootimg mesa-dri-gallium"
+depends="postmarketos-base mesa-dri-gallium"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
+subpackages="
+		$pkgname-nonfree-firmware:nonfree_firmware
+		$pkgname-kernel-downstream:kernel_downstream
+		$pkgname-kernel-mainline:kernel_mainline
+		"
+source="
+	deviceinfo
 	fb.modes
 	pointercal
 	30-gpu-firmware.files
@@ -35,8 +40,20 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-xiaomi-daisy"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Mainline kernel"
+	depends="linux-postmarketos-qcom-msm8953 mkbootimg"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
-749e63b2d2c2586b77062aeef24dd080e0f405dff5c2380a1bd293a3839f68d0e40dc61c9d4c0bf47025dcacbd16076108d69b997851e2a6d40f7b3e473f7447  deviceinfo
+b62292726824b133c3425e0a2df6d22cba84e281ccf7ada643e97262cca1a3e878b5d9289ef06d84d39b2103212d02e3bdce88f41ff5f26617199fdc66108ed1  deviceinfo
 9b888f3a4ef3ed3c0b2e9c6a6e8a6c686909c530c3d95be797b47b4eb9deb55d64190b7a3736e44139630bfff5e295625a855052923369fdd37889060a3220ca  fb.modes
 4fa63c184f00033fbae2e4b140c9655061b3b662e337f7bdf5f8e26f7b57d6c66ad01fc93da05ce7d330f0f05bb0d36cc9b356ebfc7eb4200be4d4cc03afc975  pointercal
 302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74  30-gpu-firmware.files
diff --git a/device/testing/device-xiaomi-daisy/deviceinfo b/device/testing/device-xiaomi-daisy/deviceinfo
index 10181a5da..24b9315d1 100644
--- a/device/testing/device-xiaomi-daisy/deviceinfo
+++ b/device/testing/device-xiaomi-daisy/deviceinfo
@@ -6,8 +6,10 @@ deviceinfo_name="Xiaomi Mi A2 Lite"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-daisy"
 deviceinfo_year="2018"
-deviceinfo_dtb="qcom/sdm625-xiaomi-daisy"
-deviceinfo_append_dtb="true"
+deviceinfo_dtb_mainline="qcom/sdm625-xiaomi-daisy"
+deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb_downstream=""
+deviceinfo_append_dtb_downstream="false"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="aarch64"
 deviceinfo_mesa_driver="msm"
@@ -18,13 +20,15 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2280"
+deviceinfo_dev_touchscreen_downstream="/dev/input/event1"
 deviceinfo_dev_touchscreen_calibration="/etc/pointercal"
 deviceinfo_swap_size_recommended="1024"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline_mainline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_hsl_uart,0x78af000 androidboot.usbconfigfs=false loop.max_part=7 buildvariant=user veritykeyid=id:5560e7863b4d8118c2f1b065595cf93bb2447992"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"