diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index c110f1cd..24268e35 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -6811,6 +6811,19 @@
       <groupid>guest-agents</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>custom-environment</id>
+    <_name>Fedora Custom Operating System</_name>
+    <_description>Basic building block for a custom Fedora system.</_description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>core</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+      <groupid>guest-agents</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>kde-desktop-environment</id>
     <_name>KDE Plasma Workspaces</_name>
@@ -6877,7 +6890,7 @@
          package.  Please keep this mostly in sync with
          infrastructure-server-environment. -->
     <id>server-product-environment</id>
-    <_name>Fedora Server</_name>
+    <_name>Fedora Server Edition</_name>
     <!-- Should eventually say “with a web UI accessible right after installation”
          or something else to differentiate from
          infrastructure-server-environment. -->
diff --git a/comps-f25.xml.in b/comps-f25.xml.in
index 90cbfff9..18f8dfba 100644
--- a/comps-f25.xml.in
+++ b/comps-f25.xml.in
@@ -6805,6 +6805,19 @@
       <groupid>guest-agents</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>custom-environment</id>
+    <_name>Fedora Custom Operating System</_name>
+    <_description>Basic building block for a custom Fedora system.</_description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>core</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+      <groupid>guest-agents</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>kde-desktop-environment</id>
     <_name>KDE Plasma Workspaces</_name>
@@ -6871,7 +6884,7 @@
          package.  Please keep this mostly in sync with
          infrastructure-server-environment. -->
     <id>server-product-environment</id>
-    <_name>Fedora Server</_name>
+    <_name>Fedora Server Edition</_name>
     <!-- Should eventually say “with a web UI accessible right after installation”
          or something else to differentiate from
          infrastructure-server-environment. -->