diff --git a/device/testing/device-nokia-argon/APKBUILD b/device/testing/device-nokia-argon/APKBUILD
index cb12e2d45..a69d1cc4d 100644
--- a/device/testing/device-nokia-argon/APKBUILD
+++ b/device/testing/device-nokia-argon/APKBUILD
@@ -1,36 +1,40 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-nokia-argon
 pkgdesc="Nokia 8110 4G"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="GPL-2.0-only"
 arch="armv7"
 options="!check !archcheck"
 depends="
-	linux-postmarketos-qcom-msm8909
+	linux-postmarketos-qcom-msm8916
 	mkbootimg
 	postmarketos-base
+	soc-qcom-msm8909
+	soc-qcom-msm8916-rproc
 "
+_pmb_select="soc-qcom-msm8916-rproc"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 makedepends="devicepkg-dev mipi-dbi-cmd"
+_panel="nokia,argon-gc9305-v2-panel"
 source="
-	nokia,argon-gc9305-v2-panel.txt
 	00-nokia-argon-display.files
 	deviceinfo
-	"
+	$_panel.txt
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
 	mkdir -p "$builddir"
-	mipi-dbi-cmd "$builddir"/nokia,argon-gc9305-v2-panel.bin \
-			"$srcdir"/nokia,argon-gc9305-v2-panel.txt
+	mipi-dbi-cmd "$builddir"/"$_panel".bin \
+			"$srcdir"/"$_panel".txt
 }
 
 package() {
 	devicepkg_package $startdir $pkgname
 	# Package display init sequence
-	install -Dm644 "$builddir"/nokia,argon-gc9305-v2-panel.bin -t \
+	install -Dm644 "$builddir"/"$_panel".bin -t \
 			"$pkgdir"/lib/firmware/
 	install -Dm644 "$srcdir"/00-nokia-argon-display.files -t \
 			"$pkgdir"/etc/postmarketos-mkinitfs/files/
@@ -48,7 +52,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-dd82fd4732694a24c91339b5c5fbb0bf485b3b2da3c17c11b72a02e90e9827c367504c99894556dd8273f927408cdb187325e5f3b9ea9e4a82e3cb3798cb2816  nokia,argon-gc9305-v2-panel.txt
 66302bb5d83c4ba155ff62405fb9a374ab76e1912411310b1ad75e00c216b6868da4e2b6f3987c97146389aa44b2b2c26f0ca0819566be45c9d0d2dd1d3b72f1  00-nokia-argon-display.files
-149457297bc797e789c635cbd32bbd8b2dd5fd01bb9b92e301ee57dc22d0e3530684fdaaf5236e4136b86a30b35b9eed733634028f135f5fbb2b398e59d66cfa  deviceinfo
+f20e32c7c261682e812ffbd13c189143da8b27d76aeaef792a03bc2f6d4cb41fc989463640423e58906f362c33014231c2fb3bd242b3153f67eb8778a8210441  deviceinfo
+dd82fd4732694a24c91339b5c5fbb0bf485b3b2da3c17c11b72a02e90e9827c367504c99894556dd8273f927408cdb187325e5f3b9ea9e4a82e3cb3798cb2816  nokia,argon-gc9305-v2-panel.txt
 "
diff --git a/device/testing/device-nokia-argon/deviceinfo b/device/testing/device-nokia-argon/deviceinfo
index a387f83ec..254a0c6dd 100644
--- a/device/testing/device-nokia-argon/deviceinfo
+++ b/device/testing/device-nokia-argon/deviceinfo
@@ -10,6 +10,7 @@ deviceinfo_year="2018"
 deviceinfo_dtb="qcom-msm8905-nokia-argon"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="armv7"
+deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-mipi-dbi"
 deviceinfo_swap_size_recommended="512"
 
 # Device related