diff --git a/include-excludes.conf b/include-excludes.conf
index 439b4d6..f382e13 100644
--- a/include-excludes.conf
+++ b/include-excludes.conf
@@ -1,9 +1,9 @@
 filter_packages = [
     ("^(BaseOS|AppStream)$", {
         "*": [
-            "python36",
-            "gcc-toolset-9-*-testsuite", 
-            "gcc-toolset-9-gcc-plugin-devel", 
+            "python36",  # RCM-42305 - ursine python36 should be only in buildroot
+            "gcc-toolset-9-*-testsuite", #RCM-58061
+            "gcc-toolset-9-gcc-plugin-devel", #RCM-58061
             "tuned-profiles-sap",       # RCM-53604 - This should be only in SAP
             "tuned-profiles-sap-hana",  # RCM-53604 - This should be only in SAPHANA
             "java-*slowdebug*",              # Jira: RHELCMP-1407 Jira: RHELCMP-1512 Jira: RHELCMP-4189
@@ -13,12 +13,13 @@ filter_packages = [
 
     ("^BaseOS$", {
         "*": [
-            "compat-openssl10-devel",
-            "compat-openssl10-pkcs11-helper",
-            "openldap-servers-debuginfo",
-            "ongres-scram",
+            "compat-openssl10-devel",  # RCM-26416
+            "compat-openssl10-pkcs11-helper",  # RCM-28614
+            "openldap-servers-debuginfo",  # RCM-28225
+            "ongres-scram",  # RCM-31750
         ]
     }),
+
     ("^Devel$", {
         "*": [
             "dlm",
@@ -28,7 +29,7 @@ filter_packages = [
     }),
     ("^.*$", {
         "*": [
-            "java-11-openjdk-*slowdebug*",
+            "kernel-*-internal",  # RCM-54000
         ]
     }),
 ]
@@ -91,10 +92,10 @@ additional_packages = [
             "modulemd-tools", #RhBug 1927050, RHELCMP-4123
             "emoji-picker", # RHELCMP-4254
             "rhc-worker-playbook", # RHBug 1931663, RHELCMP-4287
+            "gnome-session-kiosk-session", # RHBug 1959505, RHELCMP-5590
         ]
     }),
-
-    ("^BaseOS", {
+    ("^BaseOS$", {
         "*": [
             "python3-debuginfo", # RCM-73713
             "kmod-redhat-oracleasm",
@@ -108,6 +109,8 @@ additional_packages = [
 
     ("^BaseOS$", {
         "x86_64": [
+            # Keep alsa-sof-firmware synchronized with
+            # alsa-sof-firmware in the comps file
             "alsa-sof-firmware-debug", # Jira: RHELCMP-1838
         ],
     }),
@@ -134,7 +137,7 @@ additional_packages = [
         ]
     }),
 
-    ("^PowerTools", {
+    ("^PowerTools$", {
         "*": [
             "libdnf-devel",
             "librepo-devel",
@@ -144,6 +147,7 @@ additional_packages = [
             "ibus-typing-booster-tests", # RHELCMP-4254
         ]
     }),
+
     ("PowerTools", {
         "aarch64": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189