diff --git a/comps.xml b/comps.xml
index 05ecb89..0e0b41c 100644
--- a/comps.xml
+++ b/comps.xml
@@ -5849,6 +5849,16 @@
       <packagereq variant="Minimal" type="mandatory">zip</packagereq>
     </packagelist>
   </group>
+  <environment variant="Extras">
+    <id>graphical-server-environment</id>
+    <name>Server with GUI</name>
+    <description>An integrated, easy-to-manage server with a graphical interface.</description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>internet-browser-chromium</groupid>
+      <groupid>multimedia</groupid>
+    </grouplist>
+  </environment>
   <environment variant="AppStream">
     <id>graphical-server-environment</id>
     <name>Server with GUI</name>
@@ -5936,6 +5946,18 @@
       <groupid>standard</groupid>
     </optionlist>
   </environment>
+  <environment variant="Extras">
+    <id>workstation-product-environment</id>
+    <name>Workstation</name>
+    <description>Workstation is a user-friendly desktop system for laptops and PCs.</description>
+    <display_order>4</display_order>
+    <grouplist>
+      <groupid>internet-applications</groupid>
+      <groupid>internet-browser-chromium</groupid>
+      <groupid>multimedia</groupid>
+      <groupid>office-suite</groupid>
+    </grouplist>
+  </environment>
   <environment variant="AppStream">
     <id>workstation-product-environment</id>
     <name>Workstation</name>