diff --git a/common/include-excludes.conf b/common/include-excludes.conf
index 12536e3..8233b13 100644
--- a/common/include-excludes.conf
+++ b/common/include-excludes.conf
@@ -20,6 +20,7 @@ filter_packages = [
             "compat-openssl10-pkcs11-helper",
             "openldap-servers-debuginfo",
             "ongres-scram",
+            "libcomps-devel"
         ]
     }),
 
@@ -111,12 +112,16 @@ additional_packages = [
             "samba-winexe",
             "accel-config",
             "ima-evm-utils0",
+            "compat-hwloc1"
         ]
     }),
     ("^BaseOS$", {
         "x86_64": [
             "alsa-sof-firmware-debug",
         ],
+        "aarch64": [
+            "opencsd",
+        ]
     }),
 
     ("^Devel$", {
@@ -848,14 +853,17 @@ additional_packages = [
         "aarch64": [
             "java-1.8.0-openjdk-*slowdebug*",
             "java-11-openjdk-*slowdebug*",
+            "java-17-openjdk-*slowdebug*",
         ],
         "ppc64le": [
             "java-1.8.0-openjdk-*slowdebug*",
             "java-11-openjdk-*slowdebug*",
+            "java-17-openjdk-*slowdebug*",
         ],
         "x86_64": [
             "java-1.8.0-openjdk-*slowdebug*",
             "java-11-openjdk-*slowdebug*",
+            "java-17-openjdk-*slowdebug*",
         ],
     }),
 
@@ -863,6 +871,17 @@ additional_packages = [
         "x86_64": [
             "java-1.8.0-openjdk-*fastdebug*",
             "java-11-openjdk-*fastdebug*",
+            "java-17-openjdk-*fastdebug*",
+        ],
+        "aarch64": [
+            "java-1.8.0-openjdk-*fastdebug*",
+            "java-11-openjdk-*fastdebug*",
+            "java-17-openjdk-*fastdebug*",
+        ],
+        "ppc64le": [
+            "java-1.8.0-openjdk-*fastdebug*",
+            "java-11-openjdk-*fastdebug*",
+            "java-17-openjdk-*fastdebug*",
         ]
     }),
 
diff --git a/common/multilib.conf b/common/multilib.conf
index de57977..e83b39f 100644
--- a/common/multilib.conf
+++ b/common/multilib.conf
@@ -8,6 +8,8 @@ multilib_blacklist = {
         "fwupd*",
         "gcc-toolset-10-systemtap*",
         "gcc-toolset-10-dyninst-*",
+        "sblim-gather*",
+        "gcc-toolset-11-dyninst-devel"
     ],
 }
 
@@ -18,6 +20,7 @@ multilib_whitelist = {
          "papi",
 	       "gcc-toolset-9-valgrind",
 	       "gcc-toolset-10-valgrind",
+	       "gcc-toolset-11-valgrind",
          "p11-kit-trust",
     ],
 }