diff --git a/conf.d/education.mk b/conf.d/education.mk
index a103b4f8..70062a45 100644
--- a/conf.d/education.mk
+++ b/conf.d/education.mk
@@ -51,6 +51,7 @@ distro/alt-education: distro/.installer mixin/education \
 	@$(call add,MAIN_GROUPS,education/teacher)
 	@$(call add,MAIN_GROUPS,education/kde5)
 	@$(call add,MAIN_GROUPS,education/server-apps-edu)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,KFLAVOURS,std-def)
 	@$(call add,THE_KMODULES,virtualbox)
 	@$(call add,THE_KMODULES,nvidia)
@@ -58,14 +59,16 @@ distro/alt-education: distro/.installer mixin/education \
 	@$(call add,THE_KMODULES,staging)
 	@$(call add,MAIN_KMODULES,bbswitch)
 	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
+	@$(call add,THE_PACKAGES,syslinux)
+	@$(call add,MAIN_PACKAGES,owamp-server)
+endif
 	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
 	@$(call add,THE_PACKAGES,alterator-fbi)
-	@$(call add,THE_PACKAGES,syslinux)
 	@$(call add,THE_PACKAGES,alt-rootfs-installer)
 	@$(call add,BASE_PACKAGES,os-prober)
 	@$(call add,BASE_PACKAGES,guest-account)
 	@$(call add,BASE_PACKAGES,nextcloud-client)
-	@$(call add,MAIN_PACKAGES,iperf3 owamp-server)
+	@$(call add,MAIN_PACKAGES,iperf3)
 	@$(call add,MAIN_PACKAGES,stellarium)
 	@$(call add,MAIN_PACKAGES,libreoffice-block-macros)
 	@$(call add,MAIN_PACKAGES,lmms)