diff --git a/configs/rhel-java--unwanted.yaml b/configs/rhel-java--unwanted.yaml
index e0c92878..1ec4b1ee 100644
--- a/configs/rhel-java--unwanted.yaml
+++ b/configs/rhel-java--unwanted.yaml
@@ -2,12 +2,11 @@ document: feedback-pipeline-unwanted
 version: 1
 data:
   name: OpenJDK Unwanted Packages
-  description: Packages that OpenJDK maintainers do not wish to maintain in RHEL 9
+  description: Packages that OpenJDK maintainers do not wish to maintain in RHEL
   maintainer: rhel-java
   labels:
     - eln
-    - c10s
-  unwanted_packages:
+  unwanted_source_packages:
     # RHEL should only get explicitly versioned JDKs (e.g. java-17-openjdk), not the rolling java-latest-openjdk
     - java-latest-openjdk
     - java-latest-openjdk-portable
@@ -17,68 +16,9 @@ data:
     - rhino
     # Older JDKs are due to reach end of life in the next few years
     - java-1.8.0-openjdk
-    - java-1.8.0-openjdk-demo
-    - java-1.8.0-openjdk-devel
-    - java-1.8.0-openjdk-headless
-    - java-1.8.0-openjdk-javadoc
-    - java-1.8.0-openjdk-javadoc-zip
-    - java-1.8.0-openjdk-src
     - java-11-openjdk
-    - java-11-openjdk-demo
-    - java-11-openjdk-devel
-    - java-11-openjdk-headless
-    - java-11-openjdk-javadoc
-    - java-11-openjdk-javadoc-zip
-    - java-11-openjdk-jmods
-    - java-11-openjdk-src
-    - java-11-openjdk-static-libs
     - java-17-openjdk
-    - java-17-openjdk-demo
-    - java-17-openjdk-devel
-    - java-17-openjdk-headless
-    - java-17-openjdk-javadoc
-    - java-17-openjdk-javadoc-zip
-    - java-17-openjdk-jmods
-    - java-17-openjdk-src
-    - java-17-openjdk-static-libs
-    - java-11-openjdk-slowdebug
-    - java-11-openjdk-demo-slowdebug
-    - java-11-openjdk-devel-slowdebug
-    - java-11-openjdk-headless-slowdebug
-    - java-11-openjdk-jmods-slowdebug
-    - java-11-openjdk-src-slowdebug
-    - java-11-openjdk-static-libs-slowdebug
-    - java-17-openjdk-slowdebug
-    - java-17-openjdk-demo-slowdebug
-    - java-17-openjdk-devel-slowdebug
-    - java-17-openjdk-headless-slowdebug
-    - java-17-openjdk-jmods-slowdebug
-    - java-17-openjdk-src-slowdebug
-    - java-17-openjdk-static-libs-slowdebug
-    - java-1.8.0-openjdk-slowdebug
-    - java-1.8.0-openjdk-demo-slowdebug
-    - java-1.8.0-openjdk-devel-slowdebug
-    - java-1.8.0-openjdk-headless-slowdebug
-    - java-1.8.0-openjdk-src-slowdebug
-    - java-1.8.0-openjdk-fastdebug
-    - java-1.8.0-openjdk-demo-fastdebug
-    - java-1.8.0-openjdk-devel-fastdebug
-    - java-1.8.0-openjdk-headless-fastdebug
-    - java-1.8.0-openjdk-src-fastdebug
-    - java-11-openjdk-fastdebug
-    - java-11-openjdk-demo-fastdebug
-    - java-11-openjdk-devel-fastdebug
-    - java-11-openjdk-headless-fastdebug
-    - java-11-openjdk-jmods-fastdebug
-    - java-11-openjdk-src-fastdebug
-    - java-11-openjdk-static-libs-fastdebug
-    - java-17-openjdk-fastdebug
-    - java-17-openjdk-demo-fastdebug
-    - java-17-openjdk-devel-fastdebug
-    - java-17-openjdk-headless-fastdebug
-    - java-17-openjdk-jmods-fastdebug
-    - java-17-openjdk-src-fastdebug
-    - java-17-openjdk-static-libs-fastdebug
+    - java-21-openjdk
     # RHEL has its own portable/single build setup which uses a branch (openjdk-portable-rhel-8) rather than a separate package
     - java-1.8.0-openjdk-portable
     - java-11-openjdk-portable
