diff --git a/comps.xml b/comps.xml
index 2c0b865..7c1210f 100644
--- a/comps.xml
+++ b/comps.xml
@@ -1,6 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//MSVSphere//DTD Comps info//EN" "comps.dtd">
 <comps>
+  <group variant="BaseOS">
+    <id>sphere-core-server</id>
+    <name>Core Server</name>
+    <description>Release files for Server</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq variant="BaseOS" type="mandatory">sphere-release-identity-server</packagereq>
+    </packagelist>
+  </group>
+  <group variant="BaseOS">
+    <id>sphere-core-arm</id>
+    <name>Core ARM</name>
+    <description>Release files for ARM</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq variant="BaseOS" type="mandatory">sphere-release-identity-arm</packagereq>
+    </packagelist>
+  </group>
+  <group variant="Server">
+    <id>sphere-core-server</id>
+    <name>Core Server</name>
+    <description>Release files for Server</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq variant="Server" type="mandatory">sphere-release-identity-server</packagereq>
+    </packagelist>
+  </group>
+  <group variant="Minimal">
+    <id>sphere-core-server</id>
+    <name>Core Server</name>
+    <description>Release files for Server</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq variant="Minimal" type="mandatory">sphere-release-identity-server</packagereq>
+    </packagelist>
+  </group>
   <group variant="BaseOS">
     <id>additional-devel</id>
     <name>Additional Development</name>
@@ -17147,6 +17187,7 @@
       <groupid>print-client</groupid>
       <groupid>server-product</groupid>
       <groupid>standard</groupid>
+      <groupid>sphere-core-server</groupid>
     </grouplist>
     <optionlist>
       <groupid>debugging</groupid>
@@ -17225,6 +17266,7 @@
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
       <groupid>server-product</groupid>
+      <groupid>sphere-core-server</groupid>
       <groupid>standard</groupid>
     </grouplist>
     <optionlist>
@@ -17275,6 +17317,7 @@
       <groupid>headless-management</groupid>
       <groupid>server-product</groupid>
       <groupid>standard</groupid>
+      <groupid>sphere-core-server</groupid>
     </grouplist>
     <optionlist>
       <groupid>debugging</groupid>
@@ -17355,6 +17398,7 @@
     <display_order>3</display_order>
     <grouplist>
       <groupid>core</groupid>
+      <groupid>sphere-core-server</groupid>
     </grouplist>
     <optionlist>
       <groupid>guest-agents</groupid>
@@ -17398,6 +17442,7 @@
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
+      <groupid>sphere-core-arm</groupid>
       <groupid>standard</groupid>
       <groupid>workstation-product</groupid>
     </grouplist>
@@ -17506,6 +17551,7 @@
     <grouplist>
       <groupid>base</groupid>
       <groupid>core</groupid>
+      <groupid>sphere-core-server</groupid>
       <groupid>standard</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>virtualization-tools</groupid>
@@ -17577,6 +17623,7 @@
     <grouplist>
       <groupid>base</groupid>
       <groupid>core</groupid>
+      <groupid>sphere-core-server</groupid>
       <groupid>standard</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>virtualization-tools</groupid>