diff --git a/aarch64/comps.xml b/aarch64/comps.xml
index 2c30680..f7c6404 100644
--- a/aarch64/comps.xml
+++ b/aarch64/comps.xml
@@ -3992,16 +3992,12 @@
       <packagereq variant="HighAvailability" type="mandatory">pacemaker-nagios-plugins-metadata</packagereq>
       <packagereq variant="HighAvailability" type="mandatory">pacemaker-remote</packagereq>
       <packagereq variant="HighAvailability" type="mandatory">pacemaker-schemas</packagereq>
-      <packagereq variant="HighAvailability" type="default">fence-agents-aliyun</packagereq>
       <packagereq variant="HighAvailability" type="default">fence-agents-all</packagereq>
-      <packagereq variant="HighAvailability" type="default">fence-agents-aws</packagereq>
       <packagereq variant="HighAvailability" type="default">fence-agents-azure-arm</packagereq>
       <packagereq variant="HighAvailability" type="default">fence-agents-gce</packagereq>
-      <packagereq variant="HighAvailability" type="default">fence-agents-openstack</packagereq>
       <packagereq variant="HighAvailability" type="default">omping</packagereq>
       <packagereq variant="HighAvailability" type="default">pacemaker-doc</packagereq>
       <packagereq variant="HighAvailability" type="default">pcs</packagereq>
-      <packagereq variant="HighAvailability" type="optional">awscli</packagereq>
       <packagereq variant="HighAvailability" type="optional">booth</packagereq>
       <packagereq variant="HighAvailability" type="optional">booth-arbitrator</packagereq>
       <packagereq variant="HighAvailability" type="optional">booth-site</packagereq>
@@ -4015,8 +4011,6 @@
       <packagereq variant="HighAvailability" type="optional">libknet1-plugins-all</packagereq>
       <packagereq variant="HighAvailability" type="optional">pcs-snmp</packagereq>
       <packagereq variant="HighAvailability" type="optional">resource-agents</packagereq>
-      <packagereq variant="HighAvailability" type="optional">resource-agents-aliyun</packagereq>
-      <packagereq variant="HighAvailability" type="optional">resource-agents-gcp</packagereq>
       <packagereq variant="HighAvailability" type="optional">resource-agents-paf</packagereq>
       <packagereq variant="HighAvailability" type="optional">sbd</packagereq>
       <packagereq variant="HighAvailability" type="optional">spausedd</packagereq>
@@ -7958,6 +7952,7 @@
       <packagereq variant="PowerTools" type="default">gtest</packagereq>
       <packagereq variant="PowerTools" type="default">gtest-devel</packagereq>
       <packagereq variant="PowerTools" type="default">gtk-doc</packagereq>
+      <packagereq variant="PowerTools" type="default">gtk-vnc2-devel</packagereq>
       <packagereq variant="PowerTools" type="default">gtk3-devel-docs</packagereq>
       <packagereq variant="PowerTools" type="default">gtkmm24</packagereq>
       <packagereq variant="PowerTools" type="default">gtkmm24-devel</packagereq>
@@ -7992,6 +7987,20 @@
       <packagereq variant="PowerTools" type="default">iso-codes-devel</packagereq>
       <packagereq variant="PowerTools" type="default">istack-commons</packagereq>
       <packagereq variant="PowerTools" type="default">jasper-devel</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-demo-fastdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-demo-slowdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-devel-fastdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-devel-slowdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-fastdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-headless-fastdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-headless-slowdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-jmods-fastdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-jmods-slowdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-slowdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-src-fastdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-src-slowdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-static-libs-fastdebug</packagereq>
+      <packagereq variant="PowerTools" type="default">java-21-openjdk-static-libs-slowdebug</packagereq>
       <packagereq variant="PowerTools" type="default">javamail</packagereq>
       <packagereq variant="PowerTools" type="default">javapackages-local</packagereq>
       <packagereq variant="PowerTools" type="default">jaxen</packagereq>
