diff --git a/centos-stream-packages.json b/centos-stream-packages.json
index a6f8c03..0f74166 100644
--- a/centos-stream-packages.json
+++ b/centos-stream-packages.json
@@ -1075,6 +1075,46 @@
         "gcc-toolset-11-valgrind-devel.aarch64",
         "gcc-toolset-11-valgrind.aarch64"
       ],
+      "gcc-toolset-12": [
+        "gcc-toolset-12-build.aarch64",
+        "gcc-toolset-12-runtime.aarch64",
+        "gcc-toolset-12.aarch64"
+      ],
+      "gcc-toolset-12-annobin": [
+        "gcc-toolset-12-annobin-annocheck.aarch64",
+        "gcc-toolset-12-annobin-docs.noarch",
+        "gcc-toolset-12-annobin-plugin-gcc.aarch64"
+      ],
+      "gcc-toolset-12-binutils": [
+        "gcc-toolset-12-binutils-devel.aarch64",
+        "gcc-toolset-12-binutils-gold.aarch64",
+        "gcc-toolset-12-binutils.aarch64"
+      ],
+      "gcc-toolset-12-dwz": [
+        "gcc-toolset-12-dwz.aarch64"
+      ],
+      "gcc-toolset-12-gcc": [
+        "gcc-toolset-12-gcc-c++.aarch64",
+        "gcc-toolset-12-gcc-gfortran.aarch64",
+        "gcc-toolset-12-gcc-plugin-devel.aarch64",
+        "gcc-toolset-12-gcc.aarch64",
+        "gcc-toolset-12-libasan-devel.aarch64",
+        "gcc-toolset-12-libatomic-devel.aarch64",
+        "gcc-toolset-12-libgccjit-devel.aarch64",
+        "gcc-toolset-12-libgccjit-docs.aarch64",
+        "gcc-toolset-12-libgccjit.aarch64",
+        "gcc-toolset-12-libitm-devel.aarch64",
+        "gcc-toolset-12-liblsan-devel.aarch64",
+        "gcc-toolset-12-libstdc++-devel.aarch64",
+        "gcc-toolset-12-libstdc++-docs.aarch64",
+        "gcc-toolset-12-libtsan-devel.aarch64",
+        "gcc-toolset-12-libubsan-devel.aarch64",
+        "libasan8.aarch64",
+        "libtsan2.aarch64"
+      ],
+      "gcc-toolset-12-gdb": [
+        "gcc-toolset-12-gdb.aarch64"
+      ],
       "gcc-toolset-9": [
         "gcc-toolset-9-build.aarch64", 
         "gcc-toolset-9-perftools.aarch64", 
@@ -7385,6 +7425,48 @@
         "gcc-toolset-11-valgrind-devel.ppc64le",
         "gcc-toolset-11-valgrind.ppc64le"
       ],
+      "gcc-toolset-12": [
+        "gcc-toolset-12-build.ppc64le",
+        "gcc-toolset-12-runtime.ppc64le",
+        "gcc-toolset-12.ppc64le"
+      ],
+      "gcc-toolset-12-annobin": [
+        "gcc-toolset-12-annobin-annocheck.ppc64le",
+        "gcc-toolset-12-annobin-docs.noarch",
+        "gcc-toolset-12-annobin-plugin-gcc.ppc64le"
+      ],
+      "gcc-toolset-12-binutils": [
+        "gcc-toolset-12-binutils-devel.ppc64le",
+        "gcc-toolset-12-binutils-gold.ppc64le",
+        "gcc-toolset-12-binutils.ppc64le"
+      ],
+      "gcc-toolset-12-dwz": [
+        "gcc-toolset-12-dwz.ppc64le"
+      ],
+      "gcc-toolset-12-gcc": [
+        "gcc-toolset-12-gcc-c++.ppc64le",
+        "gcc-toolset-12-gcc-gfortran.ppc64le",
+        "gcc-toolset-12-gcc-plugin-devel.ppc64le",
+        "gcc-toolset-12-gcc.ppc64le",
+        "gcc-toolset-12-libasan-devel.ppc64le",
+        "gcc-toolset-12-libatomic-devel.ppc64le",
+        "gcc-toolset-12-libgccjit-devel.ppc64le",
+        "gcc-toolset-12-libgccjit-docs.ppc64le",
+        "gcc-toolset-12-libgccjit.ppc64le",
+        "gcc-toolset-12-libitm-devel.ppc64le",
+        "gcc-toolset-12-liblsan-devel.ppc64le",
+        "gcc-toolset-12-libquadmath-devel.ppc64le",
+        "gcc-toolset-12-libstdc++-devel.ppc64le",
+        "gcc-toolset-12-libstdc++-docs.ppc64le",
+        "gcc-toolset-12-libtsan-devel.ppc64le",
+        "gcc-toolset-12-libubsan-devel.ppc64le",
+        "gcc-toolset-12-offload-nvptx.ppc64le",
+        "libasan8.ppc64le",
+        "libtsan2.ppc64le"
+      ],
+      "gcc-toolset-12-gdb": [
+        "gcc-toolset-12-gdb.ppc64le"
+      ],
       "gcc-toolset-9": [
         "gcc-toolset-9-build.ppc64le", 
         "gcc-toolset-9-perftools.ppc64le", 
@@ -26033,6 +26115,59 @@
         "iscsi-initiator-utils.x86_64", 
         "python3-iscsi-initiator-utils.x86_64"
       ], 
