diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 46177881..ac830c25 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -1666,16 +1666,6 @@
       <packagereq type="optional">plague-client</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>fedora-release-nonproduct</id>
-    <_name>Generic Fedora release</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>fedora-release-nonproduct</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>finnish-support</id>
     <_name>Finnish Support</_name>
@@ -6887,7 +6877,6 @@
     <display_order>1</display_order>
     <grouplist>
       <groupid>core</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
@@ -6905,7 +6894,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6936,7 +6924,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7025,7 +7012,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7054,7 +7040,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7082,7 +7067,6 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7109,7 +7093,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7136,7 +7119,6 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7189,7 +7171,6 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7243,7 +7224,6 @@
     <grouplist>
       <groupid>standard</groupid>
       <groupid>core</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>hardware-support</groupid>
       <groupid>web-server</groupid>
     </grouplist>
@@ -7270,7 +7250,6 @@
     <grouplist>
       <groupid>standard</groupid>
       <groupid>core</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
       <groupid>container-management</groupid>
@@ -7304,7 +7283,6 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>
diff --git a/comps-f23.xml.in b/comps-f23.xml.in
index 40bbef3d..378f1950 100644
--- a/comps-f23.xml.in
+++ b/comps-f23.xml.in
@@ -1646,16 +1646,6 @@
       <packagereq type="optional">plague-client</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>fedora-release-nonproduct</id>
-    <_name>Generic Fedora release</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>fedora-release-nonproduct</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>finnish-support</id>
     <_name>Finnish Support</_name>
@@ -6849,7 +6839,6 @@
     <display_order>1</display_order>
     <grouplist>
       <groupid>core</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
@@ -6867,7 +6856,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6898,7 +6886,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6988,7 +6975,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7017,7 +7003,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7045,7 +7030,6 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7072,7 +7056,6 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7099,7 +7082,6 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7152,7 +7134,6 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -7206,7 +7187,6 @@
     <grouplist>
       <groupid>standard</groupid>
       <groupid>core</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>hardware-support</groupid>
       <groupid>web-server</groupid>
     </grouplist>
@@ -7233,7 +7213,6 @@
     <grouplist>
       <groupid>standard</groupid>
       <groupid>core</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
       <groupid>container-management</groupid>
@@ -7267,7 +7246,6 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>