diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index e429340..5b354c4 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -7,8 +7,8 @@ filter_packages = [
             "gcc-toolset-9-gcc-plugin-devel",
             "tuned-profiles-sap",
             "tuned-profiles-sap-hana",
-            "java-1.8.0-openjdk-headless-slowdebug",
-            "java-1.8.0-openjdk-slowdebug",
+            "java-*slowdebug*",
+            "java-*fastdebug*",
         ]
     }),
 
@@ -32,7 +32,6 @@ filter_packages = [
         "*": [
             "kernel-*-internal",  
             "kpatch-patch-*-internal",
-            "java-11-openjdk-*slowdebug*",
         ]
     }),
 ]
@@ -52,11 +51,13 @@ additional_packages = [
             "nispor-devel",
             "python3-nispor",
             "libnumbertext",
-            "dotnet-sdk-3.1",
+            "dotnet-sdk-3.0",
             "perl-IO-String",
+            "stalld",
             "dejavu-lgc-sans-fonts",
             "xorg-x11-drivers",
             "fstrm",
+            "fstrm-devel",
             "ucx-cma",
             "ucx-ib",
             "ucx-rdmacm"
@@ -71,6 +72,9 @@ additional_packages = [
             "rshim",
             "qatlib",
             "tracer",
+            "flatpak-xdg-utils",
+            "modulemd-tools",
+            "emoji-picker",
         ]
     }),
 
@@ -81,7 +85,8 @@ additional_packages = [
             "python3-pyverbs",
             "syslinux-tftpboot",
             "samba-winexe",
-            "accel-config", 
+            "accel-config",
+            "ima-evm-utils0",
         ]
     }),
     ("^BaseOS$", {
@@ -92,6 +97,12 @@ additional_packages = [
         ],
     }),
 
+    ("^Buildroot$", {
+        "*": [
+            "*",
+        ]
+    }),
+
     ("^PowerTools$", {
         "*": [
             "libdnf-devel",
@@ -99,12 +110,28 @@ additional_packages = [
             "librhsm-devel",
             "libsolv-devel",
             "libsolv-tools",
+            "ibus-typing-booster-tests",
         ]
-    })
+    }),
 
-    ("^Buildroot$", {
-        "*": [
-            "*",
+    ("PowerTools", {
+        "aarch64": [
+            "java-1.8.0-openjdk-*slowdebug*",
+            "java-11-openjdk-*slowdebug*",
+        ],
+        "ppc64le": [
+            "java-1.8.0-openjdk-*slowdebug*",
+            "java-11-openjdk-*slowdebug*",
+        ],
+        "x86_64": [
+            "java-1.8.0-openjdk-*slowdebug*",
+            "java-11-openjdk-*slowdebug*",
+        ],
+    }),
+    ("PowerTools", {
+        "x86_64": [
+            "java-1.8.0-openjdk-*fastdebug*",
+            "java-11-openjdk-*fastdebug*",
         ]
-    })
+    }),
 ]