diff --git a/include-excludes.conf b/include-excludes.conf
index 3ab1436..35f629f 100644
--- a/include-excludes.conf
+++ b/include-excludes.conf
@@ -4,6 +4,8 @@ filter_packages = [
             "python36",
             "gcc-toolset-9-*-testsuite", 
             "gcc-toolset-9-gcc-plugin-devel", 
+            "java-1.8.0-openjdk-headless-slowdebug",
+            "java-1.8.0-openjdk-slowdebug",
         ]
     }),
 
@@ -22,83 +24,148 @@ filter_packages = [
             "gfbgraph",
         ]
     }),
+    ("^.*$", {
+            "java-11-openjdk-*slowdebug*", 
+        ]
+    }),
+]
+
+filter_modules = [
+    ("^AppStream$", {
+       "aarch64":
+             [
+             "eclipse:rhel8",
+             ],
+       "ppc64le":
+             [
+             "eclipse:rhel8",
+             ],
+       "s390x": [
+             "eclipse:rhel8",
+             ]
+           }),
 ]
 
 additional_packages = [
     ("^AppStream$", {
         "*": [
-            "spice-qxl-xddm",
-            "langpacks-*",
-            "appstream-data",
-            "ansible-freeipa",
-            "fapolicyd",
-            "python3-rpmfluff",
-            "gcc-toolset-9", 
-            "gcc-toolset-9-annobin", 
-            "gcc-toolset-9-binutils", 
-            "gcc-toolset-9-binutils-devel",
-            "gcc-toolset-9-build",
-            "gcc-toolset-9-dwz",
-            "gcc-toolset-9-dyninst",
-            "gcc-toolset-9-elfutils",
-            "gcc-toolset-9-elfutils-devel",
-            "gcc-toolset-9-elfutils-libelf",
-            "gcc-toolset-9-elfutils-libelf-devel",
-            "gcc-toolset-9-elfutils-libs",
-            "gcc-toolset-9-gcc",
-            "gcc-toolset-9-gcc-c++",
-            "gcc-toolset-9-gcc-gdb-plugin",
-            "gcc-toolset-9-gcc-gfortran",
-            "gcc-toolset-9-gdb",
-            "gcc-toolset-9-gdb-doc",
-            "gcc-toolset-9-gdb-gdbserver",
-            "gcc-toolset-9-libitm-devel",
-            "gcc-toolset-9-libquadmath-devel",
-            "gcc-toolset-9-libstdc++-devel",
-            "gcc-toolset-9-libstdc++-docs",
-            "gcc-toolset-9-ltrace",
-            "gcc-toolset-9-make",
-            "gcc-toolset-9-make-devel",
-            "gcc-toolset-9-perftools",
-            "gcc-toolset-9-runtime",
-            "gcc-toolset-9-strace",
-            "gcc-toolset-9-systemtap",
-            "gcc-toolset-9-systemtap-client",
-            "gcc-toolset-9-systemtap-devel",
-            "gcc-toolset-9-systemtap-initscript",
-            "gcc-toolset-9-systemtap-runtime",
-            "gcc-toolset-9-systemtap-sdt-devel",
-            "gcc-toolset-9-systemtap-server",
-            "gcc-toolset-9-toolchain",
-            "gcc-toolset-9-valgrind",
-            "gcc-toolset-9-valgrind-devel",
+            "libasan5", 
+            "libubsan1",
+            "spice-vdagent-win-x64", 
+            "spice-vdagent-win-x86", 
+            "usbguard-selinux",
             "gcc-toolset-9-libasan-devel",
             "gcc-toolset-9-libatomic-devel",
             "gcc-toolset-9-liblsan-devel",
             "gcc-toolset-9-libubsan-devel",
             "gcc-toolset-9-libtsan-devel",
-            "libasan5", 
-            "libubsan1",
-            "perl-Convert-ASN1", 
-            "lttng-ust", 
-            "whois", 
-            "librsvg2-tools",  
-            "compat-exiv2-026",  
-            "prometheus-jmx-exporter",  
-            "jolokia-jvm-agent", 
-            "perl-LDAP", 
-            "python3-networkx", 
-            "liburing", 
-            "setools-console-analyses", 
-            "setools-gui", 
-            "virt-p2v-maker", 
-            "python3-protobuf", 
-            "NetworkManager-cloud-setup", 
-            "spice-client-win-x64", 
-            "spice-client-win-x86", 
-            "qt5-qtbase-private-devel", 
-            "spice-vdagent-win-x64", 
-            "spice-vdagent-win-x86", 
+            "gcc-toolset-10",
+            "gcc-toolset-10-binutils", 
+            "gcc-toolset-10-dyninst", 
+            "gcc-toolset-10-dyninst-devel", 
+            "gcc-toolset-10-strace", 
+            "gcc-toolset-10-gcc",
+            "gcc-toolset-10-gcc-gdb-plugin",
+            "gcc-toolset-10-libasan-devel",
+            "gcc-toolset-10-libatomic-devel",
+            "gcc-toolset-10-libitm-devel",
+            "gcc-toolset-10-liblsan-devel",
+            "gcc-toolset-10-libubsan-devel",
+            "gcc-toolset-10-libtsan-devel",
+            "gcc-toolset-10-libstdc++-docs",
+            "gcc-toolset-10-binutils-devel",
+            "gcc-toolset-10-build",
+            "gcc-toolset-10-elfutils-devel",
+            "gcc-toolset-10-elfutils-libelf-devel",
+            "gcc-toolset-10-gdb-doc",
+            "gcc-toolset-10-gdb-gdbserver",
+            "gcc-toolset-10-make-devel",
+            "gcc-toolset-10-systemtap-initscript",
+            "gcc-toolset-10-systemtap-sdt-devel",
+            "gcc-toolset-10-systemtap-server",
+            "gcc-toolset-10-valgrind-devel",
+            "ghostscript-x11", 
+            "python3-libmount", 
+            "itstool", 
+            "js-d3-flame-graph", 
+            "python3-wx-siplib", 
+            "osbuild",
+            "osbuild-composer",
+            "osbuild-ostree",
+            "osbuild-selinux", 
+            "python3-dasbus",
+            "NetworkManager-libreswan-gnome", 
+            "bogofilter",
+            "cmake-gui",
+            "evince",
+            "evince-browser-plugin",
+            "evolution-bogofilter",
+            "evolution-mapi",
+            "evolution-pst",
+            "evolution-spamassassin",
+            "exempi",
+            "exiv2",
+            "gnome-backgrounds-extras",
+            "gnome-getting-started-docs-cs",
+            "gnome-getting-started-docs-de",
+            "gnome-getting-started-docs-es",
+            "gnome-getting-started-docs-fr",
+            "gnome-getting-started-docs-gl",
+            "gnome-getting-started-docs-hu",
+            "gnome-getting-started-docs-it",
+            "gnome-getting-started-docs-pl",
+            "gnome-getting-started-docs-pt_BR",
+            "gnome-getting-started-docs-ru",
+            "gnome-shell-extension-auto-move-windows",
+            "gnome-shell-extension-dash-to-dock",
+            "gnome-shell-extension-drive-menu",
+            "gnome-shell-extension-native-window-placement",
+            "gnome-shell-extension-no-hot-corner",
+            "gnome-shell-extension-panel-favorites",
+            "gnome-shell-extension-screenshot-window-sizer",
+            "gnome-shell-extension-systemMonitor",
+            "gnome-shell-extension-top-icons",
+            "gnome-shell-extension-updates-dialog",
+            "gnome-shell-extension-user-theme",
+            "gnome-shell-extension-windowsNavigator",
+            "gnome-shell-extension-workspace-indicator",
+            "gnome-software-editor",
+            "gnome-tweaks",
+            "gstreamer1-plugins-good-gtk",
+            "highlight-gui",
+            "hplip-gui",
+            "hwloc-gui",
+            "java-11-openjdk-static-libs", 
+            "libproxy-gnome",
+            "lshw-gui",
+            "mdevctl",
+            "mpg123-plugins-pulseaudio",
+            "pipewire-devel",
+            "pipewire-docs",
+            "pipewire-utils",
+            "policycoreutils-gui",
+            "tuned-gtk",
+            "xmlsec1-nss", 
+            "udisks2-lsm",
+            "annobin-annocheck", 
+            "net-snmp-perl", 
+            "pipewire0.2-devel",
+            "pipewire0.2-libs", 
+            "usbguard-notifier", 
+            "rsyslog-omamqp1", 
+            "fapolicyd-selinux", 
+            "thermald",
+            "python3-brotli", 
+            "nmstate-plugin-ovsdb", 
+            "git-lfs", 
+            "tigervnc-server-module", 
+            "greenboot", 
+            "greenboot-grub2", 
+            "greenboot-reboot", 
+            "greenboot-rpm-ostree-grub2", 
+            "greenboot-status", 
+            "python3-libmodulemd", 
+            "dotnet5.0", 
         ]
     }),
 
@@ -160,15 +227,14 @@ additional_packages = [
 
     ("^BaseOS$", {
         "*": [
-            "kernel-doc",
 	    "centos-obsolete-packages",
-            "python3-nftables",  
+            "sssd-polkit-rules", 
+            "python3-debuginfo", 
             "python3-dnf-plugin-post-transaction-actions", 
-            "elfutils-debuginfod", 
-            "elfutils-debuginfod-client", 
-            "elfutils-debuginfod-client-devel", 
-            "libbpf", 
-	    "python3-debuginfo", 
+            "python3-solv", 
+            "libxmlb", 
+            "crypto-policies-scripts", 
+            "memstrack",
         ],
 	"armhfp": [
 	    "kernel-lpae*",