diff --git a/configs/rhel-pt-dotnet--unwanted.yaml b/configs/rhel-pt-dotnet--unwanted.yaml
index 5384b5cb..c3dbba45 100644
--- a/configs/rhel-pt-dotnet--unwanted.yaml
+++ b/configs/rhel-pt-dotnet--unwanted.yaml
@@ -6,28 +6,16 @@ data:
   maintainer: rhel-pt-dotnet
   labels:
     - eln
-  unwanted_packages:
+  unwanted_source_packages:
     # We do not want to ship .NET Core 3.1 which will be EOL by late 2022
-    - dotnet-sdk-3.1
-    - dotnet-runtime-3.1
-    - aspnetcore-runtime-3.1
+    - dotnet3.1
     # We do not want to ship .NET 5.0 which will be EOL by early 2022
-    - dotnet-sdk-5.0
-    - dotnet-runtime-5.0
-    - aspnetcore-runtime-5.0
+    - dotnet5.0
     # We do not want to ship .NET 6.0 which will be EOL by late 2024
-    - dotnet-sdk-6.0
-    - dotnet-runtime-6.0
-    - aspnetcore-runtime-6.0
+    - dotnet6.0
     # We do not want to ship .NET 7.0 which will be EOL by mid 2024
-    - dotnet-sdk-7.0
-    - dotnet-runtime-7.0
-    - aspnetcore-runtime-7.0
+    - dotnet7.0
     # We do not want to ship .NET 8.0 which will be EOL by late 2026
-    - dotnet-sdk-8.0
-    - dotnet-runtime-8.0
-    - aspnetcore-runtime-8.0
+    - dotnet8.0
     # We do not want to ship .NET 9.0 which will be EOL by late 2026
-    - dotnet-sdk-9.0
-    - dotnet-runtime-9.0
-    - aspnetcore-runtime-9.0
+    - dotnet9.0
diff --git a/configs/rhel-pt-llvm-rust--multilib-unwanted.yaml b/configs/rhel-pt-llvm-rust--multilib-unwanted.yaml
index 06d7352d..047510cd 100644
--- a/configs/rhel-pt-llvm-rust--multilib-unwanted.yaml
+++ b/configs/rhel-pt-llvm-rust--multilib-unwanted.yaml
@@ -4,7 +4,7 @@ data:
   name: Exclude multilib-rpm-config
   description: There are no more 32-bit builds for RHEL, so this package is not needed.
   maintainer: rhel-pt-llvm-rust
-  unwanted_packages:
+  unwanted_source_packages:
     - multilib-rpm-config
   labels:
     - eln
diff --git a/configs/rhel-ssg-idm--smart-cards-unwanted.yaml b/configs/rhel-ssg-idm--smart-cards-unwanted.yaml
index 583da224..7b678b15 100644
--- a/configs/rhel-ssg-idm--smart-cards-unwanted.yaml
+++ b/configs/rhel-ssg-idm--smart-cards-unwanted.yaml
@@ -4,7 +4,7 @@ data:
   name: IdM Smart Cards unwanted (RHCS specific)
   description: Specific packages for client-side smart card enrollment on RHEL.
   maintainer: rhel-ssg-idm
-  unwanted_packages:
+  unwanted_source_packages:
     - esc
   labels:
     - eln
diff --git a/configs/rhel-sst-arch-hw--unwanted.yaml b/configs/rhel-sst-arch-hw--unwanted.yaml
index 1707d7a1..04c3c1d5 100644
--- a/configs/rhel-sst-arch-hw--unwanted.yaml
+++ b/configs/rhel-sst-arch-hw--unwanted.yaml
@@ -4,7 +4,7 @@ data:
   name: arch hw unwanted packages
   description: Unwanted packages no longer headed for hardware enablement
   maintainer: rhel-sst-arch-hw
-  unwanted_packages:
+  unwanted_source_packages:
     - libdv
     - libiec61883
     - fxload
