diff --git a/device/testing/soc-qcom-msm8998/APKBUILD b/device/testing/soc-qcom-msm8998/APKBUILD
new file mode 100644
index 000000000..e67cd77e7
--- /dev/null
+++ b/device/testing/soc-qcom-msm8998/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+pkgname=soc-qcom-msm8998
+pkgdesc="Common package for Qualcomm MSM8998 devices"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="BSD-3-Clause"
+arch="aarch64"
+options="!check !archcheck !tracedeps"
+depends="soc-qcom-sdm845"
+source="iwd-main.conf"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+nonfree_firmware() {
+	pkgdesc="Modem, WiFi and GPU Firmware"
+	depends="
+	soc-qcom-sdm845-nonfree-firmware
+	qcom-diag
+	qcom-diag-openrc
+"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir "$subpkgdir"
+	install -D -m644 "$srcdir"/iwd-main.conf \
+		"$subpkgdir"/etc/iwd/main.conf
+}
+
+sha512sums="
+2e3e2be6947e1fb0335ca53ef1f1929b614e3192385f3a42ddb895729793ce185e8c8ad0f16f851ee025c751045cfaf02712b42e89818e37eae532fb59613375  iwd-main.conf
+"
diff --git a/device/testing/soc-qcom-msm8998/iwd-main.conf b/device/testing/soc-qcom-msm8998/iwd-main.conf
new file mode 100644
index 000000000..3bb3ad7d2
--- /dev/null
+++ b/device/testing/soc-qcom-msm8998/iwd-main.conf
@@ -0,0 +1,4 @@
+# required to avoid modem firmware crash for now
+# https://gitlab.com/msm8998-mainline/linux/-/issues/27
+[General]
+ControlPortOverNL80211=false
diff --git a/device/testing/soc-qcom-msm8998/soc-qcom-msm8998-nonfree-firmware.post-install b/device/testing/soc-qcom-msm8998/soc-qcom-msm8998-nonfree-firmware.post-install
new file mode 100644
index 000000000..a871ed755
--- /dev/null
+++ b/device/testing/soc-qcom-msm8998/soc-qcom-msm8998-nonfree-firmware.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+# the Wi-Fi firmware will keep crashing if diag-router isn't running
+# https://gitlab.com/msm8998-mainline/linux/-/issues/28
+rc-update add diag-router boot
diff --git a/device/testing/soc-qcom-msm8998/soc-qcom-msm8998-nonfree-firmware.post-upgrade b/device/testing/soc-qcom-msm8998/soc-qcom-msm8998-nonfree-firmware.post-upgrade
new file mode 120000
index 000000000..828e6b7a4
--- /dev/null
+++ b/device/testing/soc-qcom-msm8998/soc-qcom-msm8998-nonfree-firmware.post-upgrade
@@ -0,0 +1 @@
+soc-qcom-msm8998-nonfree-firmware.post-install
\ No newline at end of file