diff --git a/comps.xml b/comps.xml
index abd80de..0c4fbc0 100644
--- a/comps.xml
+++ b/comps.xml
@@ -36371,13 +36371,91 @@
     <display_order>1</display_order>
     <grouplist>
       <groupid>internet-browser-chromium</groupid>
-      <groupid>multimedia</groupid>
     </grouplist>
     <optionlist>
       <groupid>internet-browser-firefox</groupid>
     </optionlist>
   </environment>
   <environment variant="AppStream">
+    <id>graphical-server-environment</id>
+    <name>Server with GUI</name>
+    <name xml:lang="as">GUI ৰ সৈতে চাৰ্ভাৰ</name>
+    <name xml:lang="cs">Server s grafickým uživatelským rozhraním</name>
+    <name xml:lang="de">Server mit GUI</name>
+    <name xml:lang="de_CH">Server mit GUI</name>
+    <name xml:lang="es">Servidor con GUI</name>
+    <name xml:lang="fr">Serveur avec GUI</name>
+    <name xml:lang="gu">GUI વાળું સર્વર</name>
+    <name xml:lang="hi">GUI सहित सर्वर</name>
+    <name xml:lang="it">Server con GUI</name>
+    <name xml:lang="ja">サーバー (GUI 使用)</name>
+    <name xml:lang="kn">GUI ಅನ್ನು ಹೊಂದಿರುವ ಪೂರೈಕೆಗಣಕ</name>
+    <name xml:lang="ko">서버 - GUI 사용</name>
+    <name xml:lang="ml">ജിയുഐയുള്ള സര്‍വര്‍</name>
+    <name xml:lang="mr">GUI सह सर्व्हर</name>
+    <name xml:lang="or">GUI ସହିତ ସର୍ଭର</name>
+    <name xml:lang="pa">GUI ਨਾਲ ਸਰਵਰ</name>
+    <name xml:lang="pl">Serwer z graficznym interfejsem użytkownika</name>
+    <name xml:lang="pt">Servidor com GUI</name>
+    <name xml:lang="pt_BR">Servidor com GUI</name>
+    <name xml:lang="ru">Сервер с графическим интерфейсом</name>
+    <name xml:lang="ta">GUI கொண்டுள்ள சேவையகம்</name>
+    <name xml:lang="te">GUI తో సేవిక</name>
+    <name xml:lang="uk">Сервер з графічним інтерфейсом</name>
+    <name xml:lang="zh">含有 GUI 的伺服器</name>
+    <name xml:lang="zh_CN">带 GUI 的服务器</name>
+    <name xml:lang="zh_TW">含有 GUI 的伺服器</name>
+    <description>An integrated, easy-to-manage server with a graphical interface.</description>
+    <description xml:lang="de">Ein integrierter, einfach zu verwaltender Server mit grafischer Benutzeroberfläche.</description>
+    <description xml:lang="es">Un servidor integrado y fácil de administrar con una interfaz gráfica.</description>
+    <description xml:lang="fr">Un serveur intégré, facile à gérer, avec une interface graphique.</description>
+    <description xml:lang="it">Un server integrato e facile da gestire con un'interfaccia grafica.</description>
+    <description xml:lang="ja">統合された、管理が容易なサーバー (グラフィカルインターフェイスあり) です。</description>
+    <description xml:lang="ko">그래픽 인터페이스로 통합되고 관리가 쉬운 서버.</description>
+    <description xml:lang="pt">Um servidor integrado e fácil de gerenciar com uma interface gráfica.</description>
+    <description xml:lang="pt_BR">Um servidor integrado e fácil de gerenciar com uma interface gráfica.</description>
+    <description xml:lang="ru">Интегрированный, простой в управлении сервер с графическим интерфейсом.</description>
+    <description xml:lang="zh_CN">集成的易于管理的带有图形界面的服务器。</description>
+    <description xml:lang="zh_TW">集成，易於管理的服務器，帶有圖形界面。</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>networkmanager-submodules</groupid>
+      <groupid>print-client</groupid>
+      <groupid>server-product</groupid>
+      <groupid>standard</groupid>
+      <groupid>sphere-core-server</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="Server">
     <id>graphical-server-environment</id>
     <name>Server with GUI</name>
     <name xml:lang="as">GUI ৰ সৈতে চাৰ্ভাৰ</name>
@@ -36443,6 +36521,7 @@
       <groupid>ftp-server</groupid>
       <groupid>guest-agents</groupid>
       <groupid>infiniband</groupid>
+      <groupid>internet-browser-firefox</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>network-server</groupid>
@@ -36841,6 +36920,78 @@
       <groupid>virtualization-platform</groupid>
     </optionlist>
   </environment>
