diff --git a/s390x/comps.xml b/s390x/comps.xml
index 8ecff10..6795045 100644
--- a/s390x/comps.xml
+++ b/s390x/comps.xml
@@ -3837,15 +3837,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">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>
@@ -3859,8 +3856,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>
@@ -3939,6 +3934,7 @@
       <packagereq variant="ResilientStorage" type="default">fence-agents-aws</packagereq>
       <packagereq variant="ResilientStorage" type="default">fence-agents-azure-arm</packagereq>
       <packagereq variant="ResilientStorage" type="default">fence-agents-gce</packagereq>
+      <packagereq variant="ResilientStorage" type="default">fence-agents-openstack</packagereq>
       <packagereq variant="ResilientStorage" type="default">omping</packagereq>
       <packagereq variant="ResilientStorage" type="default">pacemaker-doc</packagereq>
       <packagereq variant="ResilientStorage" type="default">pcs</packagereq>
@@ -8715,6 +8711,7 @@
       <packagereq variant="ResilientStorage" type="mandatory">gfs2-utils</packagereq>
       <packagereq variant="ResilientStorage" type="mandatory">lvm2-lockd</packagereq>
       <packagereq variant="ResilientStorage" type="default">dlm</packagereq>
+      <packagereq variant="ResilientStorage" type="default">fence-agents-openstack</packagereq>
       <packagereq variant="ResilientStorage" type="optional">cmirror</packagereq>
       <packagereq variant="ResilientStorage" type="optional">ctdb</packagereq>
       <packagereq variant="ResilientStorage" type="optional">resource-agents</packagereq>