diff --git a/conf.d/regular.mk b/conf.d/regular.mk
index 2722d448..92a8fd71 100644
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -4,8 +4,7 @@ ifeq (distro,$(IMAGE_CLASS))
 # WM base target
 distro/.regular-base: distro/.base +live +wireless use/live/ru \
 	use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
-	use/firmware/wireless use/efi/signed use/luks \
-	+vmguest use/memtest use/branding
+	use/efi/signed use/luks +vmguest use/memtest use/branding
 	@$(call add,LIVE_LISTS,$(call tags,base regular))
 	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
 	@$(call add,THE_BRANDING,indexhtml notes alterator)
diff --git a/conf.d/server.mk b/conf.d/server.mk
index 7c90f3fd..83fd0dc6 100644
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -14,10 +14,10 @@ distro/server-mini: distro/.server-base use/server/mini \
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
 
 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
-	use/firmware/server use/firmware/wireless use/power/acpi/button
+	use/firmware/server use/power/acpi/button +wireless
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
-	@$(call add,BASE_KMODULES,rtl8168 rtl8192)
+	@$(call add,BASE_KMODULES,rtl8168)
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)
diff --git a/features.in/rescue/config.mk b/features.in/rescue/config.mk
index 598b1c39..f83485bc 100644
--- a/features.in/rescue/config.mk
+++ b/features.in/rescue/config.mk
@@ -1,5 +1,5 @@
 use/rescue: use/stage2 sub/stage2@rescue use/syslinux/sdab.cfg \
-	use/firmware/server use/firmware/wireless
+	use/firmware/server +wireless
 	@$(call add_feature)
 	@$(call add,RESCUE_LISTS, openssh \
 		$(call tags,(base || extra) && (rescue || network)))
diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk
index 237480bb..bec3cbc6 100644
--- a/features.in/slinux/config.mk
+++ b/features.in/slinux/config.mk
@@ -15,7 +15,6 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add,THE_LISTS,$(call tags,base l10n))
 	@$(call set,META_VOL_SET,Simply Linux)
 
-use/slinux/full: use/isohybrid use/slinux use/systemd \
-	use/firmware/wireless use/branding/complete \
-	use/x11/drm use/x11/3d-proprietary
+use/slinux/full: use/isohybrid use/slinux use/systemd +wireless \
+	use/branding/complete use/x11/drm use/x11/3d-proprietary
 	@$(call add,THE_PACKAGES,apt-conf-sisyphus)
diff --git a/features.in/wireless/config.mk b/features.in/wireless/config.mk
index 2129bbcb..8fda0fde 100644
--- a/features.in/wireless/config.mk
+++ b/features.in/wireless/config.mk
@@ -1,6 +1,8 @@
-+wireless: use/wireless; @:
++wireless: use/wireless/full; @:
 
 use/wireless:
 	@$(call add_feature)
-	@$(call add,THE_KMODULES,bcmwl rt3070 staging)
+	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 staging)
 	@$(call add,THE_PACKAGES,wireless-tools rfkill crda iw)
+
+use/wireless/full: use/wireless use/firmware/wireless; @: