--- /dev/null
+++ b/conf.d/kworkstation.mk
+mixin/kworkstation-common-opts:
+	@$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*')
+
+mixin/kworkstation-install-opts:
+	@$(call add,STAGE2_KMODULES,drm-nouveau)
--- a/features.in/plymouth/config.mk
+++ b/features.in/plymouth/config.mk
@@ -41,7 +41,7 @@ ifeq (distro,$(IMAGE_CLASS))
 	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
 endif
 	@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)
-	@$(call add,BASE_KMODULES_REGEXP,drm.*)
+	@$(call add,BASE_KMODULES,drm drm-radeon)
 	@$(call add,THE_BRANDING,bootsplash)
 	@$(call add,THE_PACKAGES,make-initrd-plymouth)
 
--- a/features.in/stage2/config.mk
+++ b/features.in/stage2/config.mk
@@ -22,7 +22,7 @@ endif
 	@:
 
 use/stage2/kms: use/stage2/drm
-	@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
+	@$(call add,STAGE1_KMODULES,drm drm-radeon)
 
 # install mount.cifs to stage1
 # NB: there's builtin nfsmount there, no reason for nfs-utils
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -16,7 +16,7 @@ use/x11/xorg:: use/x11 use/x11/armsoc; @:
 
 # x86: free drivers for various hardware (might lack acceleration)
 ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
-use/x11/xorg:: use/x11/intel use/x11/nouveau use/x11/radeon use/x11/amdgpu \
+use/x11/xorg:: use/x11/intel use/x11/radeon use/x11/amdgpu \
 	use/x11/armsoc
 	@$(call add,THE_LISTS,$(call tags,desktop xorg))
 endif