diff --git a/comps-epel8-next.xml.in b/comps-epel8-next.xml.in
index 704af3db..4d2c3c63 100644
--- a/comps-epel8-next.xml.in
+++ b/comps-epel8-next.xml.in
@@ -1,6 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
+  <group>
+    <id>base-x</id>
+    <_name>base-x</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>standard</id>
+    <_name>standard</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>core</id>
+    <_name>core</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>admin-tools</id>
+    <_name>admin-tools</_name>
+    <default>false</default>
+    <uservisible>true</uservisible>
+  </group>
+  <group>
+    <id>dial-up</id>
+    <_name>dial-up</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>fonts</id>
+    <_name>fonts</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>input-methods</id>
+    <_name>input-methods</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>multimedia</id>
+    <_name>multimedia</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>networkmanager-submodules</id>
+    <_name>networkmanager-submodules</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>hardware-support</id>
+    <_name>hardware-support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>print-client</id>
+    <_name>print-client</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
+  <group>
+    <id>guest-desktop-agents</id>
+    <_name>guest-desktop-agents</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+  </group>
   <group>
     <id>critical-path-kde</id>
     <_name>Critical Path (KDE)</_name>