diff --git a/configs/rhel-sst-container-tools--unwanted.yaml b/configs/rhel-sst-container-tools--unwanted.yaml
index 41a64f02..f2d4e18d 100644
--- a/configs/rhel-sst-container-tools--unwanted.yaml
+++ b/configs/rhel-sst-container-tools--unwanted.yaml
@@ -6,9 +6,9 @@ data:
     Unwanted container runtime and related packages
 
   maintainer: rhel-sst-container-tools
-  unwanted_packages:
+  unwanted_source_packages:
     - containernetworking-plugins
-    - python3-podman-api
+    - python-podman-api
     - runc
     - yajl
   labels:
diff --git a/configs/rhel-sst-cs-databases--unwanted.yaml b/configs/rhel-sst-cs-databases--unwanted.yaml
index d81d6c33..4320a0a0 100644
--- a/configs/rhel-sst-cs-databases--unwanted.yaml
+++ b/configs/rhel-sst-cs-databases--unwanted.yaml
@@ -4,17 +4,14 @@ data:
   name: Unwanted packages from CS Databases SST
   description: Packages we do not want to ship for CS Databases SST
   maintainer: rhel-sst-cs-databases
-  unwanted_packages:
-    - libdb-devel # Deprecated in RHEL9
+  unwanted_source_packages:
+    # Deprecated in RHEL9
     - libdb
     # Pcre is deprecated and unsupported by upstream since Fedora 38
     - pcre
-    - pcre-devel
-    - pcre-cpp
     # There are better alternatives than aspell
     # https://fedoraproject.org/wiki/Changes/AspellDeprecation
     - aspell
-    - aspell-devel
   labels:
     - eln
     - c10s
diff --git a/configs/rhel-sst-cs-plumbers--unwanted.yaml b/configs/rhel-sst-cs-plumbers--unwanted.yaml
index abd447ac..c3c77504 100644
--- a/configs/rhel-sst-cs-plumbers--unwanted.yaml
+++ b/configs/rhel-sst-cs-plumbers--unwanted.yaml
@@ -4,40 +4,17 @@ data:
   name: Core Services Plumbers - Blocked packages
   description: Core Services Plumbers - Packages which should not be in ELN
   maintainer: rhel-sst-cs-plumbers
-  unwanted_packages:
+  unwanted_source_packages:
     - atlas
-    - atlas-corei2
-    - atlas-corei2-devel
-    - atlas-corei2-static
-    - atlas-devel
-    - atlas-z10
-    - atlas-z10-devel
-    - atlas-z10-static
-    - atlas-z14
-    - atlas-z14-devel
-    - atlas-z15
-    - atlas-z15-devel
-    - atlas-z196
-    - atlas-z196-devel
-    - atlas-z196-static
-    - emacs-terminal
     - libnice
-    - libnice-devel
-    - libnice-gstreamer1
     - libtar
-    - libtar-devel
-    - network-scripts
     - redhat-lsb
-    - redhat-lsb-core
-    - redhat-lsb-cxx
-    - redhat-lsb-desktop
-    - redhat-lsb-languages
-    - redhat-lsb-printing
-    - redhat-lsb-submod-multimedia
-    - redhat-lsb-submod-security
-    - redhat-lsb-supplemental
-    - redhat-lsb-trialuse
     - rtkit
+    # compat package
+    - tree-sitter0.25
+  unwanted_packages:
+    - emacs-terminal
+    - network-scripts
     - systemd-tests
   labels:
     - eln
diff --git a/configs/rhel-sst-display-window-management--unwanted.yaml b/configs/rhel-sst-display-window-management--unwanted.yaml
index 1842bbf3..5de202e9 100644
--- a/configs/rhel-sst-display-window-management--unwanted.yaml
+++ b/configs/rhel-sst-display-window-management--unwanted.yaml
@@ -4,8 +4,8 @@ data:
   name: Window Management - Blocked packages
   description: Window Management - Packages which should not be in ELN
   maintainer: rhel-sst-display-window-management
-  unwanted_packages:
-    # Seems to only be used by hwloc in an optional plugin
+  unwanted_source_packages:
+    # Only used by optional plugin of hwloc, removed for RHEL.
     - libXNVCtrl
     # Not very used and the only consumer of xorg-sgml-doctools
     - xorg-x11-docs
