diff --git a/comps-epel8-next.xml.in b/comps-epel8-next.xml.in
index 4d2c3c63..428aa89e 100644
--- a/comps-epel8-next.xml.in
+++ b/comps-epel8-next.xml.in
@@ -6,18 +6,58 @@
     <_name>base-x</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">glx-utils</packagereq>
+      <packagereq type="mandatory">mesa-dri-drivers</packagereq>
+      <packagereq type="mandatory">plymouth-system-theme</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-ati</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-fbdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-intel</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-nouveau</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-qxl</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-vesa</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-vmware</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-wacom</packagereq>
+      <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
+      <packagereq type="mandatory">xorg-x11-utils</packagereq>
+      <packagereq type="mandatory">xorg-x11-xauth</packagereq>
+      <packagereq type="mandatory">xorg-x11-xinit</packagereq>
+      <packagereq type="mandatory">xorg-x11-xinit-session</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>standard</id>
     <_name>standard</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">rsyslog-gnutls</packagereq>
+      <packagereq type="mandatory">rsyslog-gssapi</packagereq>
+      <packagereq type="mandatory">rsyslog-relp</packagereq>
+      <packagereq type="default">fprintd-pam</packagereq>
+      <packagereq type="default">insights-client</packagereq>
+      <packagereq type="default">nmap-ncat</packagereq>
+      <packagereq type="default">pinfo</packagereq>
+      <packagereq type="default">plymouth</packagereq>
+      <packagereq type="default">rhc</packagereq>
+      <packagereq type="default">tcpdump</packagereq>
+      <packagereq type="default">vim-enhanced</packagereq>
+      <packagereq type="default">wget</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>core</id>
     <_name>core</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">plymouth</packagereq>
+      <packagereq type="mandatory">rsyslog</packagereq>
+      <packagereq type="default">rhc</packagereq>
+      <packagereq type="optional">initial-setup</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>admin-tools</id>
@@ -30,48 +70,139 @@
     <_name>dial-up</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">ppp</packagereq>
+      <packagereq type="default">ModemManager</packagereq>
+      <packagereq type="default">NetworkManager-adsl</packagereq>
+      <packagereq type="default">lrzsz</packagereq>
+      <packagereq type="default">minicom</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>fonts</id>
     <_name>fonts</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">abattis-cantarell-fonts</packagereq>
+      <packagereq type="default">gnu-free-mono-fonts</packagereq>
+      <packagereq type="default">gnu-free-sans-fonts</packagereq>
+      <packagereq type="default">gnu-free-serif-fonts</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>input-methods</id>
     <_name>input-methods</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">ibus-hangul</packagereq>
+      <packagereq type="default">ibus-kkc</packagereq>
+      <packagereq type="default">ibus-libpinyin</packagereq>
+      <packagereq type="default">ibus-libzhuyin</packagereq>
+      <packagereq type="default">ibus-m17n</packagereq>
+      <packagereq type="default">ibus-typing-booster</packagereq>
+      <packagereq type="optional">ibus-sayura</packagereq>
+      <packagereq type="optional">ibus-table</packagereq>
+      <packagereq type="optional">ibus-table-array30</packagereq>
+      <packagereq requires="gtk2" type="conditional">gtk2-immodule-xim</packagereq>
+      <packagereq requires="gtk3" type="conditional">gtk3-immodule-xim</packagereq>
+      <packagereq requires="gtk2" type="conditional">ibus-gtk2</packagereq>
+      <packagereq requires="gtk3" type="conditional">ibus-gtk3</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>multimedia</id>
     <_name>multimedia</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">PackageKit-gstreamer-plugin</packagereq>
+      <packagereq type="mandatory">alsa-plugins-pulseaudio</packagereq>
+      <packagereq type="mandatory">alsa-ucm</packagereq>
+      <packagereq type="mandatory">alsa-utils</packagereq>
+      <packagereq type="mandatory">gstreamer1-plugins-bad-free</packagereq>
+      <packagereq type="mandatory">gstreamer1-plugins-good</packagereq>
+      <packagereq type="mandatory">gstreamer1-plugins-ugly-free</packagereq>
+      <packagereq type="mandatory">pulseaudio</packagereq>
+      <packagereq type="mandatory">pulseaudio-module-x11</packagereq>
+      <packagereq type="mandatory">pulseaudio-utils</packagereq>
+      <packagereq type="optional">pavucontrol</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>networkmanager-submodules</id>
     <_name>networkmanager-submodules</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">dnsmasq</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>hardware-support</id>
     <_name>hardware-support</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">alsa-sof-firmware</packagereq>
+      <packagereq type="default">bolt</packagereq>
+      <packagereq type="default">iwl100-firmware</packagereq>
+      <packagereq type="default">iwl1000-firmware</packagereq>
+      <packagereq type="default">iwl105-firmware</packagereq>
+      <packagereq type="default">iwl135-firmware</packagereq>
+      <packagereq type="default">iwl2000-firmware</packagereq>
+      <packagereq type="default">iwl2030-firmware</packagereq>
+      <packagereq type="default">iwl3160-firmware</packagereq>
+      <packagereq type="default">iwl5000-firmware</packagereq>
+      <packagereq type="default">iwl5150-firmware</packagereq>
+      <packagereq type="default">iwl6000-firmware</packagereq>
+      <packagereq type="default">iwl6000g2a-firmware</packagereq>
+      <packagereq type="default">iwl6000g2b-firmware</packagereq>
+      <packagereq type="default">iwl6050-firmware</packagereq>
+      <packagereq type="default">iwl7260-firmware</packagereq>
+      <packagereq type="default">libertas-usb8388-firmware</packagereq>
+      <packagereq type="default">usb_modeswitch</packagereq>
+      <packagereq type="optional">lsscsi</packagereq>
+      <packagereq type="optional">opensc</packagereq>
+      <packagereq type="optional">openssl-pkcs11</packagereq>
+      <packagereq type="optional">pcsc-lite</packagereq>
+      <packagereq type="optional">pcsc-lite-ccid</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>print-client</id>
     <_name>print-client</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">cups</packagereq>
+      <packagereq type="mandatory">cups-pk-helper</packagereq>
+      <packagereq type="mandatory">enscript</packagereq>
+      <packagereq type="default">colord</packagereq>
+      <packagereq type="default">gutenprint</packagereq>
+      <packagereq type="default">gutenprint-cups</packagereq>
+      <packagereq type="default">gutenprint-doc</packagereq>
+      <packagereq type="default">hpijs</packagereq>
+      <packagereq type="default">paps</packagereq>
+      <packagereq type="default">pnm2ppa</packagereq>
+      <packagereq type="default">system-config-printer-udev</packagereq>
+      <packagereq type="optional">hplip</packagereq>
+      <packagereq type="optional">hplip-gui</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>guest-desktop-agents</id>
     <_name>guest-desktop-agents</_name>
     <default>false</default>
     <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">hyperv-daemons</packagereq>
+      <packagereq type="mandatory">open-vm-tools-desktop</packagereq>
+      <packagereq type="mandatory">qemu-guest-agent</packagereq>
+      <packagereq type="mandatory">spice-vdagent</packagereq>
+      <packagereq type="optional">spice-streaming-agent</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>critical-path-kde</id>
@@ -155,6 +286,7 @@
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>kaddressbook</packagereq>
       <packagereq>kamera</packagereq>
+      <packagereq>kate</packagereq>
       <packagereq>kcalc</packagereq>
       <packagereq>kcharselect</packagereq>
       <packagereq>kcolorchooser</packagereq>