@@ -8268,6 +8277,7 @@
       <packagereq variant="PowerTools" type="default">lua-posix</packagereq>
       <packagereq variant="PowerTools" type="default">lvm2-devel</packagereq>
       <packagereq variant="PowerTools" type="default">lynx</packagereq>
+      <packagereq variant="PowerTools" type="default">marisa-devel</packagereq>
       <packagereq variant="PowerTools" type="default">maven-archiver</packagereq>
       <packagereq variant="PowerTools" type="default">maven-artifact</packagereq>
       <packagereq variant="PowerTools" type="default">maven-artifact-manager</packagereq>
@@ -8738,6 +8748,7 @@
       <packagereq variant="PowerTools" type="default">uglify-js</packagereq>
       <packagereq variant="PowerTools" type="default">uid_wrapper</packagereq>
       <packagereq variant="PowerTools" type="default">unicode-ucd-unihan</packagereq>
+      <packagereq variant="PowerTools" type="default">unifdef</packagereq>
       <packagereq variant="PowerTools" type="default">upower-devel</packagereq>
       <packagereq variant="PowerTools" type="default">upower-devel-docs</packagereq>
       <packagereq variant="PowerTools" type="default">urw-base35-fonts-devel</packagereq>
@@ -8851,7 +8862,6 @@
       <packagereq variant="devel" type="default">bcel</packagereq>
       <packagereq variant="devel" type="default">beust-jcommander</packagereq>
       <packagereq variant="devel" type="default">bind9.16-devel</packagereq>
-      <packagereq variant="devel" type="default">bind9.16-dnssec-utils</packagereq>
       <packagereq variant="devel" type="default">bind9.16-doc</packagereq>
       <packagereq variant="devel" type="default">bison-devel</packagereq>
       <packagereq variant="devel" type="default">blas-devel</packagereq>
@@ -8882,6 +8892,7 @@
       <packagereq variant="devel" type="default">cdparanoia-devel</packagereq>
       <packagereq variant="devel" type="default">celt051-devel</packagereq>
       <packagereq variant="devel" type="default">cglib</packagereq>
+      <packagereq variant="devel" type="default">cifs-utils-devel</packagereq>
       <packagereq variant="devel" type="default">clucene-core-devel</packagereq>
       <packagereq variant="devel" type="default">clutter-devel</packagereq>
       <packagereq variant="devel" type="default">clutter-doc</packagereq>
@@ -9234,6 +9245,7 @@
       <packagereq variant="devel" type="default">libmtp-devel</packagereq>
       <packagereq variant="devel" type="default">libmusicbrainz5-devel</packagereq>
       <packagereq variant="devel" type="default">libnet-devel</packagereq>
+      <packagereq variant="devel" type="default">libnetapi-devel</packagereq>
       <packagereq variant="devel" type="default">libnetfilter_conntrack-devel</packagereq>
       <packagereq variant="devel" type="default">libnetfilter_queue-devel</packagereq>
       <packagereq variant="devel" type="default">libnfnetlink-devel</packagereq>
@@ -9302,6 +9314,8 @@
       <packagereq variant="devel" type="default">libthai-devel</packagereq>
       <packagereq variant="devel" type="default">libtheora-devel</packagereq>
       <packagereq variant="devel" type="default">libtiff-tools</packagereq>
+      <packagereq variant="devel" type="default">libtraceevent-devel</packagereq>
+      <packagereq variant="devel" type="default">libtracefs-devel</packagereq>
       <packagereq variant="devel" type="default">libucil-devel</packagereq>
       <packagereq variant="devel" type="default">libudisks2-devel</packagereq>
       <packagereq variant="devel" type="default">libunicap-devel</packagereq>
@@ -9329,6 +9343,7 @@
       <packagereq variant="devel" type="default">libwnck3-devel</packagereq>
       <packagereq variant="devel" type="default">libwpd-devel</packagereq>
       <packagereq variant="devel" type="default">libwpd-doc</packagereq>
+      <packagereq variant="devel" type="default">libwpe-devel</packagereq>
       <packagereq variant="devel" type="default">libwpg-devel</packagereq>
       <packagereq variant="devel" type="default">libwpg-doc</packagereq>
       <packagereq variant="devel" type="default">libwps-devel</packagereq>
