diff --git a/configs/rhel-sst-display-i18n--icu-compat.yaml b/configs/rhel-sst-display-i18n--icu-compat.yaml
index 592ef7ce..e7765216 100644
--- a/configs/rhel-sst-display-i18n--icu-compat.yaml
+++ b/configs/rhel-sst-display-i18n--icu-compat.yaml
@@ -18,7 +18,7 @@ data:
     # libicu.  At that point, CR will continue to handle the compat package 
     # normally until all dependents have been updated for the new libicu 
     # version, at which point the compat package will drop out of ELN.
-    - 'libicudata.so.76()(64bit)'
+    - 'libicudata.so.77()(64bit)'
   labels:
     - eln
     # cNs stays on a single ICU version once branched
diff --git a/configs/rhel-sst-high-availability--userspace.yaml b/configs/rhel-sst-high-availability--userspace.yaml
index 9642c330..95719e0e 100644
--- a/configs/rhel-sst-high-availability--userspace.yaml
+++ b/configs/rhel-sst-high-availability--userspace.yaml
@@ -4,257 +4,57 @@ data:
   name: HA
   description: HA needed packages
   maintainer: rhel-sst-high-availability
-  packages: []
+  packages:
+    - booth
+    - booth-arbitrator
+    - booth-core
+    - booth-site
+    - booth-test
+    - cockpit-ha-cluster
+    - corosync-qdevice
+    - corosync-qnetd
+    - corosynclib-devel
+    - fence-agents-all
+    - haproxy
+    - ipvsadm
+    - keepalived
+    - libknet1
+    - libknet1-compress-bzip2-plugin
+    - libknet1-compress-lz4-plugin
+    - libknet1-compress-lzma-plugin
+    - libknet1-compress-lzo2-plugin
+    - libknet1-compress-plugins-all
+    - libknet1-compress-zlib-plugin
+    - libknet1-crypto-openssl-plugin
+    - libknet1-crypto-plugins-all
+    - libknet1-devel
+    - libknet1-plugins-all
+    - libnozzle1
+    - libnozzle1-devel
+    - omping
+    - pacemaker-cts
+    - pacemaker-doc
+    - pacemaker-libs-devel
+    - pacemaker-remote
+    - pcs
+    - pcs-snmp
+    - resource-agents
+    - sbd
+    - spausedd
+  arch_packages:
+    aarch64:
+      - fence-virtd-cpg
+      - fence-virtd-libvirt
+      - fence-virtd-multicast
+      - fence-virtd-serial
+      - fence-virtd-tcp
+    x86_64:
+      - fence-virtd-cpg
+      - fence-virtd-libvirt
+      - fence-virtd-multicast
+      - fence-virtd-serial
+      - fence-virtd-tcp
   package_placeholders:
