diff --git a/device/testing/device-samsung-n2awifi/APKBUILD b/device/testing/device-samsung-n2awifi/APKBUILD
index 6090f8700..e64c4fff5 100644
--- a/device/testing/device-samsung-n2awifi/APKBUILD
+++ b/device/testing/device-samsung-n2awifi/APKBUILD
@@ -1,7 +1,8 @@
+# Maintainer: Hendrik Noack <hendrik.noack@protonmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-n2awifi
-pkgdesc="Samsung Galaxy Tab PRO 10.1 (WiFi)"
-pkgver=3
+pkgdesc="Samsung Galaxy Tab Pro 10.1 WiFi"
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -12,7 +13,10 @@ depends="
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="
+	deviceinfo
+	modules-initfs.mainline
+"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
@@ -44,10 +48,12 @@ kernel_mainline() {
 	_pmb_recommends="
 		firmware-samsung-n2awifi-mainline>=1-r0
 		linux-firmware-s5p-mfc
+		linux-firmware-brcm
 		"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 sha512sums="
-5c1097b8c9188c4fb339c0f03b7df98f4441e40e2de82decb06a03ed7c76c8cd9981d0b16fbabaec618ea620e4c085ca547ce1d7c9e243d9c5c4e5507342ce14  deviceinfo
+1d3ef00183a2276fecd97d426e92f8296068f4f010746495e78269d69efe44ce8f93162bef13294710fb40b815210458111877f1f870ed4a4715995dfc76039f  deviceinfo
+4b3cb9dca85c04f1bfc5676029a6ae225409f173c6f0fc025786c1a72326dabad4b5ad75d0dd9a41cdebe8c15db5ca9761e15f3b9f99f8bf70b19769bb116fe6  modules-initfs.mainline
 "
diff --git a/device/testing/device-samsung-n2awifi/deviceinfo b/device/testing/device-samsung-n2awifi/deviceinfo
index 14f0f0b79..237100552 100644
--- a/device/testing/device-samsung-n2awifi/deviceinfo
+++ b/device/testing/device-samsung-n2awifi/deviceinfo
@@ -17,7 +17,7 @@ deviceinfo_chassis="tablet"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_create_initfs_extra="true"
-deviceinfo_no_framebuffer_mainline="true"
+deviceinfo_gpu_accelerated_mainline="true"
 
 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -25,6 +25,7 @@ deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_append_seandroidenforce="true"
 deviceinfo_bootimg_dtb_second="false"
+deviceinfo_header_version="0"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
diff --git a/device/testing/device-samsung-n2awifi/modules-initfs.mainline b/device/testing/device-samsung-n2awifi/modules-initfs.mainline
new file mode 100644
index 000000000..b84398de8
--- /dev/null
+++ b/device/testing/device-samsung-n2awifi/modules-initfs.mainline
@@ -0,0 +1,4 @@
+atmel-mxt-ts
+drm-dp-aux-bus
+lp855x-bl
+panel-edp
diff --git a/device/testing/firmware-samsung-n2awifi/APKBUILD b/device/testing/firmware-samsung-n2awifi/APKBUILD
index 532443d68..fcf86beb6 100644
--- a/device/testing/firmware-samsung-n2awifi/APKBUILD
+++ b/device/testing/firmware-samsung-n2awifi/APKBUILD
@@ -1,7 +1,7 @@
 pkgname=firmware-samsung-n2awifi
+pkgdesc="Firmware for Samsung Galaxy Note Pro 10.1"
 pkgver=1
-pkgrel=0
-pkgdesc="Firmware for Samsung n2awifi"
+pkgrel=1
 url="https://github.com/exynos5420/android_vendor_samsung_n2a-common"
 arch="armv7"
 license="proprietary"
@@ -40,7 +40,7 @@ package() {
 }
 
 downstream() {
-	pkgdesc="Firmware for Samsung n2awifi when using downstream kernel"
+	pkgdesc="Firmware for Samsung Galaxy Note Pro 10.1 when using downstream kernel"
 	mkdir -p "$subpkgdir"
 	# Wifi
 	local file
@@ -51,7 +51,7 @@ downstream() {
 }
 
 mainline() {
-	pkgdesc="Firmware for Samsung n2awifi when using mainline kernel"
+	pkgdesc="Firmware for Samsung Galaxy Note Pro 10.1 when using mainline kernel"
 	mkdir -p "$subpkgdir"
 
 	# Bluetooth
@@ -59,8 +59,6 @@ mainline() {
 		"$subpkgdir"/lib/firmware/postmarketos/brcm/BCM4335C0.samsung,n2awifi.hcd
 
 	# Wifi
-	install -Dm644 "$srcdir/$pkgname-$_n2awifi_commit"-bcmdhd_sta.bin \
-		"$subpkgdir"/lib/firmware/postmarketos/brcm/brcmfmac4339-sdio.samsung,n2awifi.bin
 	install -Dm644 "$srcdir/$pkgname-$_n2awifi_commit"-nvram_net.txt \
 		"$subpkgdir"/lib/firmware/postmarketos/brcm/brcmfmac4339-sdio.samsung,n2awifi.txt
 }