diff --git a/prepopulate.json b/prepopulate.json
index 2d5d230..5657305 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -949,7 +949,6 @@
         "geoclue2.aarch64"
       ],
       "geocode-glib": [
-        "geocode-glib-devel.aarch64",
         "geocode-glib.aarch64"
       ],
       "geolite2": [
@@ -1045,7 +1044,6 @@
         "gnome-control-center.aarch64"
       ],
       "gnome-desktop3": [
-        "gnome-desktop3-devel.aarch64",
         "gnome-desktop3.aarch64"
       ],
       "gnome-devel-docs": [
@@ -2887,7 +2885,6 @@
         "libguestfs-winsupport.aarch64"
       ],
       "libgweather": [
-        "libgweather-devel.aarch64",
         "libgweather.aarch64"
       ],
       "libgxps": [
@@ -3339,9 +3336,6 @@
       "lorax-templates-rhel": [
         "lorax-templates-rhel.noarch"
       ],
-      "loupe": [
-        "loupe.aarch64"
-      ],
       "low-memory-monitor": [
         "low-memory-monitor.aarch64"
       ],
@@ -3770,9 +3764,7 @@
         "hyphen-cs.noarch"
       ],
       "openscap": [
-        "openscap-devel.aarch64",
         "openscap-engine-sce.aarch64",
-        "openscap-python3.aarch64",
         "openscap-scanner.aarch64",
         "openscap-utils.aarch64",
         "openscap.aarch64"
@@ -4885,9 +4877,6 @@
       "pycairo": [
         "python3-cairo.aarch64"
       ],
-      "pyelftools": [
-        "python3-pyelftools.noarch"
-      ],
       "pygobject3": [
         "python3-gobject.aarch64"
       ],
@@ -7517,7 +7506,6 @@
         "geoclue2.ppc64le"
       ],
       "geocode-glib": [
-        "geocode-glib-devel.ppc64le",
         "geocode-glib.ppc64le"
       ],
       "geolite2": [
@@ -7613,7 +7601,6 @@
         "gnome-control-center.ppc64le"
       ],
       "gnome-desktop3": [
-        "gnome-desktop3-devel.ppc64le",
         "gnome-desktop3.ppc64le"
       ],
       "gnome-devel-docs": [
@@ -9421,7 +9408,6 @@
         "libgtop2.ppc64le"
       ],
       "libgweather": [
-        "libgweather-devel.ppc64le",
         "libgweather.ppc64le"
       ],
       "libgxps": [
@@ -10291,9 +10277,7 @@
         "hyphen-cs.noarch"
       ],
       "openscap": [
-        "openscap-devel.ppc64le",
         "openscap-engine-sce.ppc64le",
-        "openscap-python3.ppc64le",
         "openscap-scanner.ppc64le",
         "openscap-utils.ppc64le",
         "openscap.ppc64le"
@@ -11409,9 +11393,6 @@
       "pycairo": [
         "python3-cairo.ppc64le"
       ],
-      "pyelftools": [
-        "python3-pyelftools.noarch"
-      ],
       "pygobject3": [
         "python3-gobject.ppc64le"
       ],
@@ -13970,7 +13951,6 @@
         "geoclue2.s390x"
       ],
       "geocode-glib": [
-        "geocode-glib-devel.s390x",
         "geocode-glib.s390x"
       ],
       "geolite2": [
@@ -14065,7 +14045,6 @@
         "gnome-control-center.s390x"
       ],
       "gnome-desktop3": [
-        "gnome-desktop3-devel.s390x",
         "gnome-desktop3.s390x"
       ],
       "gnome-devel-docs": [
@@ -15883,7 +15862,6 @@
         "libguestfs-winsupport.s390x"
       ],
       "libgweather": [
-        "libgweather-devel.s390x",
         "libgweather.s390x"
       ],
       "libgxps": [
@@ -16319,9 +16297,6 @@
       "lorax-templates-rhel": [
         "lorax-templates-rhel.noarch"
       ],
-      "loupe": [
-        "loupe.s390x"
-      ],
       "low-memory-monitor": [
         "low-memory-monitor.s390x"
       ],
@@ -16736,9 +16711,7 @@
         "hyphen-cs.noarch"
       ],
       "openscap": [
-        "openscap-devel.s390x",
         "openscap-engine-sce.s390x",
-        "openscap-python3.s390x",
         "openscap-scanner.s390x",
         "openscap-utils.s390x",
         "openscap.s390x"
@@ -20513,7 +20486,6 @@
         "geoclue2.x86_64"
       ],
       "geocode-glib": [
-        "geocode-glib-devel.x86_64",
         "geocode-glib.x86_64"
       ],
       "geolite2": [
@@ -20558,7 +20530,6 @@
       "gjs": [
         "gjs.x86_64"
       ],
-      "glib-networking": [],
       "glib2": [
         "glib2-devel.x86_64",
         "glib2-doc.noarch",
@@ -20611,7 +20582,6 @@
         "gnome-control-center.x86_64"
       ],
       "gnome-desktop3": [
-        "gnome-desktop3-devel.x86_64",
         "gnome-desktop3.x86_64"
       ],
       "gnome-devel-docs": [
@@ -22452,7 +22422,6 @@
         "libguestfs-winsupport.x86_64"
       ],
       "libgweather": [
-        "libgweather-devel.x86_64",
         "libgweather.x86_64"
       ],
       "libgxps": [
@@ -23358,9 +23327,7 @@
         "hyphen-cs.noarch"
       ],
       "openscap": [
-        "openscap-devel.x86_64",
         "openscap-engine-sce.x86_64",
-        "openscap-python3.x86_64",
         "openscap-scanner.x86_64",
         "openscap-utils.x86_64",
         "openscap.x86_64"
@@ -24325,7 +24292,6 @@
         "pixman-devel.x86_64",
         "pixman.x86_64"
       ],
-      "pkgconf": [],
       "plexus-cipher": [
         "plexus-cipher.noarch"
       ],
@@ -24478,9 +24444,6 @@
       "pycairo": [
         "python3-cairo.x86_64"
       ],
-      "pyelftools": [
-        "python3-pyelftools.noarch"
-      ],
       "pygobject3": [
         "python3-gobject.x86_64"
       ],
@@ -26881,7 +26844,6 @@
         "kbd.aarch64"
       ],
       "kernel": [
-        "bpftool.aarch64",
         "kernel-64k-core.aarch64",
         "kernel-64k-debug-core.aarch64",
         "kernel-64k-debug-modules-extra.aarch64",
@@ -28455,7 +28417,6 @@
         "kbd.ppc64le"
       ],
       "kernel": [
-        "bpftool.ppc64le",
         "kernel-abi-stablelists.noarch",
         "kernel-core.ppc64le",
         "kernel-debug-core.ppc64le",
@@ -30012,7 +29973,6 @@
         "kbd.s390x"
       ],
       "kernel": [
-        "bpftool.s390x",
         "kernel-abi-stablelists.noarch",
         "kernel-core.s390x",
         "kernel-debug-core.s390x",
@@ -31586,7 +31546,6 @@
         "kbd.x86_64"
       ],
       "kernel": [
-        "bpftool.x86_64",
         "kernel-abi-stablelists.noarch",
         "kernel-core.x86_64",
         "kernel-debug-core.x86_64",
@@ -32641,10 +32600,6 @@
         "boost-openmpi.aarch64",
         "boost-static.aarch64"
       ],