+      "gcc-toolset-12": [
+        "gcc-toolset-12-build.x86_64",
+        "gcc-toolset-12-runtime.x86_64",
+        "gcc-toolset-12.x86_64"
+      ],
+      "gcc-toolset-12-annobin": [
+        "gcc-toolset-12-annobin-annocheck.x86_64",
+        "gcc-toolset-12-annobin-docs.noarch",
+        "gcc-toolset-12-annobin-plugin-gcc.x86_64"
+      ],
+      "gcc-toolset-12-binutils": [
+        "gcc-toolset-12-binutils-devel.i686",
+        "gcc-toolset-12-binutils-devel.x86_64",
+        "gcc-toolset-12-binutils-gold.x86_64",
+        "gcc-toolset-12-binutils.x86_64"
+      ],
+      "gcc-toolset-12-dwz": [
+        "gcc-toolset-12-dwz.x86_64"
+      ],
+      "gcc-toolset-12-gcc": [
+        "gcc-toolset-12-gcc-c++.x86_64",
+        "gcc-toolset-12-gcc-gfortran.x86_64",
+        "gcc-toolset-12-gcc-plugin-devel.i686",
+        "gcc-toolset-12-gcc-plugin-devel.x86_64",
+        "gcc-toolset-12-gcc.x86_64",
+        "gcc-toolset-12-libasan-devel.i686",
+        "gcc-toolset-12-libasan-devel.x86_64",
+        "gcc-toolset-12-libatomic-devel.i686",
+        "gcc-toolset-12-libatomic-devel.x86_64",
+        "gcc-toolset-12-libgccjit-devel.i686",
+        "gcc-toolset-12-libgccjit-devel.x86_64",
+        "gcc-toolset-12-libgccjit-docs.x86_64",
+        "gcc-toolset-12-libgccjit.i686",
+        "gcc-toolset-12-libgccjit.x86_64",
+        "gcc-toolset-12-libitm-devel.i686",
+        "gcc-toolset-12-libitm-devel.x86_64",
+        "gcc-toolset-12-liblsan-devel.x86_64",
+        "gcc-toolset-12-libquadmath-devel.i686",
+        "gcc-toolset-12-libquadmath-devel.x86_64",
+        "gcc-toolset-12-libstdc++-devel.i686",
+        "gcc-toolset-12-libstdc++-devel.x86_64",
+        "gcc-toolset-12-libstdc++-docs.x86_64",
+        "gcc-toolset-12-libtsan-devel.x86_64",
+        "gcc-toolset-12-libubsan-devel.i686",
+        "gcc-toolset-12-libubsan-devel.x86_64",
+        "gcc-toolset-12-offload-nvptx.x86_64",
+        "libasan8.i686",
+        "libasan8.x86_64",
+        "libtsan2.x86_64"
+      ],
+      "gcc-toolset-12-gdb": [
+        "gcc-toolset-12-gdb.x86_64"
+      ],
       "isl": [
         "isl.i686",
         "isl.x86_64"
diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index 3f064c4..d622cda 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -103,70 +103,9 @@ additional_packages = [
             "grafana-prometheus",
             "grafana-stackdriver",
             "php-pecl-xdebug3", #ENGCMP-1718
-            "fdo-admin-cli", #ENGCMP-1993
-            "fdo-init", #ENGCMP-1717
-            "fdo-client", #ENGCMP-1717
-            "fdo-manufacturing-server", #ENGCMP-1843
-            "fdo-owner-cli", #ENGCMP-1717
-            "fdo-owner-onboarding-server",#ENGCMP-1843
-            "fdo-rendezvous-server", #ENGCMP-1843
-            "ansible-core", #ENGCMP-1722
-            "ansible-test",
-            "osbuild-lvm2", #ENGCMP-1731
-            "osbuild-luks2",
-            "hostapd", # ENGCMP-1720
-            "gnome-shell-extension-classification-banner", #ENGCMP-1770
-            "gnome-shell-extension-dash-to-panel", #ENGCMP-1770
-            "gnome-shell-extension-gesture-inhibitor", #ENGCMP-1770
-            "autocorr-en", #ENGCMP-1797
-            "libabw", #ENGCMP-1847
-            "libcdr", #ENGCMP-1847
-            "libcmis", #ENGCMP-1797
-            "libexttextcat", #ENGCMP-1797
-            "libfreehand", #ENGCMP-1847
-            "libmspub", #ENGCMP-1847
-            "libmwaw", #ENGCMP-1847
-            "liborcus", #ENGCMP-1797
-            "libpagemaker", #ENGCMP-1847
-            "libqxp", #ENGCMP-1847
-            "libreoffice-calc", #ENGCMP-1847
-            "libreoffice-core", #ENGCMP-1797
-            "libreoffice-data", #ENGCMP-1797
-            "libreoffice-graphicfilter", #ENGCMP-1847
-            "libreoffice-help-en", #ENGCMP-1797
-            "libreoffice-impress", #ENGCMP-1847
-            "libreoffice-langpack-en", #ENGCMP-1797
-            "libreoffice-ogltrans", #ENGCMP-1847
-            "libreoffice-opensymbol-fonts", #ENGCMP-1797
-            "libreoffice-pdfimport", #ENGCMP-1847
-            "libreoffice-pyuno", #ENGCMP-1847
-            "libreoffice-ure", #ENGCMP-1797
-            "libreoffice-ure-common", #ENGCMP-1797
-            "libreoffice-writer", #ENGCMP-1847
-            "libstaroffice", #ENGCMP-1847
-            "libzmf", #ENGCMP-1847
-            "lpsolve", #ENGCMP-1847
-            "greenboot-default-health-checks", #ENGCMP-1801
-            "fence-agents-ibm-powervs", #ENGCMP-2002
-            "fence-agents-ibm-vpc", #ENGCMP-2030
-            "fence-agents-kubevirt", #ENGCMP-2002
-            "fence-virtd-cpg", #ENGCMP-1972
-            "poppler-qt5", #ENGCMP-2393
-            "python3-dnf-plugin-modulesync", #ENGCMP-2018
-            "python3-lasso", #ENGCMP-2278
-            "redhat-cloud-client-configuration", #ENGCMP-2395
-            "libzdnn", #ENGCMP-2057
-            "tuned-profiles-postgresql", #ENGCMP-2126
-            "ipxe-bootimgs-aarch64", #ENGCMP-2123
-            "ipxe-bootimgs-x86", #ENGCMP-2123
-            "spirv-tools", #ENGCMP-2316
-            "sssd-idp", #ENGCMP-2310
-            "vulkan-headers", #ENGCMP-2316
-            "vulkan-loader", #ENGCMP-2316
-            "vulkan-loader-devel", #ENGCMP-2316
-            "vulkan-tools", #ENGCMP-2316
-            "vulkan-validation-layers", #ENGCMP-2316
-            "yara", #ENGCMP-2352
+            "qatlib-service", #ENGCMP-2489
+            "snactor", # ENGCMP-2274
+            "xmlstarlet", #ENGCMP-2553
         ]
     }),
     ("^AppStream$", {