diff --git a/prepopulate.json b/prepopulate.json
index 52f848f..5417455 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -1128,10 +1128,6 @@
       "gnome-system-monitor": [
         "gnome-system-monitor.aarch64"
       ],
-      "gnome-terminal": [
-        "gnome-terminal-nautilus.aarch64",
-        "gnome-terminal.aarch64"
-      ],
       "gnome-text-editor": [
         "gnome-text-editor.aarch64"
       ],
@@ -2074,22 +2070,6 @@
       "itstool": [
         "itstool.noarch"
       ],
-      "jackson-annotations": [
-        "pki-jackson-annotations.noarch"
-      ],
-      "jackson-core": [
-        "pki-jackson-core.noarch"
-      ],
-      "jackson-databind": [
-        "pki-jackson-databind.noarch"
-      ],
-      "jackson-jaxrs-providers": [
-        "pki-jackson-jaxrs-json-provider.noarch",
-        "pki-jackson-jaxrs-providers.noarch"
-      ],
-      "jackson-modules-base": [
-        "pki-jackson-module-jaxb-annotations.noarch"
-      ],
       "jakarta-activation": [
         "jakarta-activation.noarch"
       ],
@@ -2716,6 +2696,8 @@
         "libblockdev-nvdimm.aarch64",
         "libblockdev-part.aarch64",
         "libblockdev-plugins-all.aarch64",
+        "libblockdev-smart.aarch64",
+        "libblockdev-smartmontools.aarch64",
         "libblockdev-swap.aarch64",
         "libblockdev-tools.aarch64",
         "libblockdev-utils.aarch64",
@@ -3543,7 +3525,7 @@
       "mysql-selinux": [
         "mysql-selinux.noarch"
       ],
