diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk
index 8ead6873..4684b9fa 100644
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -41,7 +41,7 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
 mixin/regular-x11: use/luks use/volumes/regular \
 	use/browser/firefox \
 	use/branding use/ntp/chrony use/services/lvm2-disable
-	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))
+	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular && !extra))
 	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
 	@$(call add,THE_PACKAGES,btrfs-progs)
 	@$(call add,THE_PACKAGES,gpm)
diff --git a/conf.d/regular.mk b/conf.d/regular.mk
index 90a50e9a..bc39bae6 100644
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -21,6 +21,7 @@ distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
 	use/live/suspend use/browser/firefox/live \
 	use/syslinux/ui/gfxboot use/grub/ui/gfxboot
 	@$(call add,THE_BRANDING,bootloader)
+	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))
 	@$(call add,LIVE_LISTS,$(call tags,base rescue))
 	@$(call add,LIVE_PACKAGES,gpm)
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)