diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index a74285f8..832cc120 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -5354,6 +5354,16 @@
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>server-product</id>
+    <_name>Fedora Server product core</_name>
+    <_description>Packages mandatory for the server product.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">fedora-release-server</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>simplified-chinese-support</id>
     <_name>Simplified Chinese Support</_name>
@@ -6572,6 +6582,7 @@
     </optionlist>
   </environment>
   <environment>
+    <!-- Please keep this mostly in sync with fedora-server-environment. -->
     <id>infrastructure-server-environment</id>
     <_name>Infrastructure Server</_name>
     <_description>Server for operating network infrastructure services.</_description>
@@ -6602,6 +6613,45 @@
       <groupid>web-server</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <!-- Intended only for the Fedora Server product; other products will not
+         show this because they don’t include the fedora-release-server
+         package.  Please keep this mostly in sync with
+         infrastructure-server-environment. -->
+    <id>server-product-environment</id>
+    <_name>Fedora Server</_name>
+    <!-- Should eventually say “with a web UI accessible right after installation”
+	 or something else to differentiate from
+	 infrastructure-server-environment. -->
+    <_description>An integrated, easier to manage server.</_description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>server-product</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>container-management</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>printing</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>virtualization</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>basic-desktop-environment</id>
     <_name>Basic Desktop</_name>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 73096497..9898bfc3 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -5354,6 +5354,16 @@
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>server-product</id>
+    <_name>Fedora Server product core</_name>
+    <_description>Packages mandatory for the server product.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">fedora-release-server</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>simplified-chinese-support</id>
     <_name>Simplified Chinese Support</_name>
@@ -6572,6 +6582,7 @@
     </optionlist>
   </environment>
   <environment>
+    <!-- Please keep this mostly in sync with fedora-server-environment. -->
     <id>infrastructure-server-environment</id>
     <_name>Infrastructure Server</_name>
     <_description>Server for operating network infrastructure services.</_description>
@@ -6602,6 +6613,45 @@
       <groupid>web-server</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <!-- Intended only for the Fedora Server product; other products will not
+         show this because they don’t include the fedora-release-server
+         package.  Please keep this mostly in sync with
+         infrastructure-server-environment. -->
+    <id>server-product-environment</id>
+    <_name>Fedora Server</_name>
+    <!-- Should eventually say “with a web UI accessible right after installation”
+	 or something else to differentiate from
+	 infrastructure-server-environment. -->
+    <_description>An integrated, easier to manage server.</_description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>server-product</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>container-management</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>printing</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>virtualization</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>basic-desktop-environment</id>
     <_name>Basic Desktop</_name>