diff --git a/s390x/comps.xml b/s390x/comps.xml
index 577dfec..9b32b6e 100644
--- a/s390x/comps.xml
+++ b/s390x/comps.xml
@@ -698,7 +698,6 @@
       <packagereq variant="CRB" type="default">capstone-java</packagereq>
       <packagereq variant="CRB" type="default">catatonit</packagereq>
       <packagereq variant="CRB" type="default">cdi-api-javadoc</packagereq>
-      <packagereq variant="CRB" type="default">centos-sb-certs</packagereq>
       <packagereq variant="CRB" type="default">cglib</packagereq>
       <packagereq variant="CRB" type="default">cglib-javadoc</packagereq>
       <packagereq variant="CRB" type="default">cifs-utils-devel</packagereq>
@@ -2108,7 +2107,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="AppStream" type="mandatory">almalinux-backgrounds</packagereq>
       <packagereq variant="AppStream" type="mandatory">at-spi2-atk</packagereq>
       <packagereq variant="AppStream" type="mandatory">at-spi2-core</packagereq>
       <packagereq variant="AppStream" type="mandatory">avahi-tools</packagereq>
@@ -2249,37 +2247,6 @@
       <packagereq variant="HighAvailability" type="optional">spausedd</packagereq>
     </packagelist>
   </group>
-  <group variant="ResilientStorage">
-    <id>ha</id>
-    <name>High Availability</name>
-    <description>Infrastructure for highly available services and/or shared storage.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="ResilientStorage" type="mandatory">pacemaker</packagereq>
-      <packagereq variant="ResilientStorage" type="mandatory">pacemaker-cts</packagereq>
-      <packagereq variant="ResilientStorage" type="mandatory">pacemaker-nagios-plugins-metadata</packagereq>
-      <packagereq variant="ResilientStorage" type="mandatory">pacemaker-remote</packagereq>
-      <packagereq variant="ResilientStorage" type="mandatory">pacemaker-schemas</packagereq>
-      <packagereq variant="ResilientStorage" type="default">cockpit-ha-cluster</packagereq>
-      <packagereq variant="ResilientStorage" type="default">fence-agents-all</packagereq>
-      <packagereq variant="ResilientStorage" type="default">omping</packagereq>
-      <packagereq variant="ResilientStorage" type="default">pacemaker-doc</packagereq>
-      <packagereq variant="ResilientStorage" type="default">pcs</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">booth</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">booth-arbitrator</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">booth-site</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">booth-test</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">corosync-qdevice</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">corosync-qnetd</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">libknet1-plugins-all</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">pcs-snmp</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">resource-agents</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">resource-agents-paf</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">sbd</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">spausedd</packagereq>
-    </packagelist>
-  </group>
   <group variant="HighAvailability">
     <id>ha-devel</id>
     <name>High Availability Devel</name>
@@ -2290,16 +2257,6 @@
       <packagereq variant="HighAvailability" type="mandatory">pacemaker-libs-devel</packagereq>
     </packagelist>
   </group>
-  <group variant="ResilientStorage">
-    <id>ha-devel</id>
-    <name>High Availability Devel</name>
-    <description>Devel packages for highly available services and/or shared storage.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="ResilientStorage" type="mandatory">pacemaker-libs-devel</packagereq>
-    </packagelist>
-  </group>
   <group variant="BaseOS">
     <id>hardware-monitoring</id>
     <name>Hardware Monitoring Utilities</name>
@@ -3043,21 +3000,6 @@
       <packagereq variant="Minimal" type="default">cockpit</packagereq>
     </packagelist>
   </group>
-  <group variant="ResilientStorage">
-    <id>resilient-storage</id>
-    <name>Resilient Storage</name>
-    <description>Clustered storage, including the GFS2 file system.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="ResilientStorage" type="mandatory">lvm2-lockd</packagereq>
-      <packagereq variant="ResilientStorage" type="default">cockpit-ha-cluster</packagereq>
-      <packagereq variant="ResilientStorage" type="default">dlm</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">ctdb</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">resource-agents</packagereq>
-      <packagereq variant="ResilientStorage" type="optional">resource-agents-paf</packagereq>
-    </packagelist>
-  </group>
   <group variant="AppStream">
     <id>rpm-development-tools</id>
     <name>RPM Development Tools</name>