@@ -18,21 +18,12 @@ data:
     # Ancient build system, with low upstream maintenance.
     # Historically used in some older Xorg projects
     - imake
-    # Only used by optional plugin of hwloc, removed for RHEL.
-    - libXNVCtrl
     # Deprecated since RHEL 9 (technically even 8.4), removed in RHEL 10
     - motif
     # It should go
     - libxml++
     # Xorg removal in RHEL 10
-    - xorg-x11-server-common
-    - xorg-x11-server-devel
-    - xorg-x11-server-source
-    - xorg-x11-server-Xorg
-    - xorg-x11-server-Xnest
-    - xorg-x11-server-Xdmx
-    - xorg-x11-server-Xvfb
-    - xorg-x11-server-Xephyr
+    - xorg-x11-server
     - xorg-x11-drv-dummy
     - xorg-x11-drv-evdev
     - xorg-x11-drv-fbdev
diff --git a/configs/rhel-sst-gpu--unwanted.yaml b/configs/rhel-sst-gpu--unwanted.yaml
index 12a2c6c6..23e447a1 100644
--- a/configs/rhel-sst-gpu--unwanted.yaml
+++ b/configs/rhel-sst-gpu--unwanted.yaml
@@ -4,7 +4,7 @@ data:
   name: GPU - Blocked packages
   description: GPU - Packages which should not be in ELN
   maintainer: rhel-sst-gpu
-  unwanted_packages:
+  unwanted_source_packages:
     # glew is no longer needed by mesa-demos, and the soname churns too much to be
     # useful for a long-life product like RHEL.
     - glew
diff --git a/configs/rhel-sst-kernel-ft--unwanted.yaml b/configs/rhel-sst-kernel-ft--unwanted.yaml
index 0f82f81f..944c7207 100644
--- a/configs/rhel-sst-kernel-ft--unwanted.yaml
+++ b/configs/rhel-sst-kernel-ft--unwanted.yaml
@@ -6,7 +6,7 @@ data:
     Unwanted packages from Core-Kernel FT group
 
   maintainer: rhel-sst-kernel-ft
-  unwanted_packages:
+  unwanted_source_packages:
     - memkind
   labels:
     - eln
diff --git a/configs/rhel-sst-kernel-tps--unwanted.yaml b/configs/rhel-sst-kernel-tps--unwanted.yaml
index f1ab09bf..f3f9a39d 100644
--- a/configs/rhel-sst-kernel-tps--unwanted.yaml
+++ b/configs/rhel-sst-kernel-tps--unwanted.yaml
@@ -4,9 +4,8 @@ data:
   name: Unwanted Packages - rhel-sst-kernel-tps
   description: Packages not shipping in RHEL 9
   maintainer: rhel-sst-kernel-tps
-  unwanted_packages:
+  unwanted_source_packages:
     - rtl-sdr
-    - rtl-sdr-devel
   labels:
     - eln
     - c10s
diff --git a/configs/rhel-sst-networking-core--unwanted.yaml b/configs/rhel-sst-networking-core--unwanted.yaml
index 19d2a9de..b0075fae 100644
--- a/configs/rhel-sst-networking-core--unwanted.yaml
+++ b/configs/rhel-sst-networking-core--unwanted.yaml
@@ -6,7 +6,7 @@ data:
     Unwanted packages related to network configuration and troubleshooting.
 
   maintainer: rhel-sst-networking-core
-  unwanted_packages:
+  unwanted_source_packages:
     - dropwatch
     - netcat
     - plotnetcfg
diff --git a/configs/rhel-sst-pt-libraries--autotools-unwanted.yaml b/configs/rhel-sst-pt-libraries--autotools-unwanted.yaml
index 009d807e..cbc32b21 100644
--- a/configs/rhel-sst-pt-libraries--autotools-unwanted.yaml
+++ b/configs/rhel-sst-pt-libraries--autotools-unwanted.yaml
@@ -4,7 +4,7 @@ data:
   name: GNU Autotools Unwanted Packages
   description: GNU Autotools packages that we should not ship
   maintainer: rhel-sst-pt-libraries
