diff --git a/x86_64/comps.xml b/x86_64/comps.xml
index 4ff133c..3fc9613 100644
--- a/x86_64/comps.xml
+++ b/x86_64/comps.xml
@@ -7327,85 +7327,6 @@
       <packagereq variant="Minimal" type="default">NetworkManager-wwan</packagereq>
     </packagelist>
   </group>
-  <group variant="NFV">
-    <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>AlmaLinux for Realtime for NFV packages.</description>
-    <description xml:lang="de">AlmaLinux für Realtime für NFV-Pakete.</description>
-    <description xml:lang="es">AlmaLinux for Realtime para paquetes NFV.</description>
-    <description xml:lang="fr">AlmaLinux pour packages NVF en temps réel.</description>
-    <description xml:lang="it">AlmaLinux per i pacchetti NFV in tempo reale.</description>
-    <description xml:lang="ja">Realtime NFV パッケージ用の AlmaLinux。</description>
-    <description xml:lang="ko">AlmaLinux for Realtime NFV 패키지.</description>
-    <description xml:lang="pt">AlmaLinux para Tempo Real para pacotes NFV.</description>
-    <description xml:lang="pt_BR">AlmaLinux para Tempo Real para pacotes NFV.</description>
-    <description xml:lang="ru">AlmaLinux в режиме реального времени для NFV пакетов.</description>
-    <description xml:lang="zh_CN">AlmaLinux for Realtime NFV 软件包。</description>
-    <description xml:lang="zh_TW">AlmaLinux for Realtime for NFV軟件包。</description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq variant="NFV" type="default">kernel-rt</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-core</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-devel</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-kvm</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-modules</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-modules-extra</packagereq>
-      <packagereq variant="NFV" type="default">rt-setup</packagereq>
-      <packagereq variant="NFV" type="default">tuned-profiles-nfv</packagereq>
-      <packagereq variant="NFV" type="default">tuned-profiles-nfv-guest</packagereq>
-      <packagereq variant="NFV" type="default">tuned-profiles-nfv-host</packagereq>
-      <packagereq variant="NFV" type="default">tuned-profiles-nfv-host-bin</packagereq>
-    </packagelist>
-  </group>
-  <group variant="NFV">
-    <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>AlmaLinux for Realtime for NFV debug packages.</description>
-    <description xml:lang="de">AlmaLinux for Realtime for NFV Debug-Pakete.</description>
-    <description xml:lang="es">AlmaLinux for Realtime para paquetes de depuración de NFV.</description>
-    <description xml:lang="fr">AlmaLinux pour packages de débogage NVF en temps réel.</description>
-    <description xml:lang="it">AlmaLinux per i pacchetti di debug NFV in tempo reale.</description>
-    <description xml:lang="ja">Realtime NFV デバッグパッケージ用の AlmaLinux。</description>
-    <description xml:lang="ko">AlmaLinux for Realtime NFV 디버그 패키지.</description>
-    <description xml:lang="pt">AlmaLinux para Realtime para pacotes de depuração NFV.</description>
-    <description xml:lang="pt_BR">AlmaLinux para Realtime para pacotes de depuração NFV.</description>
-    <description xml:lang="ru">AlmaLinux для отладочных пакетов NFV в режиме реального времени.</description>
-    <description xml:lang="zh_CN">AlmaLinux for Realtime NFV debug 软件包。</description>
-    <description xml:lang="zh_TW">AlmaLinux for Realtime for NFV調試包。</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="NFV" type="default">kernel-rt-debug</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-core</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-devel</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-kvm</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-modules</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-modules-extra</packagereq>
-    </packagelist>
-  </group>
   <group variant="AppStream">
     <id>office-suite</id>
     <name>Office Suite and Productivity</name>
@@ -9840,235 +9761,6 @@
       <packagereq variant="AppStream" type="optional">rpmlint</packagereq>
     </packagelist>
   </group>