-      "brasero": [
-        "brasero-devel.aarch64",
-        "brasero-libs.aarch64"
-      ],
       "brltty": [
         "brlapi-devel.aarch64"
       ],
@@ -32897,9 +32852,6 @@
       "gnu-efi": [
         "gnu-efi-devel.noarch"
       ],
-      "gobject-introspection": [
-        "gobject-introspection-devel.aarch64"
-      ],
       "gpgme": [
         "gpgme-devel.aarch64",
         "gpgmepp-devel.aarch64",
@@ -33552,7 +33504,6 @@
       ],
       "mysql8.4": [
         "mysql-devel.aarch64",
-        "mysql-libs.aarch64",
         "mysql-test.aarch64"
       ],
       "nasm": [
@@ -33652,9 +33603,6 @@
       "openmpi": [
         "python3-openmpi.aarch64"
       ],
-      "openscap": [
-        "openscap-engine-sce-devel.aarch64"
-      ],
       "openslp": [
         "openslp-devel.aarch64"
       ],
@@ -34660,9 +34608,6 @@
       "gnome-online-accounts": [
         "gnome-online-accounts-devel.ppc64le"
       ],
-      "gobject-introspection": [
-        "gobject-introspection-devel.ppc64le"
-      ],
       "gpgme": [
         "gpgme-devel.ppc64le",
         "gpgmepp-devel.ppc64le",
@@ -35314,7 +35259,6 @@
       ],
       "mysql8.4": [
         "mysql-devel.ppc64le",
-        "mysql-libs.ppc64le",
         "mysql-test.ppc64le"
       ],
       "nasm": [
@@ -35407,9 +35351,6 @@
       "openmpi": [
         "python3-openmpi.ppc64le"
       ],
-      "openscap": [
-        "openscap-engine-sce-devel.ppc64le"
-      ],
       "openslp": [
         "openslp-devel.ppc64le"
       ],
@@ -36220,10 +36161,6 @@
         "boost-openmpi.s390x",
         "boost-static.s390x"
       ],
-      "brasero": [
-        "brasero-devel.s390x",
-        "brasero-libs.s390x"
-      ],
       "brltty": [
         "brlapi-devel.s390x"
       ],
@@ -36462,9 +36399,6 @@
       "gnome-online-accounts": [
         "gnome-online-accounts-devel.s390x"
       ],
-      "gobject-introspection": [
-        "gobject-introspection-devel.s390x"
-      ],
       "gpgme": [
         "gpgme-devel.s390x",
         "gpgmepp-devel.s390x",
@@ -37112,7 +37046,6 @@
       ],
       "mysql8.4": [
         "mysql-devel.s390x",
-        "mysql-libs.s390x",
         "mysql-test.s390x"
       ],
       "nasm": [
@@ -37209,9 +37142,6 @@
       "openmpi": [
         "python3-openmpi.s390x"
       ],
-      "openscap": [
-        "openscap-engine-sce-devel.s390x"
-      ],
       "openslp": [
         "openslp-devel.s390x"
       ],
@@ -38282,9 +38212,6 @@
       "gnu-efi": [
         "gnu-efi-devel.noarch"
       ],
-      "gobject-introspection": [
-        "gobject-introspection-devel.x86_64"
-      ],
       "gpgme": [
         "gpgme-devel.x86_64",
         "gpgmepp-devel.x86_64",
@@ -38311,7 +38238,6 @@
         "gtkmm4.0-devel.x86_64",
         "gtkmm4.0-doc.noarch"
       ],
-      "gvfs": [],
       "help2man": [
         "help2man.noarch"
       ],
@@ -38984,7 +38910,6 @@
       ],
       "mysql8.4": [
         "mysql-devel.x86_64",
-        "mysql-libs.x86_64",
         "mysql-test.x86_64"
       ],
       "nasm": [
@@ -39077,9 +39002,6 @@
       "openmpi": [
         "python3-openmpi.x86_64"
       ],
-      "openscap": [
-        "openscap-engine-sce-devel.x86_64"
-      ],
       "openslp": [
         "openslp-devel.x86_64"
       ],
@@ -39383,7 +39305,6 @@
         "pybind11-devel.x86_64",
         "python3-pybind11.x86_64"
       ],
-      "pycairo": [],
       "pygobject3": [
         "python3-gobject-devel.x86_64"
       ],
@@ -39618,7 +39539,6 @@
       "taglib": [
         "taglib-devel.x86_64"
       ],
-      "tcl": [],
       "tesseract": [
         "tesseract-devel.x86_64"
       ],
@@ -39640,7 +39560,6 @@
         "tix-devel.x86_64",
         "tix.x86_64"
       ],
