diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 8af0fd6..fc2f659 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -38,26 +38,6 @@ filter_packages = [
 
 ]
 
-filter_modules = [
-    ("^AppStream$", {
-       "*":
-             [
-             "*",
-             ],
-           }),
-    ("^BaseOS$", {
-       "*":
-             [
-             "*",
-             ],
-           }),
-    ("^CRB$", {
-       "*":
-             [
-             "*",
-             ],
-           }),
-]
 
 additional_packages = [
     # Everything contains everything.
@@ -69,11 +49,14 @@ additional_packages = [
     ("^BaseOS$", {
         "*": [
             "liblockfile", #ENGCMP-2535
+            "openssl-fips-provider", #ENGCMP-3815
             "python3-gobject-base-noarch", #ENGCMP-2400
             "python3-samba-dc", #ENGCMP-3007
             "python3.9-debuginfo", #ENGCMP-1433, ENGCMP-2994
+            "rhel-net-naming-sysattrs", #ENGCMP-3784
             "samba-tools", #ENGCMP-3007
             "samba-usershares", #ENGCMP-3007
+            "sssd-passkey", #ENGCMP-3467
             "subscription-manager-cockpit", #ENGCMP-2427
             "subscription-manager-rhsm-certificates", #ENGCMP-2357
             "kernel-modules-core", #ENGCMP-2899
@@ -101,6 +84,7 @@ additional_packages = [
          ],
          "s390x": [
             "kernel-zfcpdump-modules-core",
+            "libibverbs-utils", #ENGCMP-3507
          ],
      }),
     ("^AppStream$", {
@@ -112,10 +96,14 @@ additional_packages = [
             "aspnetcore-runtime-8.0", #ENGCMP-3375
             "aspnetcore-targeting-pack-7.0", #ENGCMP-2586
             "aspnetcore-targeting-pack-8.0", #ENGCMP-3375
+            "autoconf-latest", #ENGCMP-3691
+            "bootc", #ENGCMP-3622
             "capstone", #ENGCMP-2591
-            "cups-browsed", #ENGCMP-3862
-            "cups-filters-driverless", #ENGCMP-3862
+            "cepces", #ENGCMP-3552
+            "cepces-certmonger", #ENGCMP-3790
+            "cepces-selinux", #ENGCMP-3803
             "cockpit-ostree", #ENGCMP-3233
+            "composefs", #ENGCMP-3802
             "dotnet-apphost-pack-7.0", #ENGCMP-2586
             "dotnet-apphost-pack-8.0", #ENGCMP-3375
             "dotnet-host", #ENGCMP-2586
@@ -125,14 +113,18 @@ additional_packages = [
             "dotnet-runtime-8.0", #ENGCMP-3375
             "dotnet-sdk-7.0", #ENGCMP-2586
             "dotnet-sdk-8.0", #ENGCMP-3375
-            "dotnet-sdk-8.0-source-built-artifacts", #ENGCMP-3375
             "dotnet-targeting-pack-7.0", #ENGCMP-2586
             "dotnet-targeting-pack-8.0", #ENGCMP-3375
             "dotnet-templates-7.0", #ENGCMP-2586
             "dotnet-templates-8.0", #ENGCMP-3375
-            "dpdk-devel", #ENGCMP-2205
+            "drgn", #ENGCMP-3490
             "ecj", #ENGCMP-2928
+            "efs-utils", #ENGCMP-3422
+            "efs-utils-selinux", #ENGCMP-3685
             "egl-utils", #ENGCMP-2476
+            "evolution-data-server-ui", #ENGCMP-3478
+            "evolution-data-server-ui-devel", #ENGCMP-3477
+            "fido2-tools", #ENGCMP-3526
             "firefox-x11", #ENGCMP-2806
             "freeglut-devel", #ENGCMP-2073
             "frr-selinux", #ENGCMP-2697
@@ -199,16 +191,19 @@ additional_packages = [
             "gnome-kiosk-script-session", #ENGCMP-2499
             "gnome-kiosk-search-appliance", #ENGCMP-2499
             "gnome-shell-extension-custom-menu", #ENGCMP-3337
+            "gnome-shell-extension-dash-to-panel", #ENGCMP-3541
             "google-crosextra-caladea-fonts", #ENGCMP-3140
             "gpsd-minimal", #ENGCMP-3333
             "gpsd-minimal-clients", #ENGCMP-3333
-            "cloud-utils-growpart",
+            "grafana-selinux", #ENGCMP-3571
+            "graphviz-ruby", #ENGCMP-3570
             "gstreamer1-plugins-base-tools", #ENGCMP-2907
             "gstreamer1-rtsp-server", #ENGCMP-3178
+            "gvisor-tap-vsock", #ENGCMP-3491
             "idm-pki-est", #ENGCMP-2798
-            "ipp-usb", #ENGCMP-3862
             "ignition-edge", #ENGCMP-2770
             "ignition-validate", #ENGCMP-2656
+            "intel-lpmd", #ENGCMP-3806
             "java-21-openjdk", #ENGCMP-3350
             "java-21-openjdk-demo", #ENGCMP-3350
             "java-21-openjdk-devel", #ENGCMP-3350
@@ -227,6 +222,7 @@ additional_packages = [
             "keylime-selinux", #CS-1194
             "keylime-tenant", #ENGCMP-2419
             "keylime-verifier", #ENGCMP-2419
+            "libadwaita", #ENGCMP-3651
             "libasan8", #ENGCMP-2405
             "libblkio", #ENGCMP-3149
             "libgpiod", #ENGCMP-2433
@@ -234,6 +230,7 @@ additional_packages = [
             "libgpiod-utils", #ENGCMP-2433
             "libi2cd", #ENGCMP-2428
             "libi2cd-devel", #ENGCMP-2428
+            "libkdumpfile", #ENGCMP-3470
             "libnxz", #ENGCMP-2576
             "libsepol-utils", #ENGCMP-2399
             "libtsan2", #ENGCMP-2405
@@ -246,6 +243,7 @@ additional_packages = [
             "libxcvt", #ENGCMP-2791 CS-1322
             "libzdnn", #ENGCMP-2244
             "libzdnn-devel", #ENGCMP-2297
+            "libzip-tools", #ENGCMP-3658
             "man-db-cron", #ENGCMP-2595
             "mingw-qemu-ga-win", #ENGCMP-3177
             "mkpasswd", #ENGCMP-2259
@@ -255,13 +253,18 @@ additional_packages = [
             "nfsv4-client-utils", #ENGCMP-2493
             "nvme-stas", #ENGCMP-2495
             "libnvme", #ENGCMP-2358
+            "osbuild-depsolve-dnf", #ENGCMP-3857
             "passt", #ENGCMP-2741
             "passt-selinux", # ENGCMP-3074
+            "pcp-geolocate", #ENGCMP-3576
+            "pcp-pmda-farm", #ENGCMP-3576
             "pf-bb-config", #ENGCMP-2857
+            "pipewire-jack-audio-connection-kit-libs", #ENGCMP-3662
             "pipewire-module-x11", #ENGCMP-3336
             "poppler-qt5", #ENGCMP-2393
             "postfix-lmdb", #ENGCMP-3295
             "pyproject-srpm-macros", #ENGCMP-2964
+            "python3-awscrt", #ENGCMP-3828
             "python3-botocore", #ENGCMP-3400
             "python3-dnf-plugin-leaves", #ENGCMP-3213
             "python3-dnf-plugin-show-leaves", #ENGCMP-3213
@@ -301,18 +304,47 @@ additional_packages = [
             "python3-i2c-tools", #RHBZ#2072719
             "python3-libgpiod", #ENGCMP-2433
             "python3-libnvme", #ENGCMP-2412
+            "python3-prompt-toolkit", #ENGCMP-3785
             "python3-pyqt5-sip", #ENGCMP-2370
+            "python3-ruamel-yaml-clib", #ENGCMP-3787
             "python3-sqlalchemy", #ENGCMP-2423
             "python3-tomli", #ENGCMP-3044 CS-1485
             "python3-tornado", #ENGCMP-2418
             "python3.11-urllib3", #ENGCMP-2932
             "python3-virt-firmware", #ENGCMP-2726
             "python3-wcwidth", #ENGCMP-2093
+            "python3-websockets", #ENGCMP-3788
+            "python3.12", #ENGCMP-3721
+            "python3.12-PyMySQL", #ENGCMP-3734
+            "python3.12-PyMySQL+rsa", #ENGCMP-3734
+            "python3.12-cffi", #ENGCMP-3733
+            "python3.12-charset-normalizer", #ENGCMP-3735
+            "python3.12-cryptography", #ENGCMP-3768
+            "python3.12-devel", #ENGCMP-3721
+            "python3.12-idna", #ENGCMP-3740
+            "python3.12-lxml", #ENGCMP-3741
+            "python3.12-mod_wsgi", #ENGCMP-3742
+            "python3.12-numpy", #ENGCMP-3748
+            "python3.12-numpy-f2py", #ENGCMP-3748
+            "python3.12-pip", #ENGCMP-3729
+            "python3.12-ply", #ENGCMP-3749
+            "python3.12-psycopg2", #ENGCMP-3755
+            "python3.12-pycparser", #ENGCMP-3751
+            "python3.12-pyyaml", #ENGCMP-3767
+            "python3.12-requests", #ENGCMP-3756
+            "python3.12-scipy", #ENGCMP-3771
+            "python3.12-setuptools", #ENGCMP-3670
+            "python3.12-tkinter", #ENGCMP-3721
+            "python3.12-urllib3", #ENGCMP-3762
+            "python3.12-wheel", #ENGCMP-3671
             "qatlib-service", #ENGCMP-2490
             "redhat-cloud-client-configuration", #ENGCMP-2401
+            "rpm-local-generator-support", #ENGCMP-3800
             "rtla", #ENGCMP-2799
             "rust-analyzer", #ENGCMP-2839
             "rv", #ENGCMP-3263
+            "s390utils-se-data", #ENGCMP-3789
+            "samba-gpupdate", #ENGCMP-3659, ENGCMP-3720
             "sip6", #ENGCMP-2239
             "sssd-idp", #ENGCMP-2276
             "stratisd-tools", #ENGCMP-3210
@@ -327,8 +359,11 @@ additional_packages = [
             "tomcat-servlet-4.0-api", #ENGCMP-2927
             "tomcat-webapps", #ENGCMP-2927
             "tuned-profiles-postgresql", #ENGCMP-2126
+            "uki-direct", #ENGCMP-3698
             "usbredir-server", #ENGCMP-2719
+            "vulkan-volk-devel", #ENGCMP-3668
             "xcb-util-cursor", #ENGCMP-3426
+            "xcb-util-cursor-devel", #ENGCMP-3517
             "xdg-desktop-portal-gnome", #ENGCMP-2146
             "xmlstarlet", #ENGCMP-2296
             "xxhash", #ENGCMP-2455
@@ -342,8 +377,10 @@ additional_packages = [
              "cxl-libs", #ENGCMP-2743
              "libreoffice", #ENGCMP-2968
              "open-vm-tools-salt-minion", #ENGCMP-2295
+             "pcp-pmda-resctrl", #ENGCMP-3576
              "virt-dib",
              "vorbis-tools",
+             "s390utils", #ENGCMP-3606
          ],
          "aarch64": [
              "virt-dib",
@@ -352,14 +389,17 @@ additional_packages = [
              "kernel-64k-devel", #ENGCMP-2800
              "kernel-64k-devel-matched", #ENGCMP-2800
              "rhc-worker-playbook", #ENGCMP-3127
+             "s390utils", #ENGCMP-3606
          ],
          "s390x": [
              "libzpc", #ENGCMP-2756
              "virt-dib",
+             "libbpf-tools", #ENGCMP-3842
          ],
          "ppc64le": [
              "vorbis-tools",
              "libreoffice", #ENGCMP-2968
+             "s390utils", #ENGCMP-3606
          ],
 
      }),