diff --git a/comps/BaseOS-aarch64.xml b/comps/BaseOS-aarch64.xml
index 4f1ecbf..505681d 100644
--- a/comps/BaseOS-aarch64.xml
+++ b/comps/BaseOS-aarch64.xml
@@ -52,8 +52,7 @@
       <packagereq type="mandatory">pciutils</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">symlinks</packagereq>
       <packagereq type="mandatory">systemd-udev</packagereq>
@@ -221,8 +220,7 @@
       <packagereq type="mandatory">pciutils</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">symlinks</packagereq>
       <packagereq type="mandatory">systemd-udev</packagereq>
@@ -729,8 +727,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">chrony</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">polkit</packagereq>
       <packagereq type="mandatory">realmd</packagereq>
       <packagereq type="default">NetworkManager-config-server</packagereq>
@@ -2774,8 +2771,7 @@
       <packagereq type="default">psacct</packagereq>
       <packagereq type="default">quota</packagereq>
       <packagereq type="default">realmd</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="default">rsync</packagereq>
       <packagereq type="default">sos</packagereq>
       <packagereq type="default">sssd</packagereq>
diff --git a/comps/BaseOS-ppc64le.xml b/comps/BaseOS-ppc64le.xml
index df51614..0954f34 100644
--- a/comps/BaseOS-ppc64le.xml
+++ b/comps/BaseOS-ppc64le.xml
@@ -52,8 +52,7 @@
       <packagereq type="mandatory">pciutils</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">symlinks</packagereq>
       <packagereq type="mandatory">systemd-udev</packagereq>
@@ -222,8 +221,7 @@
       <packagereq type="mandatory">pciutils</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">symlinks</packagereq>
       <packagereq type="mandatory">systemd-udev</packagereq>
@@ -732,8 +730,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">chrony</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">polkit</packagereq>
       <packagereq type="mandatory">realmd</packagereq>
       <packagereq type="default">NetworkManager-config-server</packagereq>
@@ -2779,8 +2776,7 @@
       <packagereq type="default">psacct</packagereq>
       <packagereq type="default">quota</packagereq>
       <packagereq type="default">realmd</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="default">rsync</packagereq>
       <packagereq type="default">sos</packagereq>
       <packagereq type="default">sssd</packagereq>
diff --git a/comps/BaseOS-s390x.xml b/comps/BaseOS-s390x.xml
index 8591cdb..b92c016 100644
--- a/comps/BaseOS-s390x.xml
+++ b/comps/BaseOS-s390x.xml
@@ -51,8 +51,7 @@
       <packagereq type="mandatory">pciutils</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">symlinks</packagereq>
       <packagereq type="mandatory">systemd-udev</packagereq>
@@ -219,8 +218,7 @@
       <packagereq type="mandatory">pciutils</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">symlinks</packagereq>
       <packagereq type="mandatory">systemd-udev</packagereq>
@@ -722,8 +720,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">chrony</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">polkit</packagereq>
       <packagereq type="mandatory">realmd</packagereq>
       <packagereq type="default">NetworkManager-config-server</packagereq>
@@ -2708,8 +2705,7 @@
       <packagereq type="default">psacct</packagereq>
       <packagereq type="default">quota</packagereq>
       <packagereq type="default">realmd</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="default">rsync</packagereq>
       <packagereq type="default">sos</packagereq>
       <packagereq type="default">sssd</packagereq>
diff --git a/comps/BaseOS-x86_64.xml b/comps/BaseOS-x86_64.xml
index a9e56fa..03354d2 100644
--- a/comps/BaseOS-x86_64.xml
+++ b/comps/BaseOS-x86_64.xml
@@ -54,8 +54,7 @@
       <packagereq type="mandatory">pciutils</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">symlinks</packagereq>
       <packagereq type="mandatory">systemd-udev</packagereq>
@@ -226,8 +225,7 @@
       <packagereq type="mandatory">pciutils</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">symlinks</packagereq>
       <packagereq type="mandatory">systemd-udev</packagereq>
@@ -752,8 +750,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">chrony</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="mandatory">polkit</packagereq>
       <packagereq type="mandatory">realmd</packagereq>
       <packagereq type="default">NetworkManager-config-server</packagereq>
@@ -2805,8 +2802,7 @@
       <packagereq type="default">psacct</packagereq>
       <packagereq type="default">quota</packagereq>
       <packagereq type="default">realmd</packagereq>
-      <packagereq type="mandatory">redhat-release</packagereq>
-      <packagereq type="mandatory">redhat-release-eula</packagereq>
+      <packagereq type="mandatory">rocky-release</packagereq>
       <packagereq type="default">rsync</packagereq>
       <packagereq type="default">sos</packagereq>
       <packagereq type="default">sssd</packagereq>