-    - srpm_name: fence-agents
-      build_dependencies: []
-      limit_arches:
-        - x86_64
-        - ppc64le
-        - s390x
-      rpms:
-        - rpm_name: fence-agents-all
-          description: Built with bundled dependencies in RHEL
-          # all is a metapackage, but placeholders cannot list dependencies
-          # on other placeholders, so just list the unlisted subpackages deps
-          dependencies:
-            # fence-agents-common (placeholder)
-            - device-mapper-multipath
-            - gnutls-utils
-            - net-snmp-utils
-            - openssh-clients
-        - rpm_name: fence-agents-aliyun
-          description: This package is only provided in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            # ha-cloud-support (placeholder)
-            - python3-jmespath
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-agents-amt-ws
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            - openwsman-python3
-        - rpm_name: fence-agents-aws
-          description: Built with bundled dependencies in RHEL
-          dependencies: []
-          # fence-agents-common (placeholder)
-          # ha-cloud-support (placeholder)
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-agents-azure-arm
-          description: Built with bundled dependencies in RHEL
-          dependencies: []
-          # fence-agents-common (placeholder)
-          # ha-cloud-support (placeholder)
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-agents-common
-          description: Built with bundled dependencies in RHEL
-          dependencies: []
-        - rpm_name: fence-agents-compute
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            - python3-requests
-          limit_arches:
-            - x86_64
-            - ppc64le
-        - rpm_name: fence-agents-gce
-          description: Built with bundled dependencies in RHEL
-          dependencies: []
-          # fence-agents-common (placeholder)
-          # ha-cloud-support (placeholder)
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-agents-ipmilan
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            - ipmitool
-        - rpm_name: fence-agents-kubevirt
-          description: Built with bundled dependencies in RHEL
-          dependencies: []
-          # fence-agents-common (placeholder)
-        - rpm_name: fence-agents-lpar
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            - openssh-clients
-          limit_arches:
-            - ppc64le
-        - rpm_name: fence-agents-openstack
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            - python3-requests
-          limit_arches:
-            - x86_64
-            - ppc64le
-        - rpm_name: fence-agents-sbd
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            - sbd
-        - rpm_name: fence-agents-scsi
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            - sg3_utils
-        - rpm_name: fence-agents-virsh
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            # fence-agents-common (placeholder)
-            - libvirt-client
-            - openssh-clients
-        - rpm_name: fence-agents-zvm
-          description: Built with bundled dependencies in RHEL
-          dependencies: []
-          # fence-agents-common (placeholder)
-          limit_arches:
-            - s390x
-        - rpm_name: fence-virt
-          description: Provides bundled dependencies for RHEL
-          dependencies:
-            - systemd-sysv
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-virtd
-          description: Provides bundled dependencies for RHEL
-          dependencies: []
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-virtd-cpg
-          description: Provides bundled dependencies for RHEL
-          dependencies:
-            - corosynclib
-            # fence-virtd (placeholder)
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-virtd-libvirt
-          description: Provides bundled dependencies for RHEL
-          dependencies:
-            - libvirt
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-virtd-multicast
-          description: Provides bundled dependencies for RHEL
-          dependencies: []
-          # fence-virtd (placeholder)
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-virtd-serial
-          description: Provides bundled dependencies for RHEL
-          dependencies:
-            - libvirt
-          limit_arches:
-            - x86_64
-        - rpm_name: fence-virtd-tcp
-          description: Provides bundled dependencies for RHEL
-          dependencies: []
-          # fence-virtd (placeholder)
-          limit_arches:
-            - x86_64
-        - rpm_name: ha-cloud-support
-          description: Provides bundled dependencies for RHEL
-          dependencies:
-            - python3
-          limit_arches:
-            - x86_64
-    - srpm_name: pcs
-      build_dependencies:
-        - autoconf
-        - automake
-        - booth
-        - coreutils
-        - corosync-devel
-        - corosync-qdevice-devel
-        - diffstat
-        - findutils
-        - gcc
-        - gcc-c++
-        - git-core
-        - libappstream-glib
-        - libcurl-devel
-        - libffi-devel
-        - make
-        - nodejs-npm
-        - nss-tools
-        - openssl-devel
-        - pacemaker-libs-devel
-        - pam
-        - pkgconfig
-        - python3-cryptography
-        - python3-dateutil
-        - python3-devel
-        - python3-lxml
-        - python3-pip
-        - python3-pyparsing
-        - python3-setuptools
-        - python3-tornado
-        - ruby
-        - ruby-devel
-        - rubygem-bundler
-        - rubygem-json
-        - rubygem-rexml
-        - rubygem-test-unit
-        - rubygems
-        - sbd
-        - systemd-rpm-macros
-        - tar
-      limit_arches:
-        - x86_64
-        - ppc64le
-        - s390x
-      rpms:
-        - rpm_name: pcs
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            - corosync
-            - libcurl
-            - libffi
-            - libknet1-plugins-all
-            - logrotate
-            - nss-tools
-            - openssl-libs
-            - pacemaker-cli
-            - pam
-            - pcmk-cluster-manager
-            - pkgconfig
-            - psmisc
-            - python3
-            - python3-cryptography
-            - python3-dateutil
-            - python3-lxml
-            - python3-pyparsing
-            - python3-tornado
-            - ruby
-            - rubygem-json
-            - rubygem-rexml
-            - rubygems
-          limit_arches:
-            - x86_64
-            - ppc64le
-            - s390x
-        - rpm_name: pcs-snmp
-          description: Built with bundled dependencies in RHEL
-          dependencies:
-            - net-snmp
-            - pacemaker
-            # pcs (placeholder)
-          limit_arches:
-            - x86_64
-            - ppc64le
-            - s390x
-        - rpm_name: cockpit-ha-cluster
-          dependencies:
-            - cockpit-bridge
-            # pcs (placeholder)
-          limit_arches:
-            - x86_64
-            - ppc64le
-            - s390x
     - srpm_name: resource-agents
       build_dependencies: []
       limit_arches: []