+  <environment variant="Server">
+    <id>virtualization-host-environment</id>
+    <name>Virtualization Host</name>
+    <name xml:lang="as">ভাৰছুৱেলাইজেষণ হস্ট</name>
+    <name xml:lang="cs">Virtualizační hostitel</name>
+    <name xml:lang="de">Virtualisierungs-Host</name>
+    <name xml:lang="de_CH">Virtualisierungs-Host</name>
+    <name xml:lang="es">Host de virtualización</name>
+    <name xml:lang="fr">Hôte de virtualisation</name>
+    <name xml:lang="gu">વર્ચ્યુઅલાઇઝેશન યજમાન</name>
+    <name xml:lang="hi">वर्चुअलाइजेशन मेजबान</name>
+    <name xml:lang="it">Host di virtualizzazione</name>
+    <name xml:lang="ja">仮想化ホスト</name>
+    <name xml:lang="kn">ವರ್ಚುಲೈಸೇಶನ್ ಆತಿಥೇಯಗಣಕ</name>
+    <name xml:lang="ko">가상화 호스트</name>
+    <name xml:lang="ml">വിര്‍ച്ച്വലൈസേഷന്‍ ഹോസ്റ്റ്</name>
+    <name xml:lang="mr">वर्च्युअलाइजेशन यजमान</name>
+    <name xml:lang="or">ଆଭାସୀକରଣ ହୋଷ୍ଟ</name>
+    <name xml:lang="pa">ਆਭਾਸੀਕਰਣ ਮੇਜਬਾਨ</name>
+    <name xml:lang="pl">Gospodarz wirtualizacji</name>
+    <name xml:lang="pt">Máquina de Virtualização</name>
+    <name xml:lang="pt_BR">Máquina de Virtualização</name>
+    <name xml:lang="ru">Сервер виртуализации</name>
+    <name xml:lang="ta">மெய்நிகராக்க வழங்கி</name>
+    <name xml:lang="te">వర్చ్యులైజేషన్ అతిధేయి</name>
+    <name xml:lang="uk">Основна система віртуалізації</name>
+    <name xml:lang="zh">虛擬主機</name>
+    <name xml:lang="zh_CN">虚拟化主机</name>
+    <name xml:lang="zh_TW">虛擬主機</name>
+    <description>Minimal virtualization host.</description>
+    <description xml:lang="as">নূন্যতম ভাৰছুৱেলাইজেষণ হস্ট।</description>
+    <description xml:lang="cs">Minimální virtualizační hostitel</description>
+    <description xml:lang="de">Minimaler Virtualisierungs-Host.</description>
+    <description xml:lang="de_CH">Minimaler Virtualisierungs-Host.</description>
+    <description xml:lang="es">Host de virtualización mínima.</description>
+    <description xml:lang="fr">Hôte de virtualisation minimal.</description>
+    <description xml:lang="gu">ન્યૂનતમ વર્ચ્યુઅલાઇઝેશન યજમાન.</description>
+    <description xml:lang="hi">न्यूनतम आभासीकरण मेजबान.</description>
+    <description xml:lang="it">Host di virtualizzazione minima.</description>
+    <description xml:lang="ja">最小の仮想化ホストです。</description>
+    <description xml:lang="kn">ಕನಿಷ್ಟ ವರ್ಚುಲೈಸೇಶನ್ ಆತಿಥೇಯಗಣಕ.</description>
+    <description xml:lang="ko">최소 가상화 호스트입니다.</description>
+    <description xml:lang="ml">ഏറ്റവും കുറഞ്ഞ വിര്‍ച്ച്വലൈസേഷന്‍ ഹോസ്റ്റ്.</description>
+    <description xml:lang="mr">किमान वर्च्युअलाइजेशन यजमान.</description>
+    <description xml:lang="or">ସର୍ବନିମ୍ନ ଆଭାସୀକରଣ ହୋଷ୍ଟ।</description>
+    <description xml:lang="pa">ਘੱਟੋ-ਘੱਟ ਆਭਾਸੀਕਰਣ ਮੇਜਬਾਨ।</description>
+    <description xml:lang="pl">Minimalny gospodarz wirtualizacji.</description>
+    <description xml:lang="pt">Host de virtualização mínimo.</description>
+    <description xml:lang="pt_BR">Host de virtualização mínimo.</description>
+    <description xml:lang="ru">Минимальный комплект сервера виртуализации.</description>
+    <description xml:lang="ta">குறைந்தபட்ச மெய்நிகராக்க வழங்கி.</description>
+    <description xml:lang="te">కనీసపు వర్చ్యువల్ అతిధేయి.</description>
+    <description xml:lang="uk">Мінімальна основна система для віртуалізації.</description>
+    <description xml:lang="zh">最小型的虛擬化主機。</description>
+    <description xml:lang="zh_CN">最小虚拟化主机。</description>
+    <description xml:lang="zh_TW">最小型的虛擬化主機。</description>
+    <display_order>99</display_order>
+    <grouplist>
+      <groupid>base</groupid>
+      <groupid>core</groupid>
+      <groupid>standard</groupid>
+      <groupid>sphere-core-server</groupid>
+      <groupid>virtualization-hypervisor</groupid>
+      <groupid>virtualization-tools</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>debugging</groupid>
+      <groupid>network-file-system-client</groupid>
+      <groupid>remote-system-management</groupid>
+      <groupid>virtualization-platform</groupid>
+    </optionlist>
+  </environment>
   <category>
     <id>base-system</id>
     <name>System</name>