@@ -9336,6 +9351,8 @@
       <packagereq variant="devel" type="default">libwsman-devel</packagereq>
       <packagereq variant="devel" type="default">libxcrypt-static</packagereq>
       <packagereq variant="devel" type="default">libXdmcp-devel</packagereq>
+      <packagereq variant="devel" type="default">libxdp-devel</packagereq>
+      <packagereq variant="devel" type="default">libxdp-static</packagereq>
       <packagereq variant="devel" type="default">libXfont2-devel</packagereq>
       <packagereq variant="devel" type="default">libxkbcommon-x11-devel</packagereq>
       <packagereq variant="devel" type="default">libxkbfile-devel</packagereq>
@@ -9345,6 +9362,8 @@
       <packagereq variant="devel" type="default">libXvMC-devel</packagereq>
       <packagereq variant="devel" type="default">libyaml-devel</packagereq>
       <packagereq variant="devel" type="default">linuxdoc-tools</packagereq>
+      <packagereq variant="devel" type="default">lmdb</packagereq>
+      <packagereq variant="devel" type="default">lmdb-devel</packagereq>
       <packagereq variant="devel" type="default">lockdev-devel</packagereq>
       <packagereq variant="devel" type="default">lttng-ust-devel</packagereq>
       <packagereq variant="devel" type="default">lua-devel</packagereq>
@@ -9422,6 +9441,9 @@
       <packagereq variant="devel" type="default">ModemManager-devel</packagereq>
       <packagereq variant="devel" type="default">ModemManager-glib-devel</packagereq>
       <packagereq variant="devel" type="default">mozjs52-devel</packagereq>
+      <packagereq variant="devel" type="default">mpdecimal++</packagereq>
+      <packagereq variant="devel" type="default">mpdecimal-devel</packagereq>
+      <packagereq variant="devel" type="default">mpdecimal-doc</packagereq>
       <packagereq variant="devel" type="default">mpg123-devel</packagereq>
       <packagereq variant="devel" type="default">msv-msv</packagereq>
       <packagereq variant="devel" type="default">mtdev-devel</packagereq>
@@ -9664,6 +9686,7 @@
       <packagereq variant="devel" type="default">poppler-qt5-devel</packagereq>
       <packagereq variant="devel" type="default">ppp-devel</packagereq>
       <packagereq variant="devel" type="default">pps-tools-devel</packagereq>
+      <packagereq variant="devel" type="default">procps-ng-devel</packagereq>
       <packagereq variant="devel" type="default">protobuf-compiler</packagereq>
       <packagereq variant="devel" type="default">protobuf-devel</packagereq>
       <packagereq variant="devel" type="default">protobuf-lite-devel</packagereq>
@@ -9684,7 +9707,6 @@
       <packagereq variant="devel" type="default">python2-scipy</packagereq>
       <packagereq variant="devel" type="default">python2-talloc</packagereq>
       <packagereq variant="devel" type="default">python3-babeltrace</packagereq>
-      <packagereq variant="devel" type="default">python3-bind9.16</packagereq>
       <packagereq variant="devel" type="default">python3-cairo-devel</packagereq>
       <packagereq variant="devel" type="default">python3-Cython</packagereq>
       <packagereq variant="devel" type="default">python3-greenlet-devel</packagereq>
@@ -9707,6 +9729,7 @@
       <packagereq variant="devel" type="default">python3-pyxattr</packagereq>
       <packagereq variant="devel" type="default">python3-qt5-devel</packagereq>
       <packagereq variant="devel" type="default">python3-rrdtool</packagereq>
+      <packagereq variant="devel" type="default">python3-samba-devel</packagereq>
       <packagereq variant="devel" type="default">python3-scons</packagereq>
       <packagereq variant="devel" type="default">python3-setuptools_scm</packagereq>
       <packagereq variant="devel" type="default">python3-sip-devel</packagereq>
