diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 2854ebf1..f8279902 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -2120,6 +2120,16 @@
eclipse-veditor
+
+ fedora-release-standard
+ <_name>Generic Fedora release
+ <_description/>
+ false
+ false
+
+ fedora-release-standard
+
+
freeipa-server
<_name>FreeIPA Server
@@ -6684,6 +6694,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6712,6 +6723,7 @@
core
admin-tools
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6741,6 +6753,7 @@
core
admin-tools
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6769,6 +6782,7 @@
core
admin-tools
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6795,6 +6809,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6820,6 +6835,7 @@
core
admin-tools
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6846,6 +6862,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6868,6 +6885,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6920,6 +6938,7 @@
standard
core
+ fedora-release-standard
hardware-support
web-server
@@ -6946,6 +6965,7 @@
standard
core
+ fedora-release-standard
hardware-support
headless-management
container-management
@@ -7042,6 +7062,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
hardware-support
multimedia
@@ -7072,6 +7093,7 @@
99
core
+ fedora-release-standard
standard
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 58597a9e..5fb8d96f 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -2107,6 +2107,16 @@
eclipse-veditor
+
+ fedora-release-standard
+ <_name>Generic Fedora release
+ <_description/>
+ false
+ false
+
+ fedora-release-standard
+
+
freeipa-server
<_name>FreeIPA Server
@@ -6670,6 +6680,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6698,6 +6709,7 @@
core
admin-tools
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6727,6 +6739,7 @@
core
admin-tools
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6755,6 +6768,7 @@
core
admin-tools
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6781,6 +6795,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6806,6 +6821,7 @@
core
admin-tools
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6832,6 +6848,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6854,6 +6871,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
input-methods
multimedia
@@ -6906,6 +6924,7 @@
standard
core
+ fedora-release-standard
hardware-support
web-server
@@ -6932,6 +6951,7 @@
standard
core
+ fedora-release-standard
hardware-support
headless-management
container-management
@@ -7027,6 +7047,7 @@
standard
core
dial-up
+ fedora-release-standard
fonts
hardware-support
multimedia
@@ -7057,6 +7078,7 @@
99
core
+ fedora-release-standard
standard