diff --git a/conf.d/server.mk b/conf.d/server.mk
index adbbfd88..9f8a30e7 100644
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -11,7 +11,7 @@ distro/server-mini: distro/server-base use/cleanup/x11-alterator
 	@$(call add,STAGE1_KMODULES,e1000e igb)
 	@$(call add,BASE_LISTS,\
 		$(call tags,base && (server || network || security || pkg)))
-	@$(call add,BASE_LISTS,$(call tags,extra network))
+	@$(call add,BASE_LISTS,$(call tags,extra (server || network)))
 
 distro/server-systemd: distro/server-mini use/systemd
 
diff --git a/pkg.in/lists/tagged/base+server+disk b/pkg.in/lists/tagged/server+extra
similarity index 100%
rename from pkg.in/lists/tagged/base+server+disk
rename to pkg.in/lists/tagged/server+extra