-  <group variant="NFV">
-    <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>AlmaLinux for Realtime packages.</description>
-    <description xml:lang="fr">AlmaLinux pour packages RT (Real Time).</description>
-    <description xml:lang="ja">Realtime パッケージ用の AlmaLinux。</description>
-    <description xml:lang="ko">AlmaLinux for Realtime 패키지.</description>
-    <description xml:lang="zh_CN">AlmaLinux for Realtime 软件包。</description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq variant="NFV" type="default">kernel-rt</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-core</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-devel</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-modules</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-modules-extra</packagereq>
-      <packagereq variant="NFV" type="default">rt-setup</packagereq>
-      <packagereq variant="NFV" type="default">rteval</packagereq>
-      <packagereq variant="NFV" type="default">rteval-loads</packagereq>
-      <packagereq variant="NFV" type="default">tuned-profiles-realtime</packagereq>
-      <packagereq variant="NFV" type="optional">stress-ng</packagereq>
-    </packagelist>
-  </group>
-  <group variant="RT">
-    <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>AlmaLinux for Realtime packages.</description>
-    <description xml:lang="fr">AlmaLinux pour packages RT (Real Time).</description>
-    <description xml:lang="ja">Realtime パッケージ用の AlmaLinux。</description>
-    <description xml:lang="ko">AlmaLinux for Realtime 패키지.</description>
-    <description xml:lang="zh_CN">AlmaLinux for Realtime 软件包。</description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq variant="RT" type="default">kernel-rt</packagereq>
-      <packagereq variant="RT" type="default">kernel-rt-core</packagereq>
-      <packagereq variant="RT" type="default">kernel-rt-devel</packagereq>
-      <packagereq variant="RT" type="default">kernel-rt-modules</packagereq>
-      <packagereq variant="RT" type="default">kernel-rt-modules-extra</packagereq>
-      <packagereq variant="RT" type="default">rt-setup</packagereq>
-      <packagereq variant="RT" type="default">rteval</packagereq>
-      <packagereq variant="RT" type="default">rteval-loads</packagereq>
-      <packagereq variant="RT" type="default">tuned-profiles-realtime</packagereq>
-      <packagereq variant="RT" type="optional">stress-ng</packagereq>
-    </packagelist>
-  </group>
-  <group variant="NFV">
-    <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>AlmaLinux for Realtime debug packages.</description>
-    <description xml:lang="de">AlmaLinux für Echtzeit-Debug-Pakete.</description>
-    <description xml:lang="es">AlmaLinux para paquetes de depuración en tiempo real.</description>
-    <description xml:lang="fr">AlmaLinux pour les packages de débogage en temps réel.</description>
-    <description xml:lang="it">AlmaLinux per pacchetti di debug in tempo reale.</description>
-    <description xml:lang="ja">Realtime デバッグパッケージ用の AlmaLinux。</description>
-    <description xml:lang="ko">AlmaLinux for Realtime 디버그 패키지.</description>
-    <description xml:lang="pt">AlmaLinux para pacotes de depuração em tempo real.</description>
-    <description xml:lang="pt_BR">AlmaLinux para pacotes de depuração em tempo real.</description>
-    <description xml:lang="ru">AlmaLinux для отладочных пакетов реального времени.</description>
-    <description xml:lang="zh_CN">AlmaLinux for Realtime debug 软件包。</description>
-    <description xml:lang="zh_TW">AlmaLinux for Realtime調試包。</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="NFV" type="default">kernel-rt-debug</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-core</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-devel</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-modules</packagereq>
-      <packagereq variant="NFV" type="default">kernel-rt-debug-modules-extra</packagereq>
-    </packagelist>
-  </group>
-  <group variant="RT">
-    <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>AlmaLinux for Realtime debug packages.</description>
-    <description xml:lang="de">AlmaLinux für Echtzeit-Debug-Pakete.</description>
-    <description xml:lang="es">AlmaLinux para paquetes de depuración en tiempo real.</description>
-    <description xml:lang="fr">AlmaLinux pour les packages de débogage en temps réel.</description>
-    <description xml:lang="it">AlmaLinux per pacchetti di debug in tempo reale.</description>
-    <description xml:lang="ja">Realtime デバッグパッケージ用の AlmaLinux。</description>
-    <description xml:lang="ko">AlmaLinux for Realtime 디버그 패키지.</description>
-    <description xml:lang="pt">AlmaLinux para pacotes de depuração em tempo real.</description>
-    <description xml:lang="pt_BR">AlmaLinux para pacotes de depuração em tempo real.</description>
-    <description xml:lang="ru">AlmaLinux для отладочных пакетов реального времени.</description>
-    <description xml:lang="zh_CN">AlmaLinux for Realtime debug 软件包。</description>
-    <description xml:lang="zh_TW">AlmaLinux for Realtime調試包。</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="RT" type="default">kernel-rt-debug</packagereq>
-      <packagereq variant="RT" type="default">kernel-rt-debug-core</packagereq>
-      <packagereq variant="RT" type="default">kernel-rt-debug-devel</packagereq>
-      <packagereq variant="RT" type="default">kernel-rt-debug-modules</packagereq>
-      <packagereq variant="RT" type="default">kernel-rt-debug-modules-extra</packagereq>
-    </packagelist>
-  </group>
-  <group variant="SAP">
-    <id>sap</id>
-    <name>SAP</name>
-    <name xml:lang="as">SAP</name>
-    <name xml:lang="bn">SAP</name>
-    <name xml:lang="cs">SAP</name>
-    <name xml:lang="de">SAP</name>
-    <name xml:lang="de_CH">SAP</name>
-    <name xml:lang="es">SAP</name>
-    <name xml:lang="eu">SAP</name>
-    <name xml:lang="fr">SAP</name>
-    <name xml:lang="gu">SAP</name>
-    <name xml:lang="hi">SAP</name>
-    <name xml:lang="it">SAP</name>
-    <name xml:lang="ja">SAP</name>
-    <name xml:lang="kn">SAP</name>
-    <name xml:lang="ko">SAP</name>
-    <name xml:lang="ml">എസ്എപി</name>
-    <name xml:lang="mr">SAP</name>
-    <name xml:lang="or">SAP</name>
-    <name xml:lang="pa">SAP</name>
-    <name xml:lang="pl">SAP</name>
-    <name xml:lang="pt_BR">SAP</name>
-    <name xml:lang="ru">SAP</name>
-    <name xml:lang="ta">SAP</name>
-    <name xml:lang="te">SAP</name>
-    <name xml:lang="uk">SAP</name>
-    <name xml:lang="zh">SAP</name>
-    <name xml:lang="zh_CN">SAP</name>
-    <name xml:lang="zh_TW">SAP</name>
-    <description>AlmaLinux for SAP packages.</description>
-    <description xml:lang="cs">Balíčky AlmaLinux pro systém SAP.</description>
-    <description xml:lang="de">AlmaLinux für SAP-Pakete.</description>
-    <description xml:lang="de_CH">AlmaLinux für SAP-Pakete.</description>
-    <description xml:lang="es">Paquetes SAP para AlmaLinux.</description>
-    <description xml:lang="fr">AlmaLinux pour packages SAP.</description>
-    <description xml:lang="gu">SAP પેકેજો માટે AlmaLinux.</description>
-    <description xml:lang="hi">SAP संकुल के लिए AlmaLinux.</description>
-    <description xml:lang="it">AlmaLinux per pacchetti SAP</description>
-    <description xml:lang="ja">SAP パッケージ用の AlmaLinux です。</description>
-    <description xml:lang="kn">SAP ಪ್ಯಾಕೇಜುಗಳಿಗಾಗಿ AlmaLinux.</description>
-    <description xml:lang="ko">SAP 패키지 용 AlmaLinux.</description>
-    <description xml:lang="ml">എസ്എപി പാക്കേജുകള്‍ക്കുള്ള AlmaLinux.</description>
-    <description xml:lang="mr">SAP संकुलांकरिता AlmaLinux.</description>
-    <description xml:lang="or">SAP ପ୍ୟାକେଜଗୁଡ଼ିକ ପାଇଁ AlmaLinux।</description>
-    <description xml:lang="pa">SAP ਪੰਡਾਂ/ਪੈਕੇਜਾਂ ਲਈ AlmaLinux।</description>
-    <description xml:lang="pl">Pakiety systemu AlmaLinux dla SAP.</description>
-    <description xml:lang="pt_BR">AlmaLinux para pacotes SAP.</description>
-    <description xml:lang="ru">Пакеты AlmaLinux для SAP.</description>
-    <description xml:lang="ta">SAP தொகுப்புகளுக்கான AlmaLinux.</description>
-    <description xml:lang="te">SAP ప్యాకేజీల కొరకు AlmaLinux.</description>
-    <description xml:lang="uk">AlmaLinux для пакунків SAP</description>
-    <description xml:lang="zh">AlmaLinux for SAP 套件。</description>
-    <description xml:lang="zh_CN">使用 SAP 软件包的 AlmaLinux。</description>
-    <description xml:lang="zh_TW">AlmaLinux for SAP 套件。</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="SAP" type="default">sap-cluster-connector</packagereq>
-      <packagereq variant="SAP" type="optional">compat-locales-sap</packagereq>
-      <packagereq variant="SAP" type="optional">compat-sap-c++-10</packagereq>
-      <packagereq variant="SAP" type="optional">compat-sap-c++-11</packagereq>
-      <packagereq variant="SAP" type="optional">compat-sap-c++-12</packagereq>
-      <packagereq variant="SAP" type="optional">compat-sap-c++-9</packagereq>
-      <packagereq variant="SAP" type="optional">resource-agents-sap</packagereq>
-      <packagereq variant="SAP" type="optional">tuned-profiles-sap</packagereq>
-      <packagereq variant="SAP" type="optional">vhostmd</packagereq>
-      <packagereq variant="SAP" type="optional">vm-dump-metrics</packagereq>
-    </packagelist>
-  </group>
-  <group variant="SAPHANA">
-    <id>sap-hana</id>
-    <name>SAP HANA</name>
-    <name xml:lang="fr">SAP HANA</name>
-    <name xml:lang="ja">SAP HANA</name>
-    <name xml:lang="ko">SAP HANA</name>
-    <name xml:lang="zh_CN">SAP HANA</name>
-    <description>AlmaLinux for SAP HANA packages.</description>
-    <description xml:lang="de">AlmaLinux für SAP HANA-Pakete.</description>
-    <description xml:lang="es">AlmaLinux para paquetes SAP HANA.</description>
-    <description xml:lang="fr">AlmaLinux pour les packages SAP HANA.</description>
-    <description xml:lang="it">AlmaLinux per i pacchetti SAP HANA.</description>
-    <description xml:lang="ja">SAP HANA パッケージ用 AlmaLinux です。</description>
-    <description xml:lang="ko">AlmaLinux for SAP HANA 패키지.</description>
-    <description xml:lang="pt_BR">AlmaLinux para pacotes SAP HANA.</description>
-    <description xml:lang="ru">AlmaLinux для пакетов SAP HANA.</description>
-    <description xml:lang="zh_CN">AlmaLinux for SAP HANA 软件包。</description>
-    <description xml:lang="zh_TW">AlmaLinux for SAP HANA包。</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="SAPHANA" type="default">resource-agents-sap-hana</packagereq>
-      <packagereq variant="SAPHANA" type="default">resource-agents-sap-hana-scaleout</packagereq>
-      <packagereq variant="SAPHANA" type="default">rhel-system-roles-sap</packagereq>
-      <packagereq variant="SAPHANA" type="default">tuned-profiles-sap-hana</packagereq>
-      <packagereq variant="SAPHANA" type="optional">compat-sap-c++-10</packagereq>
-      <packagereq variant="SAPHANA" type="optional">compat-sap-c++-11</packagereq>
-      <packagereq variant="SAPHANA" type="optional">compat-sap-c++-12</packagereq>
-      <packagereq variant="SAPHANA" type="optional">compat-sap-c++-9</packagereq>
-      <packagereq variant="SAPHANA" type="optional">vhostmd</packagereq>
-      <packagereq variant="SAPHANA" type="optional">vm-dump-metrics</packagereq>
-    </packagelist>
-  </group>
   <group variant="BaseOS">
     <id>scientific</id>
     <name>Scientific Support</name>