diff --git a/device/testing/device-oneplus-enchilada/APKBUILD b/device/testing/device-oneplus-enchilada/APKBUILD
index bf3cd21f6..c2d9eadf6 100644
--- a/device/testing/device-oneplus-enchilada/APKBUILD
+++ b/device/testing/device-oneplus-enchilada/APKBUILD
@@ -9,9 +9,10 @@ url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-oneplus-sdm845 mkbootimg mesa-dri-gallium"
+depends="postmarketos-base mkbootimg linux-oneplus-sdm845 soc-qcom-sdm845"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -21,4 +22,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Modem, WiFi and GPU Firmware"
+	depends="firmware-oneplus-sdm845"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="98b7861dc862b740df65ea2abb0301c9cb0c0cd8b9324acfb095b3c6dd8d75f927a71cb90f1df85000386c4cc5f63b14e0ff361134ee141707d158f7c218cc3b  deviceinfo"
diff --git a/device/testing/device-oneplus-fajita/APKBUILD b/device/testing/device-oneplus-fajita/APKBUILD
index db830d00e..53604db57 100644
--- a/device/testing/device-oneplus-fajita/APKBUILD
+++ b/device/testing/device-oneplus-fajita/APKBUILD
@@ -2,16 +2,17 @@
 # Maintainer: Caleb Connolly <caleb@connolly.tech>
 
 pkgname=device-oneplus-fajita
-pkgdesc="OnePlus 6"
+pkgdesc="OnePlus 6T"
 pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-oneplus-sdm845 mkbootimg mesa-dri-gallium"
+depends="postmarketos-base mkbootimg linux-oneplus-sdm845 soc-qcom-sdm845"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -21,4 +22,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="5698c115b427f490ef5c7248f965d6dd9b0bbf833b8e293d5e78f764a96ef21da028b3619f2f2a53dba1a21daaf70e263e6e06c3ed871b3f02ebb81bb14afce8  deviceinfo"
+nonfree_firmware() {
+	pkgdesc="Modem, WiFi and GPU Firmware"
+	depends="firmware-oneplus-sdm845"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="25bf602f9cb312580f6556fcbfcf4bf90bbcf96fae542054edfddf646cc6bc6031e424327723cb8fc2062966c259062e19f1d15086e3443caf93a22690730044  deviceinfo"
diff --git a/device/testing/device-oneplus-fajita/deviceinfo b/device/testing/device-oneplus-fajita/deviceinfo
index b79522812..ec1dda002 100644
--- a/device/testing/device-oneplus-fajita/deviceinfo
+++ b/device/testing/device-oneplus-fajita/deviceinfo
@@ -31,7 +31,7 @@ deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
 # Kernel options
-deviceinfo_dtb="qcom/sdm845-oneplus-enchilada"
+deviceinfo_dtb="qcom/sdm845-oneplus-fajita"
 deviceinfo_append_dtb="true"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)