@@ -9720,6 +9743,22 @@
       <packagereq variant="devel" type="default">python3-unittest2</packagereq>
       <packagereq variant="devel" type="default">python3-webencodings</packagereq>
       <packagereq variant="devel" type="default">python3-whoosh</packagereq>
+      <packagereq variant="devel" type="default">python3.11-attrs</packagereq>
+      <packagereq variant="devel" type="default">python3.11-Cython</packagereq>
+      <packagereq variant="devel" type="default">python3.11-debug</packagereq>
+      <packagereq variant="devel" type="default">python3.11-idle</packagereq>
+      <packagereq variant="devel" type="default">python3.11-iniconfig</packagereq>
+      <packagereq variant="devel" type="default">python3.11-packaging</packagereq>
+      <packagereq variant="devel" type="default">python3.11-pluggy</packagereq>
+      <packagereq variant="devel" type="default">python3.11-psycopg2-debug</packagereq>
+      <packagereq variant="devel" type="default">python3.11-psycopg2-tests</packagereq>
+      <packagereq variant="devel" type="default">python3.11-pybind11</packagereq>
+      <packagereq variant="devel" type="default">python3.11-pyparsing</packagereq>
+      <packagereq variant="devel" type="default">python3.11-pytest</packagereq>
+      <packagereq variant="devel" type="default">python3.11-semantic_version</packagereq>
+      <packagereq variant="devel" type="default">python3.11-setuptools-rust</packagereq>
+      <packagereq variant="devel" type="default">python3.11-test</packagereq>
+      <packagereq variant="devel" type="default">python3.11-wheel-wheel</packagereq>
       <packagereq variant="devel" type="default">qdox</packagereq>
       <packagereq variant="devel" type="default">qgpgme-devel</packagereq>
       <packagereq variant="devel" type="default">qhull-devel</packagereq>
@@ -9820,6 +9859,7 @@
       <packagereq variant="devel" type="default">webrtc-audio-processing-devel</packagereq>
       <packagereq variant="devel" type="default">wireshark-devel</packagereq>
       <packagereq variant="devel" type="default">woff2-devel</packagereq>
+      <packagereq variant="devel" type="default">wpebackend-fdo-devel</packagereq>
       <packagereq variant="devel" type="default">xapian-core-devel</packagereq>
       <packagereq variant="devel" type="default">Xaw3d-devel</packagereq>
       <packagereq variant="devel" type="default">xbean</packagereq>
@@ -10393,6 +10433,7 @@
     <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++</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>
@@ -10428,6 +10469,7 @@
       <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++</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>
@@ -13075,8 +13117,6 @@
       <groupid>remote-system-management</groupid>
       <groupid>smb-server</groupid>
       <groupid>virtualization-client</groupid>
-      <groupid>virtualization-hypervisor</groupid>
-      <groupid>virtualization-tools</groupid>
       <groupid>web-server</groupid>
     </optionlist>
   </environment>
@@ -13110,11 +13150,8 @@
     </grouplist>
     <optionlist>
       <groupid>debugging</groupid>
-      <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
-      <groupid>ftp-server</groupid>
       <groupid>gnome-desktop</groupid>
-      <groupid>guest-agents</groupid>
       <groupid>hardware-monitoring</groupid>
       <groupid>infiniband</groupid>
       <groupid>mail-server</groupid>
@@ -13123,7 +13160,9 @@
       <groupid>performance</groupid>
       <groupid>remote-system-management</groupid>
       <groupid>smb-server</groupid>
-      <groupid>virtualization-hypervisor</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
       <groupid>web-server</groupid>
     </optionlist>
   </environment>
@@ -13188,7 +13227,6 @@
       <groupid>core</groupid>
     </grouplist>
     <optionlist>
-      <groupid>guest-agents</groupid>
       <groupid>standard</groupid>
     </optionlist>
   </environment>
@@ -13223,7 +13261,6 @@
       <groupid>core</groupid>
     </grouplist>
     <optionlist>
-      <groupid>guest-agents</groupid>
       <groupid>standard</groupid>
     </optionlist>
   </environment>