diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index a0eb4053ed2b3144d03e89c3969b28cfd20ab837..3e3a034e3252b8ddac7546ffdd4caa3c8ee43379 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -1023,8 +1023,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq variant="BaseOS" type="mandatory">chrony</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release-eula</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
       <packagereq variant="BaseOS" type="mandatory">polkit</packagereq>
       <packagereq variant="BaseOS" type="mandatory">realmd</packagereq>
       <packagereq variant="BaseOS" type="default">NetworkManager-config-server</packagereq>
@@ -1072,8 +1071,7 @@
       <packagereq variant="BaseOS" type="mandatory">pciutils</packagereq>
       <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
       <packagereq variant="BaseOS" type="mandatory">quota</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release-eula</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
       <packagereq variant="BaseOS" type="mandatory">symlinks</packagereq>
       <packagereq variant="BaseOS" type="mandatory">systemd-udev</packagereq>
@@ -1179,8 +1177,7 @@
       <packagereq variant="BaseOS" type="mandatory">pciutils</packagereq>
       <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
       <packagereq variant="BaseOS" type="mandatory">quota</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release-eula</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
       <packagereq variant="BaseOS" type="mandatory">symlinks</packagereq>
       <packagereq variant="BaseOS" type="mandatory">systemd-udev</packagereq>
@@ -1693,8 +1690,7 @@
       <packagereq variant="BaseOS">psacct</packagereq>
       <packagereq variant="BaseOS">quota</packagereq>
       <packagereq variant="BaseOS">realmd</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release-eula</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
       <packagereq variant="BaseOS">rsync</packagereq>
       <packagereq variant="BaseOS">sos</packagereq>
       <packagereq variant="BaseOS">sssd</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 7c7b5d8431a5af59eb960b1e8b2b70c035ea8bd3..8b3fa6f951f7579cd6c71ae706c837fe701d00ee 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -1022,8 +1022,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory" variant="BaseOS">chrony</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release-eula</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
       <packagereq type="mandatory" variant="BaseOS">polkit</packagereq>
       <packagereq type="mandatory" variant="BaseOS">realmd</packagereq>
       <packagereq type="default" variant="BaseOS">NetworkManager-config-server</packagereq>
@@ -1071,8 +1070,7 @@
       <packagereq type="mandatory" variant="BaseOS">pciutils</packagereq>
       <packagereq type="mandatory" variant="BaseOS">psacct</packagereq>
       <packagereq type="mandatory" variant="BaseOS">quota</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release-eula</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
       <packagereq type="mandatory" variant="BaseOS">sudo</packagereq>
       <packagereq type="mandatory" variant="BaseOS">symlinks</packagereq>
       <packagereq type="mandatory" variant="BaseOS">systemd-udev</packagereq>
@@ -1178,8 +1176,7 @@
       <packagereq type="mandatory" variant="BaseOS">pciutils</packagereq>
       <packagereq type="mandatory" variant="BaseOS">psacct</packagereq>
       <packagereq type="mandatory" variant="BaseOS">quota</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release-eula</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
       <packagereq type="mandatory" variant="BaseOS">sudo</packagereq>
       <packagereq type="mandatory" variant="BaseOS">symlinks</packagereq>
       <packagereq type="mandatory" variant="BaseOS">systemd-udev</packagereq>
@@ -1692,8 +1689,7 @@
       <packagereq variant="BaseOS">psacct</packagereq>
       <packagereq variant="BaseOS">quota</packagereq>
       <packagereq variant="BaseOS">realmd</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release-eula</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
       <packagereq variant="BaseOS">rsync</packagereq>
       <packagereq variant="BaseOS">sos</packagereq>
       <packagereq variant="BaseOS">sssd</packagereq>