@@ -262,112 +62,10 @@ data:
         - rpm_name: resource-agents-cloud
           description: This package is only provided in RHEL
           dependencies:
-            # ha-cloud-support (placeholder)
+            - ha-cloud-support
             - socat
           limit_arches:
             - x86_64
-  arch_packages:
-    # No packages from HA currently support aarch64.
-    # aarch64:
-    ppc64le:
-      - booth
-      - booth-arbitrator
-      - booth-core
-      - booth-site
-      - booth-test
-      - corosync-qdevice
-      - corosync-qnetd
-      - corosynclib-devel
-      - haproxy
-      - ipvsadm
-      - keepalived
-      - libknet1
-      - libknet1-compress-bzip2-plugin
-      - libknet1-compress-lz4-plugin
-      - libknet1-compress-lzma-plugin
-      - libknet1-compress-lzo2-plugin
-      - libknet1-compress-plugins-all
-      - libknet1-compress-zlib-plugin
-      - libknet1-crypto-openssl-plugin
-      - libknet1-crypto-plugins-all
-      - libknet1-devel
-      - libknet1-plugins-all
-      - libnozzle1
-      - libnozzle1-devel
-      - omping
-      - pacemaker-cts
-      - pacemaker-doc
-      - pacemaker-libs-devel
-      - pacemaker-remote
-      - resource-agents
-      - sbd
-      - spausedd
-    s390x:
-      - booth
-      - booth-arbitrator
-      - booth-core
-      - booth-site
-      - booth-test
-      - corosync-qdevice
-      - corosync-qnetd
-      - corosynclib-devel
-      - haproxy
-      - ipvsadm
-      - keepalived
-      - libknet1
-      - libknet1-compress-bzip2-plugin
-      - libknet1-compress-lz4-plugin
-      - libknet1-compress-lzma-plugin
-      - libknet1-compress-lzo2-plugin
-      - libknet1-compress-plugins-all
-      - libknet1-compress-zlib-plugin
-      - libknet1-crypto-openssl-plugin
-      - libknet1-crypto-plugins-all
-      - libknet1-devel
-      - libknet1-plugins-all
-      - libnozzle1
-      - libnozzle1-devel
-      - omping
-      - pacemaker-cts
-      - pacemaker-doc
-      - pacemaker-libs-devel
-      - pacemaker-remote
-      - resource-agents
-      - sbd
-      - spausedd
-    x86_64:
-      - booth
-      - booth-arbitrator
-      - booth-core
-      - booth-site
-      - booth-test
-      - corosync-qdevice
-      - corosync-qnetd
-      - corosynclib-devel
-      - haproxy
-      - ipvsadm
-      - keepalived
-      - libknet1
-      - libknet1-compress-bzip2-plugin
-      - libknet1-compress-lz4-plugin
-      - libknet1-compress-lzma-plugin
-      - libknet1-compress-lzo2-plugin
-      - libknet1-compress-plugins-all
-      - libknet1-compress-zlib-plugin
-      - libknet1-crypto-openssl-plugin
-      - libknet1-crypto-plugins-all
-      - libknet1-devel
-      - libknet1-plugins-all
-      - libnozzle1
-      - libnozzle1-devel
-      - omping
-      - pacemaker-cts
-      - pacemaker-doc
-      - pacemaker-libs-devel
-      - pacemaker-remote
-      - resource-agents
-      - sbd
-      - spausedd
   labels:
     - eln
     - c10s