-      "tk": [],
       "tog-pegasus": [
         "tog-pegasus-devel.x86_64"
       ],
@@ -40726,4 +40645,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 58e2f5f..b10f552 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -99,6 +99,7 @@ additional_packages = [
             "vdo", #ENGCMP-4262
             "erofs-utils", #ENGCMP-4284
             "erofs-fuse", #ENGCMP-4284
+            "fwupd-efi", #ENGCMP-4308
         ]
     }),
     ("^BaseOS$", {
@@ -141,6 +142,8 @@ additional_packages = [
             "cups-filters-driverless", #ENGCMP-3862
             "cockpit-ostree", #ENGCMP-3233
             "composefs", #ENGCMP-3802
+            "cxl-cli", #ENGCMP-4294
+            "cxl-libs", #ENGCMP-4294
             "dotnet-apphost-pack-8.0", #ENGCMP-3375
             "dotnet-host", #ENGCMP-2586
             "dotnet-hostfxr-8.0", #ENGCMP-3375
@@ -451,12 +454,54 @@ additional_packages = [
             "pgvector", #ENGCMP-4285
             "insights-client", #ENGCMP-4297
             "redfish-finder", #ENGCMP-4300
+            "mtx", #ENGCMP-4329
+            "nodejs22", #ENGCMP-4342
+            "nodejs-packaging", #ENGCMP-4265
+            "rust-std-static-wasm32-wasip1", #ENGCMP-4296
+            "bpftool", #ENGCMP-4303
+            "nodejs-devel", #ENGCMP-4309
+            "enchant2-voikko", #ENGCMP-4312
+            "gtk3-immodules", #ENGCMP-4312
+            "libportal-gtk3", #ENGCMP-4312
+            "usbredir-tools", #ENGCMP-4314
+            "mysql-libs", #ENGCMP-4317
+            "libkcapi-hasher", #ENGCMP-4321
+            "scl-utils", #ENGCMP-4323
+            "scl-utils-build", #ENGCMP-4323
+            "sysprof", #ENGCMP-4325
+            "sysprof-agent", #ENGCMP-4325
+            "sysprof-cli", #ENGCMP-4325
+            "hunspell-nr", #ENGCMP-4337
+            "hunspell-nso", #ENGCMP-4337
+            "hunspell-ny", #ENGCMP-4337
+            "hunspell-oc", #ENGCMP-4337
+            "hunspell-or", #ENGCMP-4337
+            "hunspell-pa", #ENGCMP-4337
+            "hunspell-pt-BR", #ENGCMP-4337
+            "hunspell-si", #ENGCMP-4337
+            "hunspell-tr", #ENGCMP-4337
+            "hyphen-fo", #ENGCMP-4337
+            "hyphen-grc", #ENGCMP-4337
+            "hyphen-hsb", #ENGCMP-4337
+            "hyphen-ia", #ENGCMP-4337
+            "hyphen-is", #ENGCMP-4337
+            "hyphen-ku", #ENGCMP-4337
+            "hyphen-mi", #ENGCMP-4337
+            "hyphen-mn", #ENGCMP-4337
+            "hyphen-pt-BR", #ENGCMP-4337
+            "hyphen-sa", #ENGCMP-4337
+            "hyphen-tk", #ENGCMP-4337
+            "langpacks-chr", #ENGCMP-4337
+            "langpacks-dv", #ENGCMP-4337
+            "langpacks-hy", #ENGCMP-4337
+            "langpacks-iu", #ENGCMP-4337
+            "langpacks-lo", #ENGCMP-4337
+            "langpacks-mni", #ENGCMP-4337
+            "langpacks-sat", #ENGCMP-4337
         ]
     }),
     ("^AppStream$", {
          "x86_64": [
-             "cxl-cli", #ENGCMP-2743
-             "cxl-libs", #ENGCMP-2743
              "open-vm-tools-salt-minion", #ENGCMP-2295
              "pcp-pmda-resctrl", #ENGCMP-3576
              "virt-dib",