-  unwanted_packages:
+  unwanted_source_packages:
     # These are all legacy packages that we should not need in the distribution.
     - autoconf213
     - autoconf268
diff --git a/configs/rhel-sst-pt-perf-debug--debuggers-unwanted.yaml b/configs/rhel-sst-pt-perf-debug--debuggers-unwanted.yaml
index d11bfa95..f55ca938 100644
--- a/configs/rhel-sst-pt-perf-debug--debuggers-unwanted.yaml
+++ b/configs/rhel-sst-pt-perf-debug--debuggers-unwanted.yaml
@@ -4,7 +4,7 @@ data:
   name: Unwanted Debuggers packages
   description: Unwanted Debuggers packages
   maintainer: rhel-sst-pt-perf-debug
-  unwanted_packages:
+  unwanted_source_packages:
     - babeltrace
   labels:
     - eln
diff --git a/configs/rhel-sst-rh-ceph-storage--glusterfs-unwanted.yaml b/configs/rhel-sst-rh-ceph-storage--glusterfs-unwanted.yaml
index f8e74865..ed38450a 100644
--- a/configs/rhel-sst-rh-ceph-storage--glusterfs-unwanted.yaml
+++ b/configs/rhel-sst-rh-ceph-storage--glusterfs-unwanted.yaml
@@ -4,31 +4,8 @@ data:
   name: GlusterFS storage unwanted
   description: Unwanted GlusterFS storage packages
   maintainer: rhel-sst-rh-ceph-storage
-  unwanted_packages:
+  unwanted_source_packages:
     - glusterfs
-    - glusterfs-cli
-    - glusterfs-client-xlators
-    - glusterfs-cloudsync-plugins
-    - glusterfs-events
-    - glusterfs-extra-xlators
-    - glusterfs-fuse
-    - glusterfs-ganesha
-    - glusterfs-geo-replication
-    - glusterfs-server
-    - glusterfs-thin-arbiter
-    - glusterfs-resource-agents
-    - libgfapi-devel
-    - libgfapi0
-    - libgfchangelog-devel
-    - libgfchangelog0
-    - libgfrpc-devel
-    - libgfrpc0
-    - libxdr-devel
-    - libxdr0
-    - libglusterd0
-    - libglusterfs-devel
-    - libglusterfs0
-    - python3-gluster
   labels:
     - eln
     - c10s
diff --git a/configs/rhel-sst-security-crypto--unwanted.yaml b/configs/rhel-sst-security-crypto--unwanted.yaml
index 68fb5b38..d7af42cf 100644
--- a/configs/rhel-sst-security-crypto--unwanted.yaml
+++ b/configs/rhel-sst-security-crypto--unwanted.yaml
@@ -10,19 +10,18 @@ data:
   # in multiple crypto packages already and we do not want to add
   # more).
   # More info in the original PR 15
-  unwanted_packages:
+  unwanted_source_packages:
     - libretls
     - libsodium
     - libssh2
     - libtomcrypt
-    - python2-pycryptodomex
-    - python3-ecdsa
-    - python3-pycryptodomex
-    - python3-pyOpenSSL
-    - python3-crypto
-    - python2-crypto
+    - pyOpenSSL
+    - python-crypto
+    - python-ecdsa
+    - python-pycryptodomex
     # OpenSSL 3 deprecated engines, use the openssl pkcs11 provider instead
     - openssl-pkcs11
+  unwanted_packages:
     # Deprecated OpenSSL components
     - openssl-devel-engine
   labels:
diff --git a/configs/rhel-sst-storage-io--packages-unwanted.yaml b/configs/rhel-sst-storage-io--packages-unwanted.yaml
index e8b5a079..4ef0e333 100644
--- a/configs/rhel-sst-storage-io--packages-unwanted.yaml
+++ b/configs/rhel-sst-storage-io--packages-unwanted.yaml
@@ -4,7 +4,7 @@ data:
   name: Unwanted SST Storage-IO packages
   description: Unwanted SST Storage-IO and Components
   maintainer: rhel-sst-storage-io
-  unwanted_packages:
+  unwanted_source_packages:
     - libhbaapi
     - libhbalinux
     - nvme-stas