diff --git a/autocatalog.cfg b/autocatalog.cfg
index 51f2970..55aba1e 100644
--- a/autocatalog.cfg
+++ b/autocatalog.cfg
@@ -43,6 +43,7 @@ exclude_filter {
     key: "*"
     glob_match: "kernel-rt*"
     glob_match: "javapackages-bootstrap"
+    glob_match: "insights-client*"
   }
 }
 exclude_filter {
@@ -299,6 +300,75 @@ exclude_filter {
     glob_match: "grub2-ppc64le-modules"
   }
 }
+exclude_filter {
+  repo_match: "^HighAvailability$"
+  arch {
+    key: "aarch64"
+    glob_match: "fence-agents-lpar"
+  }
+  arch {
+    key: "s390x"
+    glob_match: "fence-agents-lpar"
+  }
+  arch {
+    key: "x86_64"
+    glob_match: "fence-agents-lpar"
+  }
+}
+exclude_filter {
+  repo_match: "^ResilientStorage$"
+  arch {
+    key: "aarch64"
+    glob_match: "fence-agents-amt-ws"
+    glob_match: "fence-agents-apc-snmp"
+    glob_match: "fence-agents-apc"
+    glob_match: "fence-agents-bladecenter"
+    glob_match: "fence-agents-brocade"
+    glob_match: "fence-agents-cisco-mds"
+    glob_match: "fence-agents-cisco-ucs"
+    glob_match: "fence-agents-drac5"
+    glob_match: "fence-agents-eaton-snmp"
+    glob_match: "fence-agents-emerson"
+    glob_match: "fence-agents-eps"
+    glob_match: "fence-agents-heuristics-ping"
+    glob_match: "fence-agents-hpblade"
+    glob_match: "fence-agents-ibmblade"
+    glob_match: "fence-agents-ifmib"
+    glob_match: "fence-agents-ilo-moonshot"
+    glob_match: "fence-agents-ilo-mp"
+    glob_match: "fence-agents-ilo-ssh"
+    glob_match: "fence-agents-ilo2"
+    glob_match: "fence-agents-intelmodular"
+    glob_match: "fence-agents-ipdu"
+    glob_match: "fence-agents-ipmilan"
+    glob_match: "fence-agents-lpar"
+    glob_match: "fence-agents-mpath"
+    glob_match: "fence-agents-rhevm"
+    glob_match: "fence-agents-rsa"
+    glob_match: "fence-agents-rsb"
+    glob_match: "fence-agents-sbd"
+    glob_match: "fence-agents-scsi"
+    glob_match: "fence-agents-vmware-rest"
+    glob_match: "fence-agents-vmware-soap"
+    glob_match: "fence-agents-wti"
+    glob_match: "booth-arbitrator"
+    glob_match: "booth-site"
+    glob_match: "booth-test"
+    glob_match: "pacemaker-cts"
+    glob_match: "pacemaker-doc"
+    glob_match: "pacemaker-nagios-plugins-metadata"
+    glob_match: "pacemaker-schemas"
+    glob_match: "python3-pacemaker"
+  }
+  arch {
+    key: "s390x"
+    glob_match: "fence-agents-lpar"
+  }
+  arch {
+    key: "x86_64"
+    glob_match: "fence-agents-lpar"
+  }
+}
 exclude_filter {
   repo_match: "^NFV$"
   arch {
@@ -368,20 +438,6 @@ exclude_filter {
     glob_match: "tuned-profiles-sap-hana"
   }
 }
-exclude_filter {
-  repo_match: "^ResilientStorage$"
-  arch {
-    key: "aarch64"
-    glob_match: "booth-arbitrator"
-    glob_match: "booth-site"
-    glob_match: "booth-test"
-    glob_match: "pacemaker-cts"
-    glob_match: "pacemaker-doc"
-    glob_match: "pacemaker-nagios-plugins-metadata"
-    glob_match: "pacemaker-schemas"
-    glob_match: "python3-pacemaker"
-  }
-}
 
 package {
   name: "389-ds-base"
@@ -4293,6 +4349,137 @@ package {
     multilib: "x86_64"
   }
 }
+package {
+  name: "fence-agents"
+  type: PACKAGE_TYPE_NORMAL_FORK
+  repository {
+    name: "AppStream"
+    include_filter: "fence-agents-common.noarch"
+    include_filter: "fence-agents-ibm-powervs.noarch"
+    include_filter: "fence-agents-ibm-vpc.noarch"
+    include_filter: "fence-agents-kubevirt.aarch64"
+    include_filter: "fence-agents-virsh.noarch"
+    include_filter: "fence-agents-compute.ppc64le"
+    include_filter: "fence-agents-kubevirt.ppc64le"
+    include_filter: "fence-agents-kubevirt.s390x"
+    include_filter: "fence-agents-compute.x86_64"
+    include_filter: "fence-agents-kubevirt.x86_64"
+    include_filter: "fence-virt.x86_64"
+    include_filter: "fence-virtd-cpg.x86_64"
+    include_filter: "fence-virtd-libvirt.x86_64"
+    include_filter: "fence-virtd-multicast.x86_64"
+    include_filter: "fence-virtd-serial.x86_64"
+    include_filter: "fence-virtd-tcp.x86_64"
+    include_filter: "fence-virtd.x86_64"
+  }
+  repository {
+    name: "HighAvailability"
+    include_filter: "fence-agents-all.aarch64"
+    include_filter: "fence-agents-amt-ws.noarch"
+    include_filter: "fence-agents-apc-snmp.noarch"
+    include_filter: "fence-agents-apc.noarch"
+    include_filter: "fence-agents-bladecenter.noarch"
+    include_filter: "fence-agents-brocade.noarch"
+    include_filter: "fence-agents-cisco-mds.noarch"
+    include_filter: "fence-agents-cisco-ucs.noarch"
+    include_filter: "fence-agents-drac5.noarch"
+    include_filter: "fence-agents-eaton-snmp.noarch"
+    include_filter: "fence-agents-emerson.noarch"
+    include_filter: "fence-agents-eps.noarch"
+    include_filter: "fence-agents-heuristics-ping.noarch"
+    include_filter: "fence-agents-hpblade.noarch"
+    include_filter: "fence-agents-ibmblade.noarch"
+    include_filter: "fence-agents-ifmib.noarch"
+    include_filter: "fence-agents-ilo-moonshot.noarch"
+    include_filter: "fence-agents-ilo-mp.noarch"
+    include_filter: "fence-agents-ilo-ssh.noarch"
+    include_filter: "fence-agents-ilo2.noarch"
+    include_filter: "fence-agents-intelmodular.noarch"
+    include_filter: "fence-agents-ipdu.noarch"
+    include_filter: "fence-agents-ipmilan.noarch"
+    include_filter: "fence-agents-kdump.aarch64"
+    include_filter: "fence-agents-mpath.noarch"
+    include_filter: "fence-agents-redfish.aarch64"
+    include_filter: "fence-agents-rhevm.noarch"
+    include_filter: "fence-agents-rsa.noarch"
+    include_filter: "fence-agents-rsb.noarch"
+    include_filter: "fence-agents-sbd.noarch"
+    include_filter: "fence-agents-scsi.noarch"
+    include_filter: "fence-agents-vmware-rest.noarch"
+    include_filter: "fence-agents-vmware-soap.noarch"
+    include_filter: "fence-agents-wti.noarch"
+    include_filter: "fence-agents-all.ppc64le"
+    include_filter: "fence-agents-kdump.ppc64le"
+    include_filter: "fence-agents-lpar.noarch"
+    include_filter: "fence-agents-openstack.ppc64le"
+    include_filter: "fence-agents-redfish.ppc64le"
+    include_filter: "fence-agents-all.s390x"
+    include_filter: "fence-agents-kdump.s390x"
+    include_filter: "fence-agents-redfish.s390x"
+    include_filter: "fence-agents-zvm.s390x"
+    include_filter: "fence-agents-aliyun.x86_64"
+    include_filter: "fence-agents-all.x86_64"
+    include_filter: "fence-agents-aws.x86_64"
+    include_filter: "fence-agents-azure-arm.x86_64"
+    include_filter: "fence-agents-gce.x86_64"
+    include_filter: "fence-agents-kdump.x86_64"
+    include_filter: "fence-agents-openstack.x86_64"
+    include_filter: "fence-agents-redfish.x86_64"
+    include_filter: "ha-cloud-support.x86_64"
+  }
+  repository {
+    name: "ResilientStorage"
+    include_filter: "fence-agents-all.ppc64le"
+    include_filter: "fence-agents-amt-ws.noarch"
+    include_filter: "fence-agents-apc-snmp.noarch"
+    include_filter: "fence-agents-apc.noarch"
+    include_filter: "fence-agents-bladecenter.noarch"
+    include_filter: "fence-agents-brocade.noarch"
+    include_filter: "fence-agents-cisco-mds.noarch"
+    include_filter: "fence-agents-cisco-ucs.noarch"
+    include_filter: "fence-agents-drac5.noarch"
+    include_filter: "fence-agents-eaton-snmp.noarch"
+    include_filter: "fence-agents-emerson.noarch"
+    include_filter: "fence-agents-eps.noarch"
+    include_filter: "fence-agents-heuristics-ping.noarch"
+    include_filter: "fence-agents-hpblade.noarch"
+    include_filter: "fence-agents-ibmblade.noarch"
+    include_filter: "fence-agents-ifmib.noarch"
+    include_filter: "fence-agents-ilo-moonshot.noarch"
+    include_filter: "fence-agents-ilo-mp.noarch"
+    include_filter: "fence-agents-ilo-ssh.noarch"
+    include_filter: "fence-agents-ilo2.noarch"
+    include_filter: "fence-agents-intelmodular.noarch"
+    include_filter: "fence-agents-ipdu.noarch"
+    include_filter: "fence-agents-ipmilan.noarch"
+    include_filter: "fence-agents-kdump.ppc64le"
+    include_filter: "fence-agents-lpar.noarch"
+    include_filter: "fence-agents-mpath.noarch"
+    include_filter: "fence-agents-openstack.ppc64le"
+    include_filter: "fence-agents-redfish.ppc64le"
+    include_filter: "fence-agents-rhevm.noarch"
+    include_filter: "fence-agents-rsa.noarch"
+    include_filter: "fence-agents-rsb.noarch"
+    include_filter: "fence-agents-sbd.noarch"
+    include_filter: "fence-agents-scsi.noarch"
+    include_filter: "fence-agents-vmware-rest.noarch"
+    include_filter: "fence-agents-vmware-soap.noarch"
+    include_filter: "fence-agents-wti.noarch"
+    include_filter: "fence-agents-all.s390x"
+    include_filter: "fence-agents-kdump.s390x"
+    include_filter: "fence-agents-redfish.s390x"
+    include_filter: "fence-agents-zvm.s390x"
+    include_filter: "fence-agents-aliyun.x86_64"
+    include_filter: "fence-agents-all.x86_64"
+    include_filter: "fence-agents-aws.x86_64"
+    include_filter: "fence-agents-azure-arm.x86_64"
+    include_filter: "fence-agents-gce.x86_64"
+    include_filter: "fence-agents-kdump.x86_64"
+    include_filter: "fence-agents-openstack.x86_64"
+    include_filter: "fence-agents-redfish.x86_64"
+    include_filter: "ha-cloud-support.x86_64"
+  }
+}
 package {
   name: "fetchmail"
   type: PACKAGE_TYPE_NORMAL_FORK