diff --git a/upcoming/include-excludes.conf b/upcoming/include-excludes.conf
index a79f441..ad56d4d 100644
--- a/upcoming/include-excludes.conf
+++ b/upcoming/include-excludes.conf
@@ -3,7 +3,6 @@ filter_packages = [
         "*": [
             "python36",
             "gcc-toolset-9-*-testsuite", 
-            "gcc-toolset-9-gcc-plugin-devel", 
             "java-*slowdebug*",
             "java-*fastdebug*",
         ]
@@ -20,222 +19,119 @@ filter_packages = [
 
 ]
 
-filter_modules = [
-    ("^AppStream$", {
-       "aarch64":
-             [
-             "eclipse:rhel8",
-             ],
-       "ppc64le":
-             [
-             "eclipse:rhel8",
-             ],
-       "s390x": [
-             "eclipse:rhel8",
-             ]
-           }),
-]
+#filter_modules = [
+#    ("^AppStream$", {
+#       "aarch64":
+#             [
+#             "eclipse:rhel8",
+#             ],
+#       "ppc64le":
+#             [
+#             "eclipse:rhel8",
+#             ],
+#       "s390x": [
+#             "eclipse:rhel8",
+#             ]
+#           }),
+#]
 
 additional_packages = [
     ("^AppStream$", {
         "*": [
             "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",
-            "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",
+            "dotnet5.0",
+            "gcc-toolset-10-dyninst-devel",
             "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", 
+            "rt-tests",
+            "micropipenv",
+            "nispor",
+            "nispor-devel",
+            "python3-nispor",
+            "libnumbertext",
+            "dotnet-sdk-3.0",
+            "perl-IO-String",
+            "stalld",
+            "dejavu-lgc-sans-fonts",
+            "xorg-x11-drivers",
+            "fstrm",
+            "fstrm-devel",
+            "ucx-cma",
+            "ucx-ib",
+            "ucx-rdmacm"
+            "ucx-devel",
+            "mpich-doc",
+            "mvapich2-devel",
+            "mvapich2-psm2-devel",
+            "mvapich2-doc",
+            "libecpg",
+            "rsyslog-udpspoof",
+            "mysql-selinux",
+            "rshim",
+            "qatlib",
+            "tracer",
+            "flatpak-xdg-utils",
+            "modulemd-tools",
+            "emoji-picker",
         ]
     }),
 
-    ("^Devel$", {
-        "*": [
-            "argparse-manpage",
-            "autogen-libopts-devel",
-            "gfbgraph-devel",
-            "jbig2dec-devel",
-            "liba52-devel",
-            "libavc1394-devel",
-            "libdvdnav-devel",
-            "libnml-devel",
-            "libss-devel",
-            "libssh2-devel",
-            "libuv-devel",
-            "mobile-broadband-provider-info-devel",
-            "openslp-devel",
-            "protobuf-lite-devel",
-            "quota-devel",
-            "rest-devel",
-            "tracker-devel",
-        ]
-    }),
-
-    ("^PowerTools", {
-        "*": [
-            "opencv",
-        ]
-    }),
-
-
-    ("^AppStream$", {
-        "x86_64": [
-
-            "libreoffice-langpack-*",
-            "libreoffice-help-*",
-        ],
-        "aarch64": [
-            "vulkan-loader",
-            "vulkan-loader-devel", 
-            "vulkan-headers",
-            "vulkan-validation-layers",
-            "vulkan-tools",
-        ],
-	"armhfp": [
-            "libreoffice-*",
-            "libreoffice-help-*",
-            "libreoffice-langpack-*",
-	    "emacs-*",
-	    "autocorr*",
-            "fence-agents*",
-            "gnome-shell-extension*",
-            "google-noto*",
-            "hunspell-*",
-            "hyphen-*",
-	]
-    }),
+#    ("^Devel$", {
+#        "*": [
+#            "*",
+#        ]
+#    }),
 
     ("^BaseOS$", {
         "*": [
-	    "rocky-obsolete-packages",
-            "sssd-polkit-rules", 
-            "python3-debuginfo", 
-            "python3-dnf-plugin-post-transaction-actions", 
-            "python3-solv", 
-            "libxmlb", 
-            "crypto-policies-scripts", 
-            "memstrack",
+            "centos-stream-repos",
+            "python3-debuginfo",
+            "python3-pyverbs",
+            "syslinux-tftpboot",
+            "samba-winexe",
+            "accel-config",
+            "ima-evm-utils0",
+        ]
+    }),
+    ("^BaseOS$", {
+        "x86_64": [
+            # Keep alsa-sof-firmware synchronized with
+            # alsa-sof-firmware in the comps file
+            "alsa-sof-firmware-debug",
         ],
-	"armhfp": [
-	    "kernel-lpae*",
-	    "uboot-tools",
-            "uboot-images*",
-            "grub2*",
-            "grubby-deprecated",
-            "efibootmgr",
-            "cloud-utils-growpart",
-            "bcm283x-firmware",
-            "efivar*",
-	]
+    }),
+
+    ("^PowerTools$", {
+        "*": [
+            "libdnf-devel",
+            "librepo-devel",
+            "librhsm-devel",
+            "libsolv-devel",
+            "libsolv-tools",
+            "ibus-typing-booster-tests",
+        ]
+    }),
+
+    ("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*",
+        ]
     }),
 ]