diff --git a/device/testing/device-fairphone-fp3/APKBUILD b/device/testing/device-fairphone-fp3/APKBUILD
index 4bee7f73f..65e203cb6 100644
--- a/device/testing/device-fairphone-fp3/APKBUILD
+++ b/device/testing/device-fairphone-fp3/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp3
 pkgdesc="Fairphone 3"
-pkgver=0.3
+pkgver=0.4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,7 +17,9 @@ makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="
 	$pkgname-downstream-firmware:downstream_firmware
+	$pkgname-mainline-firmware:mainline_firmware
 	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
 
@@ -35,6 +37,12 @@ kernel_downstream() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+kernel_mainline() {
+	pkgdesc="Mainline kernel"
+	depends="linux-postmarketos-qcom-msm8953"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Firmware for WiFi, Audio, etc."
 	mkdir "$subpkgdir"
@@ -50,6 +58,19 @@ downstream_firmware() {
 	mkdir "$subpkgdir"
 }
 
+mainline_firmware() {
+	pkgdesc="Firmware support packages for mainline kernel"
+	depends="
+		firmware-fairphone-fp3-adreno
+		firmware-fairphone-fp3-adsp
+		firmware-fairphone-fp3-venus
+		firmware-fairphone-fp3-wcnss
+		rmtfs
+		"
+	install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
-5bee43115c36455fc9f1a6be2107420ccaf94b0c0bdef136fad2af5d6e4545965958a13ba1bbcbf3ef027e0da3cb5f16224b543ebd451a4ebc23e3b102322396  deviceinfo
+412f09b87067f4fb4a89e28617ca7084aba1c6d27815fd2cc913c78dec19988412127d340bd542c04bcef3ba106e168b6e75bbdeb00b6ca93106b2cf130bd4f4  deviceinfo
 "
diff --git a/device/testing/device-fairphone-fp3/deviceinfo b/device/testing/device-fairphone-fp3/deviceinfo
index cb9ac6da4..07f1523df 100644
--- a/device/testing/device-fairphone-fp3/deviceinfo
+++ b/device/testing/device-fairphone-fp3/deviceinfo
@@ -9,6 +9,7 @@ deviceinfo_codename="fairphone-fp3"
 deviceinfo_year="2019"
 deviceinfo_dtb_mainline="qcom/sdm632-fairphone-fp3"
 deviceinfo_append_dtb_mainline="true"
+deviceinfo_modules_initfs_mainline="msm panel-fairphone-fp3-hx83112b"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -18,7 +19,7 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2160"
 deviceinfo_getty="ttyMSM0;115200"
-deviceinfo_gpu_accelerated_mainline="true"
+deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
@@ -35,6 +36,3 @@ deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
-
-# USB
-deviceinfo_rndis_function="ncm.usb0"