diff --git a/comps.xml b/comps.xml
index dc1a9dd..0e0b41c 100644
--- a/comps.xml
+++ b/comps.xml
@@ -5855,41 +5855,9 @@
     <description>An integrated, easy-to-manage server with a graphical interface.</description>
     <display_order>1</display_order>
     <grouplist>
-      <groupid>container-management</groupid>
-      <groupid>core</groupid>
-      <groupid>fonts</groupid>
-      <groupid>gnome-desktop</groupid>
-      <groupid>guest-desktop-agents</groupid>
-      <groupid>hardware-monitoring</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>headless-management</groupid>
       <groupid>internet-browser-chromium</groupid>
       <groupid>multimedia</groupid>
-      <groupid>networkmanager-submodules</groupid>
-      <groupid>print-client</groupid>
-      <groupid>server-product</groupid>
-      <groupid>standard</groupid>
     </grouplist>
-    <optionlist>
-      <groupid>debugging</groupid>
-      <groupid>dns-server</groupid>
-      <groupid>file-server</groupid>
-      <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
-      <groupid>infiniband</groupid>
-      <groupid>mail-server</groupid>
-      <groupid>network-file-system-client</groupid>
-      <groupid>network-server</groupid>
-      <groupid>performance</groupid>
-      <groupid>print-server</groupid>
-      <groupid>remote-desktop-clients</groupid>
-      <groupid>remote-system-management</groupid>
-      <groupid>smb-server</groupid>
-      <groupid>virtualization-client</groupid>
-      <groupid>virtualization-hypervisor</groupid>
-      <groupid>virtualization-tools</groupid>
-      <groupid>web-server</groupid>
-    </optionlist>
   </environment>
   <environment variant="AppStream">
     <id>graphical-server-environment</id>
@@ -5984,27 +5952,11 @@
     <description>Workstation is a user-friendly desktop system for laptops and PCs.</description>
     <display_order>4</display_order>
     <grouplist>
-      <groupid>core</groupid>
-      <groupid>fonts</groupid>
-      <groupid>gnome-desktop</groupid>
-      <groupid>guest-desktop-agents</groupid>
-      <groupid>hardware-support</groupid>
       <groupid>internet-applications</groupid>
       <groupid>internet-browser-chromium</groupid>
       <groupid>multimedia</groupid>
-      <groupid>networkmanager-submodules</groupid>
       <groupid>office-suite</groupid>
-      <groupid>print-client</groupid>
-      <groupid>standard</groupid>
-      <groupid>workstation-product</groupid>
     </grouplist>
-    <optionlist>
-      <groupid>backup-client</groupid>
-      <groupid>gnome-apps</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>remote-desktop-clients</groupid>
-      <groupid>smart-card</groupid>
-    </optionlist>
   </environment>
   <environment variant="AppStream">
     <id>workstation-product-environment</id>