diff --git a/comps-rocky-9.0.xml b/comps-rocky-9.0.xml
index 29c6b90eb23745562d2af855a94770a401e6dda4..6b9d230a9e7a8fe2ca184ca214d30d04ac534cb7 100644
--- a/comps-rocky-9.0.xml
+++ b/comps-rocky-9.0.xml
@@ -2760,8 +2760,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq variant="BaseOS" type="mandatory">chrony</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release-eula</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
       <packagereq variant="BaseOS" type="mandatory">polkit</packagereq>
       <packagereq variant="BaseOS" type="mandatory">realmd</packagereq>
       <packagereq variant="BaseOS" type="default">NetworkManager-config-server</packagereq>
@@ -2982,8 +2981,7 @@
       <packagereq variant="BaseOS" type="mandatory">pciutils</packagereq>
       <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
       <packagereq variant="BaseOS" type="mandatory">quota</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release-eula</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
       <packagereq variant="BaseOS" type="mandatory">symlinks</packagereq>
       <packagereq variant="BaseOS" type="mandatory">systemd-udev</packagereq>
@@ -3175,8 +3173,7 @@
       <packagereq variant="BaseOS" type="mandatory">pciutils</packagereq>
       <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
       <packagereq variant="BaseOS" type="mandatory">quota</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release-eula</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
       <packagereq variant="BaseOS" type="mandatory">symlinks</packagereq>
       <packagereq variant="BaseOS" type="mandatory">systemd-udev</packagereq>
@@ -3981,8 +3978,7 @@
       <packagereq variant="BaseOS">psacct</packagereq>
       <packagereq variant="BaseOS">quota</packagereq>
       <packagereq variant="BaseOS">realmd</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">redhat-release-eula</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
       <packagereq variant="BaseOS">rsync</packagereq>
       <packagereq variant="BaseOS">sos</packagereq>
       <packagereq variant="BaseOS">sssd</packagereq>
@@ -10342,4 +10338,4 @@
       <groupid arch="x86_64">office-suite</groupid>
     </grouplist>
   </category>
-</comps>
\ No newline at end of file
+</comps>
diff --git a/comps-rocky-9.0.xml.in b/comps-rocky-9.0.xml.in
index 97b17dc3213376e34779d0dee4769ed5eec7f690..6f1de59ddfa9e09d6fa3bd82f2806c8e7121ada4 100644
--- a/comps-rocky-9.0.xml.in
+++ b/comps-rocky-9.0.xml.in
@@ -1022,8 +1022,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory" variant="BaseOS">chrony</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release-eula</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
       <packagereq type="mandatory" variant="BaseOS">polkit</packagereq>
       <packagereq type="mandatory" variant="BaseOS">realmd</packagereq>
       <packagereq type="default" variant="BaseOS">NetworkManager-config-server</packagereq>
@@ -1071,8 +1070,7 @@
       <packagereq type="mandatory" variant="BaseOS">pciutils</packagereq>
       <packagereq type="mandatory" variant="BaseOS">psacct</packagereq>
       <packagereq type="mandatory" variant="BaseOS">quota</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release-eula</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
       <packagereq type="mandatory" variant="BaseOS">sudo</packagereq>
       <packagereq type="mandatory" variant="BaseOS">symlinks</packagereq>
       <packagereq type="mandatory" variant="BaseOS">systemd-udev</packagereq>
@@ -1177,8 +1175,7 @@
       <packagereq type="mandatory" variant="BaseOS">pciutils</packagereq>
       <packagereq type="mandatory" variant="BaseOS">psacct</packagereq>
       <packagereq type="mandatory" variant="BaseOS">quota</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release-eula</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
       <packagereq type="mandatory" variant="BaseOS">sudo</packagereq>
       <packagereq type="mandatory" variant="BaseOS">symlinks</packagereq>
       <packagereq type="mandatory" variant="BaseOS">systemd-udev</packagereq>
@@ -1690,8 +1687,7 @@
       <packagereq variant="BaseOS">psacct</packagereq>
       <packagereq variant="BaseOS">quota</packagereq>
       <packagereq variant="BaseOS">realmd</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release</packagereq>
-      <packagereq type="mandatory" variant="BaseOS">redhat-release-eula</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
       <packagereq variant="BaseOS">rsync</packagereq>
       <packagereq variant="BaseOS">sos</packagereq>
       <packagereq variant="BaseOS">sssd</packagereq>