diff --git a/upcoming/comps-rocky-8.4.xml b/comps-rocky-8.4.xml
similarity index 99%
rename from upcoming/comps-rocky-8.4.xml
rename to comps-rocky-8.4.xml
index a897653..010a5a8 100644
--- a/upcoming/comps-rocky-8.4.xml
+++ b/comps-rocky-8.4.xml
@@ -7778,107 +7778,6 @@
       <packagereq type="optional" arch="x86_64">resource-agents-aliyun</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>rt</id>
-    <name>RT</name>
-    <name xml:lang="fr">RT</name>
-    <name xml:lang="ja">RT</name>
-    <name xml:lang="ko">RT</name>
-    <name xml:lang="zh_CN">RT</name>
-    <description>Rocky for Realtime packages.</description>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="default">kernel-rt</packagereq>
-      <packagereq type="default">kernel-rt-core</packagereq>
-      <packagereq type="default">kernel-rt-modules</packagereq>
-      <packagereq type="default">kernel-rt-modules-extra</packagereq>
-      <packagereq type="default">kernel-rt-devel</packagereq>
-      <packagereq type="default">rt-setup</packagereq>
-      <packagereq type="default">rteval</packagereq>
-      <packagereq type="default">rteval-loads</packagereq>
-      <packagereq type="optional">stress-ng</packagereq>
-      <packagereq type="default">tuned-profiles-realtime</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>rt-debug</id>
-    <name>RT-debug</name>
-    <name xml:lang="de">RT-debug</name>
-    <name xml:lang="es">RT-depuración</name>
-    <name xml:lang="fr">RT-debug</name>
-    <name xml:lang="it">RT-debug</name>
-    <name xml:lang="ja">RT-debug</name>
-    <name xml:lang="ko">RT-debug</name>
-    <name xml:lang="pt">RT-debug</name>
-    <name xml:lang="pt_BR">RT-debug</name>
-    <name xml:lang="ru">RT-отладка</name>
-    <name xml:lang="zh_CN">RT-debug</name>
-    <name xml:lang="zh_TW">RT-debug</name>
-    <description>Rocky for Realtime debug packages.</description>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">kernel-rt-debug</packagereq>
-      <packagereq type="default">kernel-rt-debug-core</packagereq>
-      <packagereq type="default">kernel-rt-debug-modules</packagereq>
-      <packagereq type="default">kernel-rt-debug-modules-extra</packagereq>
-      <packagereq type="default">kernel-rt-debug-devel</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>nfv</id>
-    <name>NFV</name>
-    <name xml:lang="de">NFV</name>
-    <name xml:lang="es">NFV</name>
-    <name xml:lang="fr">NFV</name>
-    <name xml:lang="it">NFV</name>
-    <name xml:lang="ja">NFV</name>
-    <name xml:lang="ko">NFV</name>
-    <name xml:lang="pt">NFV</name>
-    <name xml:lang="pt_BR">NFV</name>
-    <name xml:lang="ru">ВНЕДОРОЖНИК</name>
-    <name xml:lang="zh_CN">NFV</name>
-    <name xml:lang="zh_TW">NFV</name>
-    <description>Rocky for Realtime for NFV packages.</description>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="default">kernel-rt</packagereq>
-      <packagereq type="default">kernel-rt-core</packagereq>
-      <packagereq type="default">kernel-rt-modules</packagereq>
-      <packagereq type="default">kernel-rt-modules-extra</packagereq>
-      <packagereq type="default">kernel-rt-kvm</packagereq>
-      <packagereq type="default">kernel-rt-devel</packagereq>
-      <packagereq type="default">rt-setup</packagereq>
-      <packagereq type="default">tuned-profiles-nfv</packagereq>
-      <packagereq type="default">tuned-profiles-nfv-host</packagereq>
-      <packagereq type="default">tuned-profiles-nfv-host-bin</packagereq>
-      <packagereq type="default">tuned-profiles-nfv-guest</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>nfv-debug</id>
-    <name>NFV-debug</name>
-    <name xml:lang="de">NFV-Debugging</name>
-    <name xml:lang="es">NFV-debug</name>
-    <name xml:lang="fr">NFV-debug</name>
-    <name xml:lang="it">NFV-debug</name>
-    <name xml:lang="ja">NFV-debug</name>
-    <name xml:lang="ko">NFV-debug</name>
-    <name xml:lang="pt">NFV-debug</name>
-    <name xml:lang="pt_BR">NFV-debug</name>
-    <name xml:lang="ru">NFV-отладчик</name>
-    <name xml:lang="zh_CN">NFV-debug</name>
-    <name xml:lang="zh_TW">NFV-debug</name>
-    <description>Rocky for Realtime for NFV debug packages.</description>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">kernel-rt-debug</packagereq>
-      <packagereq type="default">kernel-rt-debug-core</packagereq>
-      <packagereq type="default">kernel-rt-debug-modules</packagereq>
-      <packagereq type="default">kernel-rt-debug-modules-extra</packagereq>
-      <packagereq type="default">kernel-rt-debug-devel</packagereq>
-      <packagereq type="default">kernel-rt-debug-kvm</packagereq>
-    </packagelist>
-  </group>
   <group variant="PowerTools">
     <id>rocky-powertools</id>
     <name>Rocky PowerTools</name>