diff --git a/prepopulate.json b/prepopulate.json
index e74e34c..b72242c 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -39961,356 +39961,6 @@
       ]
     }
   },
-  "ResilientStorage": {
-    "ppc64le": {
-      "booth": [
-        "booth-arbitrator.noarch",
-        "booth-core.ppc64le",
-        "booth-site.noarch",
-        "booth-test.noarch",
-        "booth.ppc64le"
-      ],
-      "corosync": [
-        "corosync.ppc64le",
-        "corosynclib-devel.ppc64le",
-        "corosynclib.ppc64le"
-      ],
-      "corosync-qdevice": [
-        "corosync-qdevice.ppc64le",
-        "corosync-qnetd.ppc64le"
-      ],
-      "dlm": [
-        "dlm.ppc64le"
-      ],
-      "fence-agents": [
-        "fence-agents-all.ppc64le",
-        "fence-agents-amt-ws.noarch",
-        "fence-agents-apc-snmp.noarch",
-        "fence-agents-apc.noarch",
-        "fence-agents-bladecenter.noarch",
-        "fence-agents-brocade.noarch",
-        "fence-agents-cisco-mds.noarch",
-        "fence-agents-cisco-ucs.noarch",
-        "fence-agents-drac5.noarch",
-        "fence-agents-eaton-snmp.noarch",
-        "fence-agents-emerson.noarch",
-        "fence-agents-eps.noarch",
-        "fence-agents-heuristics-ping.noarch",
-        "fence-agents-hpblade.noarch",
-        "fence-agents-ibmblade.noarch",
-        "fence-agents-ifmib.noarch",
-        "fence-agents-ilo-moonshot.noarch",
-        "fence-agents-ilo-mp.noarch",
-        "fence-agents-ilo-ssh.noarch",
-        "fence-agents-ilo2.noarch",
-        "fence-agents-intelmodular.noarch",
-        "fence-agents-ipdu.noarch",
-        "fence-agents-ipmilan.noarch",
-        "fence-agents-kdump.ppc64le",
-        "fence-agents-lpar.noarch",
-        "fence-agents-mpath.noarch",
-        "fence-agents-openstack.ppc64le",
-        "fence-agents-redfish.ppc64le",
-        "fence-agents-rhevm.noarch",
-        "fence-agents-rsa.noarch",
-        "fence-agents-rsb.noarch",
-        "fence-agents-sbd.noarch",
-        "fence-agents-scsi.noarch",
-        "fence-agents-vmware-rest.noarch",
-        "fence-agents-vmware-soap.noarch",
-        "fence-agents-wti.noarch"
-      ],
-      "gfs2-utils": [
-        "gfs2-utils.ppc64le"
-      ],
-      "kronosnet": [
-        "libknet1-compress-bzip2-plugin.ppc64le",
-        "libknet1-compress-lz4-plugin.ppc64le",
-        "libknet1-compress-lzma-plugin.ppc64le",
-        "libknet1-compress-lzo2-plugin.ppc64le",
-        "libknet1-compress-plugins-all.ppc64le",
-        "libknet1-compress-zlib-plugin.ppc64le",
-        "libknet1-compress-zstd-plugin.ppc64le",
-        "libknet1-crypto-nss-plugin.ppc64le",
-        "libknet1-crypto-openssl-plugin.ppc64le",
-        "libknet1-crypto-plugins-all.ppc64le",
-        "libknet1-plugins-all.ppc64le",
-        "libknet1.ppc64le",
-        "libnozzle1.ppc64le"
-      ],
-      "libqb": [
-        "libqb-devel.ppc64le"
-      ],
-      "libtool": [
-        "libtool-ltdl-devel.ppc64le"
-      ],
-      "openwsman": [
-        "openwsman-python3.ppc64le"
-      ],
-      "pacemaker": [
-        "pacemaker-cli.ppc64le",
-        "pacemaker-cluster-libs.ppc64le",
-        "pacemaker-cts.noarch",
-        "pacemaker-doc.noarch",
-        "pacemaker-libs-devel.ppc64le",
-        "pacemaker-libs.ppc64le",
-        "pacemaker-nagios-plugins-metadata.noarch",
-        "pacemaker-remote.ppc64le",
-        "pacemaker-schemas.noarch",
-        "pacemaker.ppc64le"
-      ],
-      "pcs": [
-        "pcs-snmp.ppc64le",
-        "pcs.ppc64le"
-      ],
-      "resource-agents": [
-        "resource-agents-paf.ppc64le",
-        "resource-agents.ppc64le"
-      ],
-      "samba": [
-        "ctdb.ppc64le"
-      ],
-      "sbd": [
-        "sbd.ppc64le"
-      ],
-      "spausedd": [
-        "spausedd.ppc64le"
-      ]
-    },
-    "s390x": {
-      "booth": [
-        "booth-arbitrator.noarch",
-        "booth-core.s390x",
-        "booth-site.noarch",
-        "booth-test.noarch",
-        "booth.s390x"
-      ],
-      "corosync": [
-        "corosync.s390x",
-        "corosynclib-devel.s390x",
-        "corosynclib.s390x"
-      ],
-      "corosync-qdevice": [
-        "corosync-qdevice.s390x",
-        "corosync-qnetd.s390x"
-      ],
-      "dlm": [
-        "dlm.s390x"
-      ],
-      "fence-agents": [
-        "fence-agents-all.s390x",
-        "fence-agents-amt-ws.noarch",
-        "fence-agents-apc-snmp.noarch",
-        "fence-agents-apc.noarch",
-        "fence-agents-bladecenter.noarch",
-        "fence-agents-brocade.noarch",
-        "fence-agents-cisco-mds.noarch",
-        "fence-agents-cisco-ucs.noarch",
-        "fence-agents-drac5.noarch",
-        "fence-agents-eaton-snmp.noarch",
-        "fence-agents-emerson.noarch",
-        "fence-agents-eps.noarch",
-        "fence-agents-heuristics-ping.noarch",
-        "fence-agents-hpblade.noarch",
-        "fence-agents-ibmblade.noarch",
-        "fence-agents-ifmib.noarch",
-        "fence-agents-ilo-moonshot.noarch",
-        "fence-agents-ilo-mp.noarch",
-        "fence-agents-ilo-ssh.noarch",
-        "fence-agents-ilo2.noarch",
-        "fence-agents-intelmodular.noarch",
-        "fence-agents-ipdu.noarch",
-        "fence-agents-ipmilan.noarch",
-        "fence-agents-kdump.s390x",
-        "fence-agents-mpath.noarch",
-        "fence-agents-redfish.s390x",
-        "fence-agents-rhevm.noarch",
-        "fence-agents-rsa.noarch",
-        "fence-agents-rsb.noarch",
-        "fence-agents-sbd.noarch",
-        "fence-agents-scsi.noarch",
-        "fence-agents-vmware-rest.noarch",
-        "fence-agents-vmware-soap.noarch",
-        "fence-agents-wti.noarch",
-        "fence-agents-zvm.s390x"
-      ],
-      "gfs2-utils": [
-        "gfs2-utils.s390x"
-      ],
-      "kronosnet": [
-        "libknet1-compress-bzip2-plugin.s390x",
-        "libknet1-compress-lz4-plugin.s390x",
-        "libknet1-compress-lzma-plugin.s390x",
-        "libknet1-compress-lzo2-plugin.s390x",
-        "libknet1-compress-plugins-all.s390x",
-        "libknet1-compress-zlib-plugin.s390x",
-        "libknet1-compress-zstd-plugin.s390x",
-        "libknet1-crypto-nss-plugin.s390x",
-        "libknet1-crypto-openssl-plugin.s390x",
-        "libknet1-crypto-plugins-all.s390x",
-        "libknet1-plugins-all.s390x",
-        "libknet1.s390x",
-        "libnozzle1.s390x"
-      ],
-      "libqb": [
-        "libqb-devel.s390x"
-      ],
-      "libtool": [
-        "libtool-ltdl-devel.s390x"
-      ],
-      "openwsman": [
-        "openwsman-python3.s390x"
-      ],
-      "pacemaker": [
-        "pacemaker-cli.s390x",
-        "pacemaker-cluster-libs.s390x",
-        "pacemaker-cts.noarch",
-        "pacemaker-doc.noarch",
-        "pacemaker-libs-devel.s390x",
-        "pacemaker-libs.s390x",
-        "pacemaker-nagios-plugins-metadata.noarch",
-        "pacemaker-remote.s390x",
-        "pacemaker-schemas.noarch",
-        "pacemaker.s390x"
-      ],
-      "pcs": [
-        "pcs-snmp.s390x",
-        "pcs.s390x"
-      ],
-      "resource-agents": [
-        "resource-agents-paf.s390x",
-        "resource-agents.s390x"
-      ],
-      "samba": [
-        "ctdb.s390x"
-      ],
-      "sbd": [
-        "sbd.s390x"
-      ],
-      "spausedd": [
-        "spausedd.s390x"
-      ]
-    },
-    "x86_64": {
-      "booth": [
-        "booth-arbitrator.noarch",
-        "booth-core.x86_64",
-        "booth-site.noarch",
-        "booth-test.noarch",
-        "booth.x86_64"
-      ],
-      "corosync": [
-        "corosync.x86_64",
-        "corosynclib-devel.x86_64"
-      ],
-      "corosync-qdevice": [
-        "corosync-qdevice.x86_64",
-        "corosync-qnetd.x86_64"
-      ],
-      "dlm": [
-        "dlm.x86_64"
-      ],
-      "fence-agents": [
-        "fence-agents-aliyun.x86_64",
-        "fence-agents-all.x86_64",
-        "fence-agents-amt-ws.noarch",
-        "fence-agents-apc-snmp.noarch",
-        "fence-agents-apc.noarch",
-        "fence-agents-aws.x86_64",
-        "fence-agents-azure-arm.x86_64",
-        "fence-agents-bladecenter.noarch",
-        "fence-agents-brocade.noarch",
-        "fence-agents-cisco-mds.noarch",
-        "fence-agents-cisco-ucs.noarch",
-        "fence-agents-drac5.noarch",
-        "fence-agents-eaton-snmp.noarch",
-        "fence-agents-emerson.noarch",
-        "fence-agents-eps.noarch",
-        "fence-agents-gce.x86_64",
-        "fence-agents-heuristics-ping.noarch",
-        "fence-agents-hpblade.noarch",
-        "fence-agents-ibmblade.noarch",
-        "fence-agents-ifmib.noarch",
-        "fence-agents-ilo-moonshot.noarch",
-        "fence-agents-ilo-mp.noarch",
-        "fence-agents-ilo-ssh.noarch",
-        "fence-agents-ilo2.noarch",
-        "fence-agents-intelmodular.noarch",
-        "fence-agents-ipdu.noarch",
-        "fence-agents-ipmilan.noarch",
-        "fence-agents-kdump.x86_64",
-        "fence-agents-mpath.noarch",
-        "fence-agents-openstack.x86_64",
-        "fence-agents-redfish.x86_64",
-        "fence-agents-rhevm.noarch",
-        "fence-agents-rsa.noarch",
-        "fence-agents-rsb.noarch",
-        "fence-agents-sbd.noarch",
-        "fence-agents-scsi.noarch",
-        "fence-agents-vmware-rest.noarch",
-        "fence-agents-vmware-soap.noarch",
-        "fence-agents-wti.noarch",
-        "ha-cloud-support.x86_64"
-      ],
-      "gfs2-utils": [
-        "gfs2-utils.x86_64"
-      ],
-      "kronosnet": [
-        "libknet1-compress-bzip2-plugin.x86_64",
-        "libknet1-compress-lz4-plugin.x86_64",
-        "libknet1-compress-lzma-plugin.x86_64",
-        "libknet1-compress-lzo2-plugin.x86_64",
-        "libknet1-compress-plugins-all.x86_64",
-        "libknet1-compress-zlib-plugin.x86_64",
-        "libknet1-compress-zstd-plugin.x86_64",
-        "libknet1-crypto-nss-plugin.x86_64",
-        "libknet1-crypto-openssl-plugin.x86_64",
-        "libknet1-crypto-plugins-all.x86_64",
-        "libknet1-plugins-all.x86_64",
-        "libknet1.x86_64",
-        "libnozzle1.x86_64"
-      ],
-      "libqb": [
-        "libqb-devel.x86_64"
-      ],
-      "libtool": [
-        "libtool-ltdl-devel.x86_64"
-      ],
-      "openwsman": [
-        "openwsman-python3.x86_64"
-      ],
-      "pacemaker": [
-        "pacemaker-cli.x86_64",
-        "pacemaker-cluster-libs.x86_64",
-        "pacemaker-cts.noarch",
-        "pacemaker-doc.noarch",
-        "pacemaker-libs-devel.x86_64",
-        "pacemaker-libs.x86_64",
-        "pacemaker-nagios-plugins-metadata.noarch",
-        "pacemaker-remote.x86_64",
-        "pacemaker-schemas.noarch",
-        "pacemaker.x86_64"
-      ],
-      "pcs": [
-        "pcs-snmp.x86_64",
-        "pcs.x86_64"
-      ],
-      "resource-agents": [
-        "resource-agents-cloud.x86_64",
-        "resource-agents-paf.x86_64",
-        "resource-agents.x86_64"
-      ],
-      "samba": [
-        "ctdb.x86_64"
-      ],
-      "sbd": [
-        "sbd.x86_64"
-      ],
-      "spausedd": [
-        "spausedd.x86_64"
-      ]
-    }
-  },
   "SAP": {
     "ppc64le": {
       "compat-locales-sap": [
diff --git a/prepopulate.yaml b/prepopulate.yaml
index a0b80f7..5e8e221 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -30511,304 +30511,6 @@ RT:
     - rteval-loads.noarch
     tuned:
     - tuned-profiles-realtime.noarch
-ResilientStorage:
-  ppc64le:
-    booth:
-    - booth-arbitrator.noarch
-    - booth-core.ppc64le
-    - booth-site.noarch
-    - booth-test.noarch
-    - booth.ppc64le
-    corosync:
-    - corosync.ppc64le
-    - corosynclib-devel.ppc64le
-    - corosynclib.ppc64le
-    corosync-qdevice:
-    - corosync-qdevice.ppc64le
-    - corosync-qnetd.ppc64le
-    dlm:
-    - dlm.ppc64le
-    fence-agents:
-    - fence-agents-all.ppc64le
-    - fence-agents-amt-ws.noarch
-    - fence-agents-apc-snmp.noarch
-    - fence-agents-apc.noarch
-    - fence-agents-bladecenter.noarch
-    - fence-agents-brocade.noarch
-    - fence-agents-cisco-mds.noarch
-    - fence-agents-cisco-ucs.noarch
-    - fence-agents-drac5.noarch
-    - fence-agents-eaton-snmp.noarch
-    - fence-agents-emerson.noarch
-    - fence-agents-eps.noarch
-    - fence-agents-heuristics-ping.noarch
-    - fence-agents-hpblade.noarch
-    - fence-agents-ibmblade.noarch
-    - fence-agents-ifmib.noarch
-    - fence-agents-ilo-moonshot.noarch
-    - fence-agents-ilo-mp.noarch
-    - fence-agents-ilo-ssh.noarch
-    - fence-agents-ilo2.noarch
-    - fence-agents-intelmodular.noarch
-    - fence-agents-ipdu.noarch
-    - fence-agents-ipmilan.noarch
-    - fence-agents-kdump.ppc64le
-    - fence-agents-lpar.noarch
-    - fence-agents-mpath.noarch
-    - fence-agents-openstack.ppc64le
-    - fence-agents-redfish.ppc64le
-    - fence-agents-rhevm.noarch
-    - fence-agents-rsa.noarch
-    - fence-agents-rsb.noarch
-    - fence-agents-sbd.noarch
-    - fence-agents-scsi.noarch
-    - fence-agents-vmware-rest.noarch
-    - fence-agents-vmware-soap.noarch
-    - fence-agents-wti.noarch
-    gfs2-utils:
-    - gfs2-utils.ppc64le
-    kronosnet:
-    - libknet1-compress-bzip2-plugin.ppc64le
-    - libknet1-compress-lz4-plugin.ppc64le
-    - libknet1-compress-lzma-plugin.ppc64le
-    - libknet1-compress-lzo2-plugin.ppc64le
-    - libknet1-compress-plugins-all.ppc64le
-    - libknet1-compress-zlib-plugin.ppc64le
-    - libknet1-compress-zstd-plugin.ppc64le
-    - libknet1-crypto-nss-plugin.ppc64le
-    - libknet1-crypto-openssl-plugin.ppc64le
-    - libknet1-crypto-plugins-all.ppc64le
-    - libknet1-plugins-all.ppc64le
-    - libknet1.ppc64le
-    - libnozzle1.ppc64le
-    libqb:
-    - libqb-devel.ppc64le
-    libtool:
-    - libtool-ltdl-devel.ppc64le
-    openwsman:
-    - openwsman-python3.ppc64le
-    pacemaker:
-    - pacemaker-cli.ppc64le
-    - pacemaker-cluster-libs.ppc64le
-    - pacemaker-cts.noarch
-    - pacemaker-doc.noarch
-    - pacemaker-libs-devel.ppc64le
-    - pacemaker-libs.ppc64le
-    - pacemaker-nagios-plugins-metadata.noarch
-    - pacemaker-remote.ppc64le
-    - pacemaker-schemas.noarch
-    - pacemaker.ppc64le
-    pcs:
-    - pcs-snmp.ppc64le
-    - pcs.ppc64le
-    resource-agents:
-    - resource-agents-paf.ppc64le
-    - resource-agents.ppc64le
-    samba:
-    - ctdb.ppc64le
-    sbd:
-    - sbd.ppc64le
-    spausedd:
-    - spausedd.ppc64le
-  s390x:
-    booth:
-    - booth-arbitrator.noarch
-    - booth-core.s390x
-    - booth-site.noarch
-    - booth-test.noarch
-    - booth.s390x
-    corosync:
-    - corosync.s390x
-    - corosynclib-devel.s390x
-    - corosynclib.s390x
-    corosync-qdevice:
-    - corosync-qdevice.s390x
-    - corosync-qnetd.s390x
-    dlm:
-    - dlm.s390x
-    fence-agents:
-    - fence-agents-all.s390x
-    - fence-agents-amt-ws.noarch
-    - fence-agents-apc-snmp.noarch
-    - fence-agents-apc.noarch
-    - fence-agents-bladecenter.noarch
-    - fence-agents-brocade.noarch
-    - fence-agents-cisco-mds.noarch
-    - fence-agents-cisco-ucs.noarch
-    - fence-agents-drac5.noarch
-    - fence-agents-eaton-snmp.noarch
-    - fence-agents-emerson.noarch
-    - fence-agents-eps.noarch
-    - fence-agents-heuristics-ping.noarch
-    - fence-agents-hpblade.noarch
-    - fence-agents-ibmblade.noarch
-    - fence-agents-ifmib.noarch
-    - fence-agents-ilo-moonshot.noarch
-    - fence-agents-ilo-mp.noarch
-    - fence-agents-ilo-ssh.noarch
-    - fence-agents-ilo2.noarch
-    - fence-agents-intelmodular.noarch
-    - fence-agents-ipdu.noarch
-    - fence-agents-ipmilan.noarch
-    - fence-agents-kdump.s390x
-    - fence-agents-mpath.noarch
-    - fence-agents-redfish.s390x
-    - fence-agents-rhevm.noarch
-    - fence-agents-rsa.noarch
-    - fence-agents-rsb.noarch
-    - fence-agents-sbd.noarch
-    - fence-agents-scsi.noarch
-    - fence-agents-vmware-rest.noarch
-    - fence-agents-vmware-soap.noarch
-    - fence-agents-wti.noarch
-    - fence-agents-zvm.s390x
-    gfs2-utils:
-    - gfs2-utils.s390x
-    kronosnet:
-    - libknet1-compress-bzip2-plugin.s390x
-    - libknet1-compress-lz4-plugin.s390x
-    - libknet1-compress-lzma-plugin.s390x
-    - libknet1-compress-lzo2-plugin.s390x
-    - libknet1-compress-plugins-all.s390x
-    - libknet1-compress-zlib-plugin.s390x
-    - libknet1-compress-zstd-plugin.s390x
-    - libknet1-crypto-nss-plugin.s390x
-    - libknet1-crypto-openssl-plugin.s390x
-    - libknet1-crypto-plugins-all.s390x
-    - libknet1-plugins-all.s390x
-    - libknet1.s390x
-    - libnozzle1.s390x
-    libqb:
-    - libqb-devel.s390x
-    libtool:
-    - libtool-ltdl-devel.s390x
-    openwsman:
-    - openwsman-python3.s390x
-    pacemaker:
-    - pacemaker-cli.s390x
-    - pacemaker-cluster-libs.s390x
-    - pacemaker-cts.noarch
-    - pacemaker-doc.noarch
-    - pacemaker-libs-devel.s390x
-    - pacemaker-libs.s390x
-    - pacemaker-nagios-plugins-metadata.noarch
-    - pacemaker-remote.s390x
-    - pacemaker-schemas.noarch
-    - pacemaker.s390x
-    pcs:
-    - pcs-snmp.s390x
-    - pcs.s390x
-    resource-agents:
-    - resource-agents-paf.s390x
-    - resource-agents.s390x
-    samba:
-    - ctdb.s390x
-    sbd:
-    - sbd.s390x
-    spausedd:
-    - spausedd.s390x
-  x86_64:
-    booth:
-    - booth-arbitrator.noarch
-    - booth-core.x86_64
-    - booth-site.noarch
-    - booth-test.noarch
-    - booth.x86_64
-    corosync:
-    - corosync.x86_64
-    - corosynclib-devel.x86_64
-    corosync-qdevice:
-    - corosync-qdevice.x86_64
-    - corosync-qnetd.x86_64
-    dlm:
-    - dlm.x86_64
-    fence-agents:
-    - fence-agents-aliyun.x86_64
-    - fence-agents-all.x86_64
-    - fence-agents-amt-ws.noarch
-    - fence-agents-apc-snmp.noarch
-    - fence-agents-apc.noarch
-    - fence-agents-aws.x86_64
-    - fence-agents-azure-arm.x86_64
-    - fence-agents-bladecenter.noarch
-    - fence-agents-brocade.noarch
-    - fence-agents-cisco-mds.noarch
-    - fence-agents-cisco-ucs.noarch
-    - fence-agents-drac5.noarch
-    - fence-agents-eaton-snmp.noarch
-    - fence-agents-emerson.noarch
-    - fence-agents-eps.noarch
-    - fence-agents-gce.x86_64
-    - fence-agents-heuristics-ping.noarch
-    - fence-agents-hpblade.noarch
-    - fence-agents-ibmblade.noarch
-    - fence-agents-ifmib.noarch
-    - fence-agents-ilo-moonshot.noarch
-    - fence-agents-ilo-mp.noarch
-    - fence-agents-ilo-ssh.noarch
-    - fence-agents-ilo2.noarch
-    - fence-agents-intelmodular.noarch
-    - fence-agents-ipdu.noarch
-    - fence-agents-ipmilan.noarch
-    - fence-agents-kdump.x86_64
-    - fence-agents-mpath.noarch
-    - fence-agents-openstack.x86_64
-    - fence-agents-redfish.x86_64
-    - fence-agents-rhevm.noarch
-    - fence-agents-rsa.noarch
-    - fence-agents-rsb.noarch
-    - fence-agents-sbd.noarch
-    - fence-agents-scsi.noarch
-    - fence-agents-vmware-rest.noarch
-    - fence-agents-vmware-soap.noarch
-    - fence-agents-wti.noarch
-    - ha-cloud-support.x86_64
-    gfs2-utils:
-    - gfs2-utils.x86_64
-    kronosnet:
-    - libknet1-compress-bzip2-plugin.x86_64
-    - libknet1-compress-lz4-plugin.x86_64
-    - libknet1-compress-lzma-plugin.x86_64
-    - libknet1-compress-lzo2-plugin.x86_64
-    - libknet1-compress-plugins-all.x86_64
-    - libknet1-compress-zlib-plugin.x86_64
-    - libknet1-compress-zstd-plugin.x86_64
-    - libknet1-crypto-nss-plugin.x86_64
-    - libknet1-crypto-openssl-plugin.x86_64
-    - libknet1-crypto-plugins-all.x86_64
-    - libknet1-plugins-all.x86_64
-    - libknet1.x86_64
-    - libnozzle1.x86_64
-    libqb:
-    - libqb-devel.x86_64
-    libtool:
-    - libtool-ltdl-devel.x86_64
-    openwsman:
-    - openwsman-python3.x86_64
-    pacemaker:
-    - pacemaker-cli.x86_64
-    - pacemaker-cluster-libs.x86_64
-    - pacemaker-cts.noarch
-    - pacemaker-doc.noarch
-    - pacemaker-libs-devel.x86_64
-    - pacemaker-libs.x86_64
-    - pacemaker-nagios-plugins-metadata.noarch
-    - pacemaker-remote.x86_64
-    - pacemaker-schemas.noarch
-    - pacemaker.x86_64
-    pcs:
-    - pcs-snmp.x86_64
-    - pcs.x86_64
-    resource-agents:
-    - resource-agents-cloud.x86_64
-    - resource-agents-paf.x86_64
-    - resource-agents.x86_64
-    samba:
-    - ctdb.x86_64
-    sbd:
-    - sbd.x86_64
-    spausedd:
-    - spausedd.x86_64
 SAP:
   ppc64le:
     compat-locales-sap:
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 7ca7848..382f123 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -1,5 +1,5 @@
 filter_packages = [
-     ("^(BaseOS|AppStream|CRB|HighAvailability|ResilientStorage|SAP|SAPHANA)$", {
+     ("^(BaseOS|AppStream|CRB|HighAvailability|SAP|SAPHANA)$", {
          "*": [
              "kernel-rt*", #RhBug 1973568
              "javapackages-bootstrap", #CS-636
diff --git a/shared/buildinstall.conf b/shared/buildinstall.conf
index d4ab61b..c460556 100644
--- a/shared/buildinstall.conf
+++ b/shared/buildinstall.conf
@@ -11,7 +11,7 @@ lorax_options = [
 
 buildinstall_skip = [
     EXTRA_BUILDINSTALL_SKIP,
-    ("^(AppStream|CRB|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV)$", {
+    ("^(AppStream|CRB|HighAvailability|SAP|SAPHANA|RT|NFV)$", {
         '*': True
     }),
 ]
diff --git a/shared/lookaside.conf b/shared/lookaside.conf
index abe6ef4..58a9786 100644
--- a/shared/lookaside.conf
+++ b/shared/lookaside.conf
@@ -2,8 +2,6 @@ variant_as_lookaside = [
     ("AppStream", "BaseOS"),
     ("HighAvailability", "BaseOS"),
     ("HighAvailability", "AppStream"),
-    ("ResilientStorage", "BaseOS"),
-    ("ResilientStorage", "AppStream"),
     ("RT", "BaseOS"),
     ("RT", "AppStream"),
     ("NFV", "BaseOS"),
diff --git a/variants.xml b/variants.xml
index a4e8540..f5e0dca 100644
--- a/variants.xml
+++ b/variants.xml
@@ -168,19 +168,6 @@
 
     <!-- ADDONS (Defined as variants in RHEL-10) -->
 
-    <variant id="ResilientStorage" name="Resilient Storage" type="variant">
-        <arches>
-            <arch>ppc64le</arch>
-            <arch>s390x</arch>
-            <arch>x86_64</arch>
-        </arches>
-        <groups>
-            <group default="true">ha</group>
-            <group default="true">ha-devel</group>
-            <group default="true">resilient-storage</group>
-        </groups>
-    </variant>
-
     <variant id="HighAvailability" name="High Availability" type="variant">
         <arches>
             <arch>aarch64</arch>