diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index 46213c0..f3bf6f7 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -39,6 +39,22 @@ filter_packages = [
     }),
 ]
 
+filter_modules = [
+    ("^AppStream$", {
+       "aarch64":
+             [
+             "eclipse:rhel8",
+             ],
+       "ppc64le":
+             [
+             "eclipse:rhel8",
+             ],
+       "s390x": [
+             "eclipse:rhel8",
+             ]
+           }),
+]
+
 additional_packages = [
     ("^AppStream$", {
         "*": [
@@ -118,7 +134,10 @@ additional_packages = [
             "php-pecl-xdebug3", #ENGCMP-1718
             "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
@@ -127,6 +146,19 @@ additional_packages = [
             "gnome-shell-extension-classification-banner", #ENGCMP-1770
             "gnome-shell-extension-dash-to-panel", #ENGCMP-1770
             "gnome-shell-extension-gesture-inhibitor", #ENGCMP-1770
+            "libreoffice-x11", #ENGCMP-1797
+            "autocorr-en", #ENGCMP-1797
+            "libcmis", #ENGCMP-1797
+            "libexttextcat", #ENGCMP-1797
+            "liborcus", #ENGCMP-1797
+            "libreoffice-core", #ENGCMP-1797
+            "libreoffice-data", #ENGCMP-1797
+            "libreoffice-help-en", #ENGCMP-1797
+            "libreoffice-langpack-en", #ENGCMP-1797
+            "libreoffice-opensymbol-fonts", #ENGCMP-1797
+            "libreoffice-ure", #ENGCMP-1797
+            "libreoffice-ure-common", #ENGCMP-1797
+            "greenboot-default-health-checks", #ENGCMP-1801
         ]
     }),
     ("^BaseOS$", {
@@ -157,6 +189,7 @@ additional_packages = [
             "dotnet-sdk-5.0-source-built-artifacts",
             "libcomps-devel", #RhBug 1960616
             "sblim-gather-provider", #RHBug 1959078, RHELCMP-6212
+            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
             "tesseract-devel", # RHELCMP-5762
             "shadow-utils-subid-devel", #ENGCMP-1597
         ]