diff --git a/conf.d/alt-server.mk b/conf.d/alt-server.mk
index ba05ccf0..6bd4c9f3 100644
--- a/conf.d/alt-server.mk
+++ b/conf.d/alt-server.mk
@@ -1,22 +1,20 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-
 distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\
         emulators freenx-server \
-	ipmi netinst sogo)
-
-distro/alt-server: monitoring = $(addprefix server-v/, 90-monitoring \
-	zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
+	ipmi netinst sogo 80-desktop mate office pidgin vlc xorg)
 
 ifeq (,$(filter-out x86_64,$(ARCH)))
 distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\
        ganeti freeipa-server v12n-server)
+distro/alt-server: use/efi/refind use/memtest +efi
+endif
 endif
 
 # FIXME: generalize vm-profile
-distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \
-	use/efi/refind use/memtest use/bootloader/grub use/rescue/base \
+distro/alt-server: distro/.base mixin/alt-server +vmguest \
+	use/bootloader/grub use/rescue/base \
 	use/docs/license
 	@$(call add,MAIN_GROUPS,$(server_groups_x86))
 	@$(call add,MAIN_GROUPS,$(server_groups_x86_64))
@@ -28,8 +26,8 @@ distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \
 	@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
 	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
 	@$(call add,EFI_BOOTARGS,lang=ru_RU)
-
-endif
+distro/alt-server: monitoring = $(addprefix server-v/, 90-monitoring \
+	zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
 
 ifeq (,$(filter-out e2k%,$(ARCH)))
 
diff --git a/conf.d/mixin-alt-server.mk b/conf.d/mixin-alt-server.mk
index b7494a69..9ada6706 100644
--- a/conf.d/mixin-alt-server.mk
+++ b/conf.d/mixin-alt-server.mk
@@ -1,5 +1,5 @@
 mixin/alt-server: server_groups = $(addprefix centaurus/,\
-	10-alterator 20-server-apps  50-freeipa 70-dev 80-desktop 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mate mediawiki office owncloud pidgin vlc xorg domain-server freeipa-client)
+	10-alterator 20-server-apps  50-freeipa 70-dev 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mediawiki owncloud domain-server freeipa-client)
 
 mixin/alt-server: +installer +systemd \
 	use/branding/complete use/control use/services \
@@ -28,7 +28,9 @@ mixin/alt-server: +installer +systemd \
 	@$(call add,MAIN_LISTS,centaurus/disk)
 	@$(call add,THE_PROFILES,centaurus/10-server)
 	@$(call add,THE_PROFILES,centaurus/20-serverDC)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,THE_PROFILES,centaurus/30-desktop)
+endif
 	@$(call add,THE_PROFILES,minimal)
 	@$(call add,STAGE1_MODLISTS,stage2-mmc)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
@@ -42,7 +44,7 @@ mixin/alt-server: +installer +systemd \
 	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
 	@$(call add,COMMON_PACKAGES,vim-console)
 	@$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind)
+	@$(call set,META_VOL_ID,ALT Server 8.95 $(ARCH))
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_VOL_SET,ALT)
-	@$(call set,META_VOL_ID,ALT Server 9.0 $(ARCH))
-	@$(call set,META_APP_ID,ALT Server 9.0 $(ARCH) $(shell date +%F))
+	@$(call set,META_APP_ID,ALT Server 9.0.0 $(ARCH) $(shell date +%F))
diff --git a/pkg.in/lists/centaurus/disk-dvd b/pkg.in/lists/centaurus/disk-dvd
index be35e617..fbb34b72 100644
--- a/pkg.in/lists/centaurus/disk-dvd
+++ b/pkg.in/lists/centaurus/disk-dvd
@@ -65,7 +65,7 @@ screen
 perl-Crypt-Rijndael
 
 #needed for crypto
-lsb
+#lsb
 python-module-Crypto
 
 postgresql-jdbc
diff --git a/pkg.in/lists/centaurus/disk-server-light b/pkg.in/lists/centaurus/disk-server-light
index ad931041..27138a91 100644
--- a/pkg.in/lists/centaurus/disk-server-light
+++ b/pkg.in/lists/centaurus/disk-server-light
@@ -27,7 +27,7 @@ gear
 hasher
 help2man
 indent
-john
+john@X86
 ltrace
 patchutils
 srpmcmp
@@ -65,7 +65,7 @@ mar
 mkisofs
 propagator
 squashfsprogs
-syslinux
+syslinux@X86
 
 # kernel
 kernel-build-tools
@@ -78,7 +78,7 @@ acct
 adjtimex
 apt-scripts
 autossh
-cpuburn
+cpuburn@X86
 fhs
 mtree
 vlock
@@ -149,7 +149,7 @@ rrd-perl rrd-tcl rrd-utils
 #heartbeat
 
 # force@
-bonnie
+bonnie@X86
 bridge-utils
 ccze
 ddrescue
@@ -164,9 +164,8 @@ iptstate
 #spamassassin
 lshw
 lsof
-make-initrd-ucode
-iucode_tool
-firmware-intel-ucode
+make-initrd-ucode@X86
+firmware-intel-ucode@X86
 #mod_geoip
 p0f
 star