diff --git a/device/testing/device-qcom-msm89x7/30-gpu-firmware.files b/device/testing/device-qcom-msm89x7/30-gpu-firmware.files
new file mode 100644
index 0000000000000000000000000000000000000000..3da99f322aba88d92c2d4ac5844184a7c1efc15e
--- /dev/null
+++ b/device/testing/device-qcom-msm89x7/30-gpu-firmware.files
@@ -0,0 +1,2 @@
+/lib/firmware/qcom/a530_pfp.fw
+/lib/firmware/qcom/a530_pm4.fw
diff --git a/device/testing/device-qcom-msm89x7/APKBUILD b/device/testing/device-qcom-msm89x7/APKBUILD
index 57a2fe095df1794bbd2835005c4da1cd1eae9925..df1fe725de4ec09b23d22d2089149a6d1ca2ca02 100644
--- a/device/testing/device-qcom-msm89x7/APKBUILD
+++ b/device/testing/device-qcom-msm89x7/APKBUILD
@@ -9,16 +9,14 @@ license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-qcom-adreno-a300
-	firmware-qcom-adreno-a530
 	linux-postmarketos-qcom-msm89x7
 	lk2nd-msm8952
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
 source="
+	30-gpu-firmware.files
 	deviceinfo
 	modules-initfs
 "
@@ -31,6 +29,20 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Firmware for MSM8917/MSM8937/MSM8940-based devices"
+	depends="
+		firmware-qcom-adreno-a300
+		firmware-qcom-adreno-a530
+		msm-firmware-loader
+		"
+	mkdir "$subpkgdir"
+
+	# Enable loading before the root filesystem is mounted 
+	install -Dm644 "$srcdir/30-gpu-firmware.files" -t \
+		"$subpkgdir/usr/share/mkinitfs/files"
+}
+
 sha512sums="
 525fb2e6cc7fc01d6a8bd0d1e865b0d038de7294a6824661cb564afaafb37af0bd1bbf96c48c22e72aa4502c19e9f5167e411653a9eb7989dbf54e07fd49ea7c  deviceinfo
 8f0e17ddcbbb7421c5ebb78c2342d636b58301a842d488f50c48470399a5d96e6ed7bd0958c2b8a5eb34856209bac210476b1d379a5a6536ea2523dab7f793ff  modules-initfs
diff --git a/device/testing/device-qcom-msm89x7/modules-initfs b/device/testing/device-qcom-msm89x7/modules-initfs
index 4d053c97c4fddf183695076acf9e3995756fe3ea..761b2f19221c68e150119a14a5d84d94105f2069 100644
--- a/device/testing/device-qcom-msm89x7/modules-initfs
+++ b/device/testing/device-qcom-msm89x7/modules-initfs
@@ -1,5 +1,6 @@
 edt_ft5x06
 goodix_ts
+novatek-nvt-ts
 msm
 panel_xiaomi_land_hx8394f_boe
 panel_xiaomi_land_ili9881c_tianma
@@ -14,4 +15,5 @@ panel_xiaomi_santoni_ili9881c_ebbgdjn
 panel_xiaomi_ugglite_ili9881c_sc
 panel_xiaomi_ugglite_otm1901a_hx
 panel_xiaomi_ugglite_otm1901a_tm
+panel_nokia_nd1_nt35521s
 tps65132_regulator