-      "mysql8.0": [
+      "mysql8.4": [
         "mysql-common.aarch64",
         "mysql-errmsg.aarch64",
         "mysql-server.aarch64",
@@ -3755,8 +3737,7 @@
         "openslp.aarch64"
       ],
       "openssh": [
-        "openssh-askpass.aarch64",
-        "pam_ssh_agent_auth.aarch64"
+        "openssh-askpass.aarch64"
       ],
       "openssl": [
         "openssl-devel.aarch64",
@@ -4842,6 +4823,9 @@
       "pt-sans-fonts": [
         "pt-sans-fonts.noarch"
       ],
+      "ptyxis": [
+        "ptyxis.aarch64"
+      ],
       "publicsuffix-list": [
         "publicsuffix-list.noarch"
       ],
@@ -5140,7 +5124,6 @@
         "qt6-qtbase-mysql.aarch64",
         "qt6-qtbase-odbc.aarch64",
         "qt6-qtbase-postgresql.aarch64",
-        "qt6-qtbase-private-devel.aarch64",
         "qt6-qtbase.aarch64"
       ],
       "qt6-qtcharts": [
@@ -6160,7 +6143,6 @@
         "tomcat.noarch"
       ],
       "toolbox": [
-        "toolbox-tests.aarch64",
         "toolbox.aarch64"
       ],
       "totem-pl-parser": [
@@ -6218,9 +6200,6 @@
         "ucx-rdmacm.aarch64",
         "ucx.aarch64"
       ],
-      "udftools": [
-        "udftools.aarch64"
-      ],
       "udica": [
         "udica.noarch"
       ],
@@ -6385,11 +6364,6 @@
       "weldr-client": [
         "weldr-client.aarch64"
       ],
-      "wget2": [
-        "wget2-libs.aarch64",
-        "wget2-wget.aarch64",
-        "wget2.aarch64"
-      ],
       "whois": [
         "whois-nls.noarch",
         "whois.aarch64"
@@ -7687,10 +7661,6 @@
       "gnome-system-monitor": [
         "gnome-system-monitor.ppc64le"
       ],
-      "gnome-terminal": [
-        "gnome-terminal-nautilus.ppc64le",
-        "gnome-terminal.ppc64le"
-      ],
       "gnome-text-editor": [
         "gnome-text-editor.ppc64le"
       ],
@@ -8614,22 +8584,6 @@
       "itstool": [
         "itstool.noarch"
       ],
-      "jackson-annotations": [
-        "pki-jackson-annotations.noarch"
-      ],
-      "jackson-core": [
-        "pki-jackson-core.noarch"
-      ],
-      "jackson-databind": [
-        "pki-jackson-databind.noarch"
-      ],
-      "jackson-jaxrs-providers": [
-        "pki-jackson-jaxrs-json-provider.noarch",
-        "pki-jackson-jaxrs-providers.noarch"
-      ],
-      "jackson-modules-base": [
-        "pki-jackson-module-jaxb-annotations.noarch"
-      ],
       "jakarta-activation": [
         "jakarta-activation.noarch"
       ],
@@ -9252,6 +9206,8 @@
         "libblockdev-nvdimm.ppc64le",
         "libblockdev-part.ppc64le",
         "libblockdev-plugins-all.ppc64le",
+        "libblockdev-smart.ppc64le",
+        "libblockdev-smartmontools.ppc64le",
         "libblockdev-swap.ppc64le",
         "libblockdev-tools.ppc64le",
         "libblockdev-utils.ppc64le",
@@ -10061,7 +10017,7 @@
       "mysql-selinux": [
         "mysql-selinux.noarch"
       ],
-      "mysql8.0": [
+      "mysql8.4": [
         "mysql-common.ppc64le",
         "mysql-errmsg.ppc64le",
         "mysql-server.ppc64le",
@@ -10267,8 +10223,7 @@
         "openslp.ppc64le"
       ],
       "openssh": [
-        "openssh-askpass.ppc64le",
-        "pam_ssh_agent_auth.ppc64le"
+        "openssh-askpass.ppc64le"
       ],
       "openssl": [
         "openssl-devel.ppc64le",
@@ -11357,6 +11312,9 @@
       "pt-sans-fonts": [
         "pt-sans-fonts.noarch"
       ],
+      "ptyxis": [
+        "ptyxis.ppc64le"
+      ],
       "publicsuffix-list": [
         "publicsuffix-list.noarch"
       ],
@@ -11641,7 +11599,6 @@
         "qt6-qtbase-mysql.ppc64le",
         "qt6-qtbase-odbc.ppc64le",
         "qt6-qtbase-postgresql.ppc64le",
-        "qt6-qtbase-private-devel.ppc64le",
         "qt6-qtbase.ppc64le"
       ],
       "qt6-qtcharts": [
@@ -12653,7 +12610,6 @@
         "tomcat.noarch"
       ],
       "toolbox": [
-        "toolbox-tests.ppc64le",
         "toolbox.ppc64le"
       ],
       "totem-pl-parser": [
@@ -12711,9 +12667,6 @@
         "ucx-rdmacm.ppc64le",
         "ucx.ppc64le"
       ],
-      "udftools": [
-        "udftools.ppc64le"
-      ],
       "udica": [
         "udica.noarch"
       ],
@@ -12864,11 +12817,6 @@
       "weldr-client": [
         "weldr-client.ppc64le"
       ],
-      "wget2": [
-        "wget2-libs.ppc64le",
-        "wget2-wget.ppc64le",
-        "wget2.ppc64le"
-      ],
       "whois": [
         "whois-nls.noarch",
         "whois.ppc64le"
@@ -14130,10 +14078,6 @@
       "gnome-system-monitor": [
         "gnome-system-monitor.s390x"
       ],
-      "gnome-terminal": [
-        "gnome-terminal-nautilus.s390x",
-        "gnome-terminal.s390x"
-      ],
       "gnome-text-editor": [
         "gnome-text-editor.s390x"
       ],
@@ -15055,22 +14999,6 @@
       "itstool": [
         "itstool.noarch"
       ],
-      "jackson-annotations": [
-        "pki-jackson-annotations.noarch"
-      ],
-      "jackson-core": [
-        "pki-jackson-core.noarch"
-      ],
-      "jackson-databind": [
-        "pki-jackson-databind.noarch"
-      ],
-      "jackson-jaxrs-providers": [
-        "pki-jackson-jaxrs-json-provider.noarch",
-        "pki-jackson-jaxrs-providers.noarch"
-      ],
-      "jackson-modules-base": [
-        "pki-jackson-module-jaxb-annotations.noarch"
-      ],
       "jakarta-activation": [
         "jakarta-activation.noarch"
       ],
@@ -15696,6 +15624,8 @@
         "libblockdev-part.s390x",
         "libblockdev-plugins-all.s390x",
         "libblockdev-s390.s390x",
+        "libblockdev-smart.s390x",
+        "libblockdev-smartmontools.s390x",
         "libblockdev-swap.s390x",
         "libblockdev-tools.s390x",
         "libblockdev-utils.s390x",
@@ -16504,7 +16434,7 @@
       "mysql-selinux": [
         "mysql-selinux.noarch"
       ],
-      "mysql8.0": [
+      "mysql8.4": [
         "mysql-common.s390x",
         "mysql-errmsg.s390x",
         "mysql-server.s390x",
@@ -16708,8 +16638,7 @@
         "opensm-libs.s390x"
       ],
       "openssh": [
-        "openssh-askpass.s390x",
-        "pam_ssh_agent_auth.s390x"
+        "openssh-askpass.s390x"
       ],
       "openssl": [
         "openssl-devel.s390x",
@@ -17779,6 +17708,9 @@
       "pt-sans-fonts": [
         "pt-sans-fonts.noarch"
       ],
+      "ptyxis": [
+        "ptyxis.s390x"
+      ],
       "publicsuffix-list": [
         "publicsuffix-list.noarch"
       ],
@@ -18076,7 +18008,6 @@
         "qt6-qtbase-mysql.s390x",
         "qt6-qtbase-odbc.s390x",
         "qt6-qtbase-postgresql.s390x",
-        "qt6-qtbase-private-devel.s390x",
         "qt6-qtbase.s390x"
       ],
       "qt6-qtcharts": [
@@ -19105,7 +19036,6 @@
         "tomcat.noarch"
       ],
       "toolbox": [
-        "toolbox-tests.s390x",
         "toolbox.s390x"
       ],
       "totem-pl-parser": [
@@ -19156,9 +19086,6 @@
       "ucs-miscfixed-fonts": [
         "ucs-miscfixed-fonts.noarch"
       ],
-      "udftools": [
-        "udftools.s390x"
-      ],
       "udica": [
         "udica.noarch"
       ],
@@ -19323,11 +19250,6 @@
       "weldr-client": [
         "weldr-client.s390x"
       ],
-      "wget2": [
-        "wget2-libs.s390x",
-        "wget2-wget.s390x",
-        "wget2.s390x"
-      ],
       "whois": [
         "whois-nls.noarch",
         "whois.s390x"
@@ -20669,10 +20591,6 @@
       "gnome-system-monitor": [
         "gnome-system-monitor.x86_64"
       ],
-      "gnome-terminal": [
-        "gnome-terminal-nautilus.x86_64",
-        "gnome-terminal.x86_64"
-      ],
       "gnome-text-editor": [
         "gnome-text-editor.x86_64"
       ],
@@ -21615,22 +21533,6 @@
       "itstool": [
         "itstool.noarch"
       ],
-      "jackson-annotations": [
-        "pki-jackson-annotations.noarch"
-      ],
-      "jackson-core": [
-        "pki-jackson-core.noarch"
-      ],
-      "jackson-databind": [
-        "pki-jackson-databind.noarch"
-      ],
-      "jackson-jaxrs-providers": [
-        "pki-jackson-jaxrs-json-provider.noarch",
-        "pki-jackson-jaxrs-providers.noarch"
-      ],
-      "jackson-modules-base": [
-        "pki-jackson-module-jaxb-annotations.noarch"
-      ],
       "jakarta-activation": [
         "jakarta-activation.noarch"
       ],
@@ -22253,6 +22155,8 @@
         "libblockdev-nvdimm.x86_64",
         "libblockdev-part.x86_64",
         "libblockdev-plugins-all.x86_64",
+        "libblockdev-smart.x86_64",
+        "libblockdev-smartmontools.x86_64",
         "libblockdev-swap.x86_64",
         "libblockdev-tools.x86_64",
         "libblockdev-utils.x86_64",
@@ -23105,7 +23009,7 @@
       "mysql-selinux": [
         "mysql-selinux.noarch"
       ],
-      "mysql8.0": [
+      "mysql8.4": [
         "mysql-common.x86_64",
         "mysql-errmsg.x86_64",
         "mysql-server.x86_64",
@@ -23318,8 +23222,7 @@
         "openslp.x86_64"
       ],
       "openssh": [
-        "openssh-askpass.x86_64",
-        "pam_ssh_agent_auth.x86_64"
+        "openssh-askpass.x86_64"
       ],
       "openssl": [
         "openssl-devel.x86_64",
@@ -24410,6 +24313,9 @@
       "pt-sans-fonts": [
         "pt-sans-fonts.noarch"
       ],
+      "ptyxis": [
+        "ptyxis.x86_64"
+      ],
       "publicsuffix-list": [
         "publicsuffix-list.noarch"
       ],
@@ -24723,7 +24629,6 @@
         "qt6-qtbase-mysql.x86_64",
         "qt6-qtbase-odbc.x86_64",
         "qt6-qtbase-postgresql.x86_64",
-        "qt6-qtbase-private-devel.x86_64",
         "qt6-qtbase.x86_64"
       ],
       "qt6-qtcharts": [
@@ -25761,7 +25666,6 @@
         "tomcat.noarch"
       ],
       "toolbox": [
-        "toolbox-tests.x86_64",
         "toolbox.x86_64"
       ],
       "totem-pl-parser": [
@@ -25816,9 +25720,6 @@
         "ucx-rdmacm.x86_64",
         "ucx.x86_64"
       ],
-      "udftools": [
-        "udftools.x86_64"
-      ],
       "udica": [
         "udica.noarch"
       ],
@@ -25996,11 +25897,6 @@
       "weldr-client": [
         "weldr-client.x86_64"
       ],
-      "wget2": [
-        "wget2-libs.x86_64",
-        "wget2-wget.x86_64",
-        "wget2.x86_64"
-      ],
       "whois": [
         "whois-nls.noarch",
         "whois.x86_64"
@@ -26205,9 +26101,6 @@
         "acl.aarch64",
         "libacl.aarch64"
       ],
-      "acpica-tools": [
-        "acpica-tools.aarch64"
-      ],
       "adcli": [
         "adcli.aarch64"
       ],
@@ -27790,9 +27683,6 @@
         "acl.ppc64le",
         "libacl.ppc64le"
       ],
-      "acpica-tools": [
-        "acpica-tools.ppc64le"
-      ],
       "adcli": [
         "adcli.ppc64le"
       ],
@@ -29380,9 +29270,6 @@
         "acl.s390x",
         "libacl.s390x"
       ],
-      "acpica-tools": [
-        "acpica-tools.s390x"
-      ],
       "adcli": [
         "adcli.s390x"
       ],
@@ -30909,9 +30796,6 @@
         "acl.x86_64",
         "libacl.x86_64"
       ],
-      "acpica-tools": [
-        "acpica-tools.x86_64"
-      ],
       "adcli": [
         "adcli.x86_64"
       ],
@@ -33524,7 +33408,7 @@
       "mutter": [
         "mutter-devel.aarch64"
       ],
-      "mysql8.0": [
+      "mysql8.4": [
         "mysql-devel.aarch64",
         "mysql-libs.aarch64",
         "mysql-test.aarch64"
@@ -33961,6 +33845,7 @@
         "qdox.noarch"
       ],
       "qt6-qtbase": [
+        "qt6-qtbase-private-devel.aarch64",
         "qt6-qtbase-static.aarch64"
       ],
       "qt6-qtdeclarative": [
@@ -35281,7 +35166,7 @@
       "mutter": [
         "mutter-devel.ppc64le"
       ],
-      "mysql8.0": [
+      "mysql8.4": [
         "mysql-devel.ppc64le",
         "mysql-libs.ppc64le",
         "mysql-test.ppc64le"
@@ -35771,6 +35656,7 @@
         "qdox.noarch"
       ],
       "qt6-qtbase": [
+        "qt6-qtbase-private-devel.ppc64le",
         "qt6-qtbase-static.ppc64le"
       ],
       "qt6-qtdeclarative": [
@@ -37074,7 +36960,7 @@
       "mutter": [
         "mutter-devel.s390x"
       ],
-      "mysql8.0": [
+      "mysql8.4": [
         "mysql-devel.s390x",
         "mysql-libs.s390x",
         "mysql-test.s390x"
@@ -37568,6 +37454,7 @@
         "qdox.noarch"
       ],
       "qt6-qtbase": [
+        "qt6-qtbase-private-devel.s390x",
         "qt6-qtbase-static.s390x"
       ],
       "qt6-qtdeclarative": [
@@ -38941,7 +38828,7 @@
       "mutter": [
         "mutter-devel.x86_64"
       ],
-      "mysql8.0": [
+      "mysql8.4": [
         "mysql-devel.x86_64",
         "mysql-libs.x86_64",
         "mysql-test.x86_64"
@@ -39439,6 +39326,7 @@
         "qdox.noarch"
       ],
       "qt6-qtbase": [
+        "qt6-qtbase-private-devel.x86_64",
         "qt6-qtbase-static.x86_64"
       ],
       "qt6-qtdeclarative": [
diff --git a/prepopulate.yaml b/prepopulate.yaml
index 903f4aa..25903cb 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -868,9 +868,6 @@ AppStream:
     - gnome-software.aarch64
     gnome-system-monitor:
     - gnome-system-monitor.aarch64
-    gnome-terminal:
-    - gnome-terminal-nautilus.aarch64
-    - gnome-terminal.aarch64
     gnome-text-editor:
     - gnome-text-editor.aarch64
     gnome-tour:
@@ -1565,17 +1562,6 @@ AppStream:
     - isomd5sum.aarch64
     itstool:
     - itstool.noarch
-    jackson-annotations:
-    - pki-jackson-annotations.noarch
-    jackson-core:
-    - pki-jackson-core.noarch
-    jackson-databind:
-    - pki-jackson-databind.noarch
-    jackson-jaxrs-providers:
-    - pki-jackson-jaxrs-json-provider.noarch
-    - pki-jackson-jaxrs-providers.noarch
-    jackson-modules-base:
-    - pki-jackson-module-jaxb-annotations.noarch
     jakarta-activation:
     - jakarta-activation.noarch
     jakarta-annotations:
@@ -2123,6 +2109,8 @@ AppStream:
     - libblockdev-nvdimm.aarch64
     - libblockdev-part.aarch64
     - libblockdev-plugins-all.aarch64
+    - libblockdev-smart.aarch64
+    - libblockdev-smartmontools.aarch64
     - libblockdev-swap.aarch64
     - libblockdev-tools.aarch64
     - libblockdev-utils.aarch64
@@ -2730,7 +2718,7 @@ AppStream:
     - mutter.aarch64
     mysql-selinux:
     - mysql-selinux.noarch
-    mysql8.0:
+    mysql8.4:
     - mysql-common.aarch64
     - mysql-errmsg.aarch64
     - mysql-server.aarch64
@@ -2896,7 +2884,6 @@ AppStream:
     - openslp.aarch64
     openssh:
     - openssh-askpass.aarch64
-    - pam_ssh_agent_auth.aarch64
     openssl:
     - openssl-devel.aarch64
     - openssl-perl.aarch64
@@ -3721,6 +3708,8 @@ AppStream:
     - ps_mem.noarch
     pt-sans-fonts:
     - pt-sans-fonts.noarch
+    ptyxis:
+    - ptyxis.aarch64
     publicsuffix-list:
     - publicsuffix-list.noarch
     pulseaudio:
@@ -3933,7 +3922,6 @@ AppStream:
     - qt6-qtbase-mysql.aarch64
     - qt6-qtbase-odbc.aarch64
     - qt6-qtbase-postgresql.aarch64
-    - qt6-qtbase-private-devel.aarch64
     - qt6-qtbase.aarch64
     qt6-qtcharts:
     - qt6-qtcharts-devel.aarch64
@@ -4797,7 +4785,6 @@ AppStream:
     - tomcat-webapps.noarch
     - tomcat.noarch
     toolbox:
-    - toolbox-tests.aarch64
     - toolbox.aarch64
     totem-pl-parser:
     - totem-pl-parser.aarch64
@@ -4840,8 +4827,6 @@ AppStream:
     - ucx-ib.aarch64
     - ucx-rdmacm.aarch64
     - ucx.aarch64
-    udftools:
-    - udftools.aarch64
     udica:
     - udica.noarch
     udisks2:
@@ -4965,10 +4950,6 @@ AppStream:
     - webrtc-audio-processing.aarch64
     weldr-client:
     - weldr-client.aarch64
-    wget2:
-    - wget2-libs.aarch64
-    - wget2-wget.aarch64
-    - wget2.aarch64
     whois:
     - whois-nls.noarch
     - whois.aarch64
@@ -5961,9 +5942,6 @@ AppStream:
     - gnome-software.ppc64le
     gnome-system-monitor:
     - gnome-system-monitor.ppc64le
-    gnome-terminal:
-    - gnome-terminal-nautilus.ppc64le
-    - gnome-terminal.ppc64le
     gnome-text-editor:
     - gnome-text-editor.ppc64le
     gnome-tour:
@@ -6643,17 +6621,6 @@ AppStream:
     - isomd5sum.ppc64le
     itstool:
     - itstool.noarch
-    jackson-annotations:
-    - pki-jackson-annotations.noarch
-    jackson-core:
-    - pki-jackson-core.noarch
-    jackson-databind:
-    - pki-jackson-databind.noarch
-    jackson-jaxrs-providers:
-    - pki-jackson-jaxrs-json-provider.noarch
-    - pki-jackson-jaxrs-providers.noarch
-    jackson-modules-base:
-    - pki-jackson-module-jaxb-annotations.noarch
     jakarta-activation:
     - jakarta-activation.noarch
     jakarta-annotations:
@@ -7197,6 +7164,8 @@ AppStream:
     - libblockdev-nvdimm.ppc64le
     - libblockdev-part.ppc64le
     - libblockdev-plugins-all.ppc64le
+    - libblockdev-smart.ppc64le
+    - libblockdev-smartmontools.ppc64le
     - libblockdev-swap.ppc64le
     - libblockdev-tools.ppc64le
     - libblockdev-utils.ppc64le
@@ -7788,7 +7757,7 @@ AppStream:
     - mutter.ppc64le
     mysql-selinux:
     - mysql-selinux.noarch
-    mysql8.0:
+    mysql8.4:
     - mysql-common.ppc64le
     - mysql-errmsg.ppc64le
     - mysql-server.ppc64le
@@ -7950,7 +7919,6 @@ AppStream:
     - openslp.ppc64le
     openssh:
     - openssh-askpass.ppc64le
-    - pam_ssh_agent_auth.ppc64le
     openssl:
     - openssl-devel.ppc64le
     - openssl-perl.ppc64le
@@ -8777,6 +8745,8 @@ AppStream:
     - ps_mem.noarch
     pt-sans-fonts:
     - pt-sans-fonts.noarch
+    ptyxis:
+    - ptyxis.ppc64le
     publicsuffix-list:
     - publicsuffix-list.noarch
     pulseaudio:
@@ -8975,7 +8945,6 @@ AppStream:
     - qt6-qtbase-mysql.ppc64le
     - qt6-qtbase-odbc.ppc64le
     - qt6-qtbase-postgresql.ppc64le
-    - qt6-qtbase-private-devel.ppc64le
     - qt6-qtbase.ppc64le
     qt6-qtcharts:
     - qt6-qtcharts-devel.ppc64le
@@ -9833,7 +9802,6 @@ AppStream:
     - tomcat-webapps.noarch
     - tomcat.noarch
     toolbox:
-    - toolbox-tests.ppc64le
     - toolbox.ppc64le
     totem-pl-parser:
     - totem-pl-parser.ppc64le
@@ -9876,8 +9844,6 @@ AppStream:
     - ucx-ib.ppc64le
     - ucx-rdmacm.ppc64le
     - ucx.ppc64le
-    udftools:
-    - udftools.ppc64le
     udica:
     - udica.noarch
     udisks2:
@@ -9991,10 +9957,6 @@ AppStream:
     - webrtc-audio-processing.ppc64le
     weldr-client:
     - weldr-client.ppc64le
-    wget2:
-    - wget2-libs.ppc64le
-    - wget2-wget.ppc64le
-    - wget2.ppc64le
     whois:
     - whois-nls.noarch
     - whois.ppc64le
@@ -10959,9 +10921,6 @@ AppStream:
     - gnome-software.s390x
     gnome-system-monitor:
     - gnome-system-monitor.s390x
-    gnome-terminal:
-    - gnome-terminal-nautilus.s390x
-    - gnome-terminal.s390x
     gnome-text-editor:
     - gnome-text-editor.s390x
     gnome-tour:
@@ -11640,17 +11599,6 @@ AppStream:
     - isomd5sum.s390x
     itstool:
     - itstool.noarch
-    jackson-annotations:
-    - pki-jackson-annotations.noarch
-    jackson-core:
-    - pki-jackson-core.noarch
-    jackson-databind:
-    - pki-jackson-databind.noarch
-    jackson-jaxrs-providers:
-    - pki-jackson-jaxrs-json-provider.noarch
-    - pki-jackson-jaxrs-providers.noarch
-    jackson-modules-base:
-    - pki-jackson-module-jaxb-annotations.noarch
     jakarta-activation:
     - jakarta-activation.noarch
     jakarta-annotations:
@@ -12197,6 +12145,8 @@ AppStream:
     - libblockdev-part.s390x
     - libblockdev-plugins-all.s390x
     - libblockdev-s390.s390x
+    - libblockdev-smart.s390x
+    - libblockdev-smartmontools.s390x
     - libblockdev-swap.s390x
     - libblockdev-tools.s390x
     - libblockdev-utils.s390x
@@ -12790,7 +12740,7 @@ AppStream:
     - mutter.s390x
     mysql-selinux:
     - mysql-selinux.noarch
-    mysql8.0:
+    mysql8.4:
     - mysql-common.s390x
     - mysql-errmsg.s390x
     - mysql-server.s390x
@@ -12950,7 +12900,6 @@ AppStream:
     - opensm-libs.s390x
     openssh:
     - openssh-askpass.s390x
-    - pam_ssh_agent_auth.s390x
     openssl:
     - openssl-devel.s390x
     - openssl-perl.s390x
@@ -13762,6 +13711,8 @@ AppStream:
     - ps_mem.noarch
     pt-sans-fonts:
     - pt-sans-fonts.noarch
+    ptyxis:
+    - ptyxis.s390x
     publicsuffix-list:
     - publicsuffix-list.noarch
     pulseaudio:
@@ -13973,7 +13924,6 @@ AppStream:
     - qt6-qtbase-mysql.s390x
     - qt6-qtbase-odbc.s390x
     - qt6-qtbase-postgresql.s390x
-    - qt6-qtbase-private-devel.s390x
     - qt6-qtbase.s390x
     qt6-qtcharts:
     - qt6-qtcharts-devel.s390x
@@ -14847,7 +14797,6 @@ AppStream:
     - tomcat-webapps.noarch
     - tomcat.noarch
     toolbox:
-    - toolbox-tests.s390x
     - toolbox.s390x
     totem-pl-parser:
     - totem-pl-parser.s390x
@@ -14884,8 +14833,6 @@ AppStream:
     - tzdata-java.noarch
     ucs-miscfixed-fonts:
     - ucs-miscfixed-fonts.noarch
-    udftools:
-    - udftools.s390x
     udica:
     - udica.noarch
     udisks2:
@@ -15009,10 +14956,6 @@ AppStream:
     - webrtc-audio-processing.s390x
     weldr-client:
     - weldr-client.s390x
-    wget2:
-    - wget2-libs.s390x
-    - wget2-wget.s390x
-    - wget2.s390x
     whois:
     - whois-nls.noarch
     - whois.s390x
@@ -16040,9 +15983,6 @@ AppStream:
     - gnome-software.x86_64
     gnome-system-monitor:
     - gnome-system-monitor.x86_64
-    gnome-terminal:
-    - gnome-terminal-nautilus.x86_64
-    - gnome-terminal.x86_64
     gnome-text-editor:
     - gnome-text-editor.x86_64
     gnome-tour:
@@ -16737,17 +16677,6 @@ AppStream:
     - isomd5sum.x86_64
     itstool:
     - itstool.noarch
-    jackson-annotations:
-    - pki-jackson-annotations.noarch
-    jackson-core:
-    - pki-jackson-core.noarch
-    jackson-databind:
-    - pki-jackson-databind.noarch
-    jackson-jaxrs-providers:
-    - pki-jackson-jaxrs-json-provider.noarch
-    - pki-jackson-jaxrs-providers.noarch
-    jackson-modules-base:
-    - pki-jackson-module-jaxb-annotations.noarch
     jakarta-activation:
     - jakarta-activation.noarch
     jakarta-annotations:
@@ -17291,6 +17220,8 @@ AppStream:
     - libblockdev-nvdimm.x86_64
     - libblockdev-part.x86_64
     - libblockdev-plugins-all.x86_64
+    - libblockdev-smart.x86_64
+    - libblockdev-smartmontools.x86_64
     - libblockdev-swap.x86_64
     - libblockdev-tools.x86_64
     - libblockdev-utils.x86_64
@@ -17916,7 +17847,7 @@ AppStream:
     - mutter.x86_64
     mysql-selinux:
     - mysql-selinux.noarch
-    mysql8.0:
+    mysql8.4:
     - mysql-common.x86_64
     - mysql-errmsg.x86_64
     - mysql-server.x86_64
@@ -18084,7 +18015,6 @@ AppStream:
     - openslp.x86_64
     openssh:
     - openssh-askpass.x86_64
-    - pam_ssh_agent_auth.x86_64
     openssl:
     - openssl-devel.x86_64
     - openssl-perl.x86_64
@@ -18913,6 +18843,8 @@ AppStream:
     - ps_mem.noarch
     pt-sans-fonts:
     - pt-sans-fonts.noarch
+    ptyxis:
+    - ptyxis.x86_64
     publicsuffix-list:
     - publicsuffix-list.noarch
     pulseaudio:
@@ -19137,7 +19069,6 @@ AppStream:
     - qt6-qtbase-mysql.x86_64
     - qt6-qtbase-odbc.x86_64
     - qt6-qtbase-postgresql.x86_64
-    - qt6-qtbase-private-devel.x86_64
     - qt6-qtbase.x86_64
     qt6-qtcharts:
     - qt6-qtcharts-devel.x86_64
@@ -20014,7 +19945,6 @@ AppStream:
     - tomcat-webapps.noarch
     - tomcat.noarch
     toolbox:
-    - toolbox-tests.x86_64
     - toolbox.x86_64
     totem-pl-parser:
     - totem-pl-parser.x86_64
@@ -20055,8 +19985,6 @@ AppStream:
     - ucx-ib.x86_64
     - ucx-rdmacm.x86_64
     - ucx.x86_64
-    udftools:
-    - udftools.x86_64
     udica:
     - udica.noarch
     udisks2:
@@ -20189,10 +20117,6 @@ AppStream:
     - webrtc-audio-processing.x86_64
     weldr-client:
     - weldr-client.x86_64
-    wget2:
-    - wget2-libs.x86_64
-    - wget2-wget.x86_64
-    - wget2.x86_64
     whois:
     - whois-nls.noarch
     - whois.x86_64
@@ -20342,8 +20266,6 @@ BaseOS:
     acl:
     - acl.aarch64
     - libacl.aarch64
-    acpica-tools:
-    - acpica-tools.aarch64
     adcli:
     - adcli.aarch64
     at:
@@ -21563,8 +21485,6 @@ BaseOS:
     acl:
     - acl.ppc64le
     - libacl.ppc64le
-    acpica-tools:
-    - acpica-tools.ppc64le
     adcli:
     - adcli.ppc64le
     at:
@@ -22785,8 +22705,6 @@ BaseOS:
     acl:
     - acl.s390x
     - libacl.s390x
-    acpica-tools:
-    - acpica-tools.s390x
     adcli:
     - adcli.s390x
     at:
@@ -23963,8 +23881,6 @@ BaseOS:
     acl:
     - acl.x86_64
     - libacl.x86_64
-    acpica-tools:
-    - acpica-tools.x86_64
     adcli:
     - adcli.x86_64
     at:
@@ -25914,7 +25830,7 @@ CRB:
     - munge-devel.aarch64
     mutter:
     - mutter-devel.aarch64
-    mysql8.0:
+    mysql8.4:
     - mysql-devel.aarch64
     - mysql-libs.aarch64
     - mysql-test.aarch64
@@ -26220,6 +26136,7 @@ CRB:
     qdox:
     - qdox.noarch
     qt6-qtbase:
+    - qt6-qtbase-private-devel.aarch64
     - qt6-qtbase-static.aarch64
     qt6-qtdeclarative:
     - qt6-qtdeclarative-static.aarch64
@@ -27152,7 +27069,7 @@ CRB:
     - munge-devel.ppc64le
     mutter:
     - mutter-devel.ppc64le
-    mysql8.0:
+    mysql8.4:
     - mysql-devel.ppc64le
     - mysql-libs.ppc64le
     - mysql-test.ppc64le
@@ -27493,6 +27410,7 @@ CRB:
     qdox:
     - qdox.noarch
     qt6-qtbase:
+    - qt6-qtbase-private-devel.ppc64le
     - qt6-qtbase-static.ppc64le
     qt6-qtdeclarative:
     - qt6-qtdeclarative-static.ppc64le
@@ -28414,7 +28332,7 @@ CRB:
     - munge-devel.s390x
     mutter:
     - mutter-devel.s390x
-    mysql8.0:
+    mysql8.4:
     - mysql-devel.s390x
     - mysql-libs.s390x
     - mysql-test.s390x
@@ -28758,6 +28676,7 @@ CRB:
     qdox:
     - qdox.noarch
     qt6-qtbase:
+    - qt6-qtbase-private-devel.s390x
     - qt6-qtbase-static.s390x
     qt6-qtdeclarative:
     - qt6-qtdeclarative-static.s390x
@@ -29735,7 +29654,7 @@ CRB:
     - munge-devel.x86_64
     mutter:
     - mutter-devel.x86_64
-    mysql8.0:
+    mysql8.4:
     - mysql-devel.x86_64
     - mysql-libs.x86_64
     - mysql-test.x86_64
@@ -30082,6 +30001,7 @@ CRB:
     qdox:
     - qdox.noarch
     qt6-qtbase:
+    - qt6-qtbase-private-devel.x86_64
     - qt6-qtbase-static.x86_64
     qt6-qtdeclarative:
     - qt6-qtdeclarative-static.x86_64
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 54f1356..6ad8966 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -97,6 +97,7 @@ additional_packages = [
             "libpq", #ENGCMP-4203
             "vdo", #ENGCMP-4262
             "erofs-utils", #ENGCMP-4284
+            "erofs-fuse", #ENGCMP-4284
         ]
     }),
     ("^BaseOS$", {
@@ -225,6 +226,7 @@ additional_packages = [
             "gnome-kiosk-search-appliance", #ENGCMP-2499
             "gnome-shell-extension-custom-menu", #ENGCMP-3337
             "gnome-shell-extension-dash-to-panel", #ENGCMP-3541
+            "gnome-software-fedora-langpacks", #ENGCMP-4281
             "google-crosextra-caladea-fonts", #ENGCMP-3140
             "gpsd", #ENGCMP-3941
             "gpsd-clients", #ENGCMP-3941
@@ -364,10 +366,12 @@ additional_packages = [
             "s390utils-se-data", #ENGCMP-3789
             "samba-gpupdate", #ENGCMP-3659, ENGCMP-3720
             "sip6", #ENGCMP-2239
+            "speech-dispatcher-utils", #ENGCMP-4281
             "sssd-idp", #ENGCMP-2276
             "stratisd-tools", #ENGCMP-3210
             "synce4l", #ENGCMP-2794
             "system-backgrounds",
+            "systemd-ukify", #ENGCMP-4266
             "tomcat", #ENGCMP-2927
             "tomcat-admin-webapps", #ENGCMP-2927
             "tomcat-docs-webapp", #ENGCMP-2927
@@ -381,6 +385,7 @@ additional_packages = [
             "uki-direct", #ENGCMP-3698
             "usbredir-server", #ENGCMP-2719
             "vulkan-volk-devel", #ENGCMP-3668
+            "wget", #ENGCMP-4286
             "xcb-util-cursor", #ENGCMP-3426
             "xcb-util-cursor-devel", #ENGCMP-3517
             "xdg-desktop-portal-gnome", #ENGCMP-2146
@@ -395,17 +400,12 @@ additional_packages = [
             "zenity", #ENGCMP-3934
             "openscap-report", #ENGCMP-3939
             "qt6-qtvirtualkeyboard-devel", #ENGCMP-3946
-            "qt6-qtvirtualkeyboard-examples", #ENGCMP-3946
             "qt6-qtnetworkauth-devel", #ENGCMP-3947
-            "qt6-qtnetworkauth-examples", #ENGCMP-3947
-            "qt6-qtcharts-examples", #ENGCMP-3948
             "qt6-qtcharts-devel", #ENGCMP-3948
-            "qt6-qtdatavis3d-examples", #ENGCMP-3949
             "qt6-qtdatavis3d", #ENGCMP-3949
             "qt6-qtdatavis3d-devel", #ENGCMP-3949
             "qt6-qtlottie", #ENGCMP-3950
             "qt6-qtlottie-devel", #ENGCMP-3950
-            "qt6-qtlottie-examples", #ENGCMP-3950
             "annobin-libannocheck", #ENGCMP-3916
             "annobin-plugin-clang", #ENGCMP-3916
             "annobin-plugin-gcc", #ENGCMP-3916
@@ -482,9 +482,11 @@ additional_packages = [
             "xwayland-run", #ENGCMP-4249
             "cockpit-files", #ENGCMP-4256
             "udev-hid-bpf", #ENGCMP-4264
+            "udev-hid-bpf-stable", #ENGCMP-4264
             "mysql8.4", #ENGCMP-4274
             "redhat-indexhtml", #ENGCMP-4280
             "go-rpm-templates", #ENGCMP-4270
+            "postgresql16-pgvector", #ENGCMP-4285
         ]
     }),
     ("^AppStream$", {