diff --git a/device/testing/oem-amd/APKBUILD b/device/testing/oem-amd/APKBUILD
index acfce1a73..cb2f999bc 100644
--- a/device/testing/oem-amd/APKBUILD
+++ b/device/testing/oem-amd/APKBUILD
@@ -1,18 +1,21 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=oem-amd
 pkgdesc="AMD device support"
-pkgver=1.1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
 options="!check !archcheck"
+# linux-firmware-none prevents all of linux-firmware-* from being installed by
+# default
 depends="
 	alsa-ucm-conf
-	amd-ucode
+	linux-firmware-none
 "
 subpackages="
 	$pkgname-libva
+	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-vulkan
 	"
 source="
@@ -43,6 +46,17 @@ vulkan() {
 
 	mkdir "$subpkgdir"
 }
+
+nonfree_firmware() {
+	pkgdesc="Firmware for AMD devices"
+	depends="
+		amd-ucode
+		linux-firmware-amdgpu
+	"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
 f56b5293f88727bb4fcceb2a347527402dd0938e96403461b1e2a6821cc00a4e680f58770addd7ba1ded20a187f91ccfd6270bc8bd28c6eae75cc075952361ca  00-oem-amd.modules