diff --git a/pkg.in/lists/education/base b/pkg.in/lists/education/base
index 96278532..bc9927fb 100644
--- a/pkg.in/lists/education/base
+++ b/pkg.in/lists/education/base
@@ -1,163 +1,4 @@
-# Education (base part)
-audacity
-blender
-bluefish
-clamav
-clamav-db
-clamtk
-codeblocks
-codeblocks-contrib
-dia
-dosbox
-fbreader
-goldendict@!E2K
-dict-mueller7-utf8
-freebasic@X86
-gcc
-inkscape
-gimp
-gimp-help-ru
-gimp-plugin-gutenprint
-gimp-plugin-refocus-it
-java-1.8.0-openjdk-devel
-kdenlive
-scribus
-shotwell@!E2K
-logisim
-basic256
-
-fpc@X86
-fpc-ide@X86
-geany
-geany-plugins
-freeplane@!E2K
-freemind@E2K
-gnome-games-klotski
-gnome-games-mahjongg
-gnome-games-aisleriot@!E2K
-xsane
-xsane-gimp2
-simple-scan
-brasero
-imagination
-connector
-
-chromium@!E2K
-chromium-disable-webfonts@!E2K
-fonts-otf-mozilla-fira
-
-ppapi-plugin-adobe-flash@X86
-italc3-client@X86
-italc3-client@E2K
-itest
-kumir2
-
-# Big educational software
-octave
-wxMaxima
-lazarus@X86
-gambas-full@X86
-
-# OCR
-gimagereader-qt5
-tesseract
-tesseract-langpack-ru
-tesseract-langpack-en
-
-# KDE5 localization and profile
-kde5-profile
-qt5-translations
-kde5-khelpcenter@!E2K
-
-# Content filter and antivirus
-netpolice-filter
-netpolice-main
-# For Skydns
-ddclient@!E2K
-perl-IO-Socket-SSL
-
-# New utilites
-autossh
-inxi
-screenfetch
-ntpdate
-fdisk
-debhelper
-keyutils
-krb5-kinit
-
-# Installer features
-installer-feature-xdg-user-dirs
-xdg-user-dirs-gtk
-installer-feature-auto-domain
-installer-feature-online-repo
-installer-feature-repo-add@!E2K
-installer-feature-resolver-bind-stage3
-openresolv-bind
-
-# GUI utilities
-gparted
-rosa-imagewriter
-grub-customizer@!E2K
-
-# Additional filesystem support
-fuse-exfat
-
-# Electronic board support
-starboard-preinstall@X86
-
-# Authenticate with Active Directory and FreeIPA by SSSD
-task-auth-ad-sssd
-task-auth-freeipa
-sssd-ldap
-pam_pkcs11
-gvfs-shares
-shared-desktop-icons
-
-# Mass management and remote assistance
-puppet@!E2K
-x11spice@x86_64
-x11spice@aarch64
-openssh-server
-python-module-yaml
-python-module-jinja2
-python-modules-json
-
-# LibreOffice
-LibreOffice-still-extensions@!E2K
-LibreOffice-still-integrated@!E2K
-LibreOffice-still-gtk3@!E2K
-LibreOffice-still-langpack-ru@!E2K
-libreoffice-languagetool
-LibreOffice-extensions@E2K
-LibreOffice-integrated@E2K
-LibreOffice-gtk3@E2K
-LibreOffice-langpack-ru@E2K
-mythes-ru
-hyphen-ru
-gst-plugins-bad
-gst-plugins-ugly
-pentaho-reporting-flow-engine
-perl-DBD-mysql
-postgresql-jdbc
-mysql-connector-java
-
-# Firmware
-^firmware-ipw[[:digit:]]+
-^firmware-zd[[:digit:]]+
-^xorg-extension-[[:alpha:]]+$
-firmware-p54
-
-# Alterator modules
-alterator-notes
-alterator-groups
-alterator-logs
-alterator-net-general
-alterator-net-openvpn
-alterator-net-wifi
-alterator-postinstall
-alterator-sslkey
-alterator-updates
+task-edu
 
 # WINE
 glibc-gconv-modules@i586
@@ -173,82 +14,3 @@ libnss-fallback
 wine-gecko@X86
 wine-mono@X86
 winetricks@X86
-
-# Communication
-pidgin
-pidgin-libnotify
-
-# Other stuff
-htop
-apt-rsync
-avplay
-bumblebee@X86
-cabextract
-cheese
-libsqlite
-lm_sensors3-utils
-man-pages-ru
-mc-full
-media-player-info
-nano
-quick-usb-formatter
-rpm-build
-sane
-sane-frontends
-setbranding
-system-report
-udev-rule-generator-cdrom
-virtualbox-guest-utils@X86
-xorg-dri-intel@X86
-xorg-drv-radeon
-xorg-drv-synaptics
-xorg-conf-synaptics
-zbar
-audit
-vixie-cron
-
-# New stuff
-xfce4-whiskermenu-plugin
-menulibre
-mugshot
-xfce-polkit
-
-# New utilites
-disable-usb-autosuspend
-color-prompt-and-man
-shutter
-screenkey
-
-# Virtualization support
-xorg-drv-vmware@X86
-xorg-drv-vmmouse@X86
-
-# Mozilla
-thunderbird
-thunderbird-ru
-
-# Search
-recoll-full
-
-# Append all modules from xscreensaver
-desktop-screensaver-modules-xscreensaver
-desktop-screensaver-modules-xscreensaver-gl
-
-# Use first user in first time of lightdm run
-installer-feature-lightdm-stage3
-
-systemd-settings-enable-showstatus
-systemd-settings-disable-dumpcore
-systemd-settings-enable-log-to-tty12
-
-# Helper to deploy system services
-deploy
-
-# Network
-ipset
-vlan-utils
-
-alterator-gpupdate
-adp
-
-rtc@E2K
diff --git a/pkg.in/lists/education/gradeschool b/pkg.in/lists/education/gradeschool
index 075530ae..68bc6479 100644
--- a/pkg.in/lists/education/gradeschool
+++ b/pkg.in/lists/education/gradeschool
@@ -1,21 +1 @@
-scratch-desktop@!E2K
-scratch@E2K
-kde5-profile
-kde5-kolourpaint
-kde5-ktouch
-gcompris-qt
-gcompris-qt-voices-ru
-trikStudio
-trikStudio-data
-kde5-kbruch
-abiword
-python3-tools
-python3-module-pygame
-python3-module-pygame-doc
-python3-modules-curses
-python3-modules-nis
-afce
-# KDE5 localization and profile
-kde5-profile
-qt5-translations
-kde5-khelpcenter@!E2K
+task-edu-gradeschool
diff --git a/pkg.in/lists/education/highschool b/pkg.in/lists/education/highschool
index cf12dc83..0357bb17 100644
--- a/pkg.in/lists/education/highschool
+++ b/pkg.in/lists/education/highschool
@@ -1,26 +1 @@
-kumir2
-scratch-desktop@!E2K
-scratch@E2K
-lazarus@X86
-codeblocks
-geany
-geany-plugins
-geany-themes
-kde5-profile
-kde5-kolourpaint
-synfigstudio@X86
-synfigstudio@E2K
-openscad@X86
-freecad@!E2K
-dia
-qcad@!E2K
-trikStudio
-kde5-marble
-wxMaxima
-scilab@X86
-bluefish
-afce
-# KDE5 localization and profile
-kde5-profile
-qt5-translations
-kde5-khelpcenter@!E2K
+task-edu-highschool
diff --git a/pkg.in/lists/education/kde5 b/pkg.in/lists/education/kde5
index 2415950a..2fd147b7 100644
--- a/pkg.in/lists/education/kde5
+++ b/pkg.in/lists/education/kde5
@@ -1,15 +1 @@
-LibreOffice-still-kde5
-nextcloud-client-kde5
-
-kde5
-kf5-plasma-workspace
-kde5-network-manager-nm
-libqimageblitz5
-
-kde5-krfb
-kde5-edu
-kde5-printing
-kde5-scanning
-kde5-connect
-
-branding-alt-education-kde-settings
+task-edu-kde5@!E2K
diff --git a/pkg.in/lists/education/preschool b/pkg.in/lists/education/preschool
index de02b42d..569f6501 100644
--- a/pkg.in/lists/education/preschool
+++ b/pkg.in/lists/education/preschool
@@ -1,11 +1 @@
-gcompris-qt
-gcompris-qt-voices-ru
-childsplay
-childsplay-alphabet_sounds_ru
-tuxpaint
-kde5-khangman
-kde5-kanagram
-# KDE5 localization and profile
-kde5-profile
-qt5-translations
-kde5-khelpcenter@!E2K
+task-edu-preschool
diff --git a/pkg.in/lists/education/secondary_vocational b/pkg.in/lists/education/secondary_vocational
index 3383330d..9d2cccf8 100644
--- a/pkg.in/lists/education/secondary_vocational
+++ b/pkg.in/lists/education/secondary_vocational
@@ -1,22 +1 @@
-codeblocks
-lazarus@X86
-freecad@!E2K
-qcad@!E2K
-wxMaxima
-octave
-qt-creator
-qt-creator-doc
-cmake
-ninja-build
-qt5-base-devel
-qt5-base-doc
-# Eclipse
-# Texmacs
-logisim
-fritzing
-projectlibre
-python3-tools
-python3-module-pygame
-python3-module-pygame-doc
-python3-modules-curses
-python3-modules-nis
+task-edu-secondary-vocational
diff --git a/pkg.in/lists/education/server-apps-edu b/pkg.in/lists/education/server-apps-edu
index c2b338f9..6c93fbec 100644
--- a/pkg.in/lists/education/server-apps-edu
+++ b/pkg.in/lists/education/server-apps-edu
@@ -1,100 +1 @@
-# mediawiki moodle nextcloud are used from appropriate lists
-puppetserver@!E2K
-puppetdb@!E2K
-
-semaphore@!E2K
-ansible
-
-clamav
-clamav-db
-
-mariadb-server
-mariadb-client
-
-#@I586_ONLY@haspd
-#@X86_64_ONLY@i586-haspd
-
-# Utilities
-nano
-lsb@X86
-apt-rsync
-apt-repo
-installer-feature-online-repo
-installer-feature-repo-add@!E2K
-setbranding
-htop
-bash-completion
-
-dansguardian
-perl-DBD-mysql
-#ejudge
-openfire
-
-# Alterator modules
-alterator-datetime
-alterator-console
-
-# deployment
-alterator-postinstall
-
-# ===== Services =====
-apache2-httpd-worker
-mariadb-server
-
-installed-db-office-server-mediawiki
-installed-db-office-server-nextcloud
-installed-db-office-server-moodle
-
-# ===== Base services =====
-
-alterator-fbi
-
-#alterator-bacula
-alterator-ca
-alterator-ddns
-installer-feature-resolver-bind-stage3
-alterator-dhcp
-alterator-firsttime
-alterator-kdc
-alterator-ldap-groups
-alterator-ldap-users
-alterator-mirror
-
-alterator-net-domain
-alt-domain-server
-
-alterator-net-eth
-alterator-net-pppoe
-alterator-net-pptp
-alterator-netinst@X86
-alterator-net-openvpn
-alterator-net-routing
-alterator-openldap
-samba4
-alterator-openvpn-server
-alterator-squid
-alterator-squidmill
-alterator-quota
-alterator-trust
-anonftp
-alterator-vsftpd
-alterator-xinetd
-alterator-postfix-dovecot
-alterator-ulogd
-
-xauth
-#===========================
-installer-feature-apache2-indexhtml-stage3
-installer-feature-apache2-userdir-stage3
-installer-feature-network-shares-client-stage3
-installer-feature-nfs-client-stage3
-installer-feature-nfs-server-stage3
-installer-feature-pxeboot-stage3@X86
-installer-feature-shm-defaults-stage3
-installer-feature-start-avahi
-
-xrdp
-
-docker-ce@X86
-
-tcpdump
+task-edu-server-apps
diff --git a/pkg.in/lists/education/teacher b/pkg.in/lists/education/teacher
index 732d544b..50f5b693 100644
--- a/pkg.in/lists/education/teacher
+++ b/pkg.in/lists/education/teacher
@@ -1,12 +1 @@
-italc3-master@X86
-italc3-master@E2K
-#nxclient
-itest-server
-installer-feature-init-italc@X86
-installer-feature-init-italc@E2K
-# Mass management
-ansible
-semaphore@!E2K
-virt-viewer
-
-OpenBoard
+task-edu-teacher
diff --git a/pkg.in/lists/education/university b/pkg.in/lists/education/university
index b50c2184..6308f324 100644
--- a/pkg.in/lists/education/university
+++ b/pkg.in/lists/education/university
@@ -1,30 +1 @@
-codeblocks
-lazarus@X86
-qt-creator
-qt-creator-doc
-cmake
-ninja-build
-qt5-base-devel
-qt5-base-doc
-# Eclipse
-gambas-full@X86
-swi-prolog
-monodevelop@X86
-# Texmacs
-wxMaxima
-octave
-freecad@!E2K
-qcad@!E2K
-openscad@X86
-openscad@aarch64
-projectlibre
-qgis@!E2K
-qgis-grass@!E2K
-qgis-python@!E2K
-openmpi
-fritzing
-python3-tools
-python3-module-pygame
-python3-module-pygame-doc
-python3-modules-curses
-python3-modules-nis
+task-edu-university
diff --git a/pkg.in/lists/education/video-conferencing b/pkg.in/lists/education/video-conferencing
index d4c3ad5a..72ee256e 100644
--- a/pkg.in/lists/education/video-conferencing
+++ b/pkg.in/lists/education/video-conferencing
@@ -1,7 +1 @@
-prosody
-jitsi-meet-doc
-jitsi-meet-prosody
-jitsi-meet-web
-jitsi-meet-web-config
-jicofo@x86_64
-jitsi-videobridge
+task-edu-video-conferencing@!E2K