diff --git a/device/testing/device-generic-x86_64/APKBUILD b/device/testing/device-generic-x86_64/APKBUILD
index 31a604715..43e8568f3 100644
--- a/device/testing/device-generic-x86_64/APKBUILD
+++ b/device/testing/device-generic-x86_64/APKBUILD
@@ -1,8 +1,7 @@
-# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-generic-x86_64
-# note: this could also support legacy boot in the future, e.g. with syslinux!
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,7 +10,6 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf
 	postmarketos-base
-	sof-firmware
 	systemd-boot
 "
 makedepends="devicepkg-dev"
@@ -19,13 +17,16 @@ source="
 	deviceinfo
 	modules-initfs
 "
+install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-kernel-lts:kernel_lts
-	$pkgname-libva
 	$pkgname-mesa
-	$pkgname-vulkan
-	"
+"
+_pmb_recommends="
+	oem-intel
+	oem-amd
+"
 provides="device-tablet-x64uefi=$pkgver-r$pkgrel device-tablet-x86uefi=$pkgver-r$pkgrel"
 replaces="device-tablet-x64uefi device-tablet-x86uefi"
 
@@ -37,14 +38,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-libva() {
-	install_if="$pkgname=$pkgver-r$pkgrel libva"
-	provides="device-tablet-x64uefi-libva=$pkgver-r$pkgrel device-tablet-x86uefi-libva=$pkgver-r$pkgrel"
-	replaces="device-tablet-x64uefi-libva device-tablet-x86uefi-libva"
-	depends="intel-media-driver libva-intel-driver mesa-va-gallium"
-	mkdir "$subpkgdir"
-}
-
 mesa() {
 	install_if="$pkgname=$pkgver-r$pkgrel mesa-gl"
 	provides="device-tablet-x64uefi-mesa=$pkgver-r$pkgrel device-tablet-x86uefi-mesa=$pkgver-r$pkgrel"
@@ -69,14 +62,6 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-vulkan() {
-	install_if="$pkgname=$pkgver-r$pkgrel vulkan-loader"
-	provides="device-tablet-x64uefi-vulkan=$pkgver-r$pkgrel device-tablet-x86uefi-vulkan=$pkgver-r$pkgrel"
-	replaces="device-tablet-x64uefi-vulkan device-tablet-x86uefi-vulkan"
-	depends="mesa-vulkan-ati mesa-vulkan-intel mesa-vulkan-swrast"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a  deviceinfo
 d65ca12564ef032507c19359643794a14579fd1d065777f9042d40d38aad4d40d99c10aae9a3acd7799f4ad95651b6ca9d83335501d08869dc391f3050df4d1f  modules-initfs
diff --git a/device/testing/device-generic-x86_64/device-generic-x86_64.post-install b/device/testing/device-generic-x86_64/device-generic-x86_64.post-install
new file mode 100644
index 000000000..5843d0bfd
--- /dev/null
+++ b/device/testing/device-generic-x86_64/device-generic-x86_64.post-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Only display this message if none of the `oem-*` packages are installed
+if ! grep -Ex "oem-\b(\?|amd|intel)" /etc/apk/world 2>/dev/null; then
+	echo "* NOTE: This package no longer automatically installs OEM-specific drivers and firmware."
+	echo "* You will likely need to install one or both of these manually, depending on your hardware."
+	echo "* For AMD: apk add oem-amd"
+	echo "* For Intel: apk add oem-intel"
+fi
diff --git a/device/testing/device-generic-x86_64/device-generic-x86_64.post-upgrade b/device/testing/device-generic-x86_64/device-generic-x86_64.post-upgrade
new file mode 120000
index 000000000..bf06e78f9
--- /dev/null
+++ b/device/testing/device-generic-x86_64/device-generic-x86_64.post-upgrade
@@ -0,0 +1 @@
+device-generic-x86_64.post-install
\ No newline at end of file