diff --git a/centos-stream-packages.json b/centos-stream-packages.json
index f696d67..a165cb9 100644
--- a/centos-stream-packages.json
+++ b/centos-stream-packages.json
@@ -1521,11 +1521,7 @@
       "graphviz": [
         "graphviz.aarch64"
       ], 
-      "greenboot": [
-        "greenboot-grub2.aarch64", 
-        "greenboot-reboot.aarch64", 
-        "greenboot-rpm-ostree-grub2.aarch64", 
-        "greenboot-status.aarch64", 
+      "greenboot": [ 
         "greenboot.aarch64"
       ], 
       "grilo": [
@@ -7632,11 +7628,7 @@
       "graphviz": [
         "graphviz.ppc64le"
       ], 
-      "greenboot": [
-        "greenboot-grub2.ppc64le", 
-        "greenboot-reboot.ppc64le", 
-        "greenboot-rpm-ostree-grub2.ppc64le", 
-        "greenboot-status.ppc64le", 
+      "greenboot": [ 
         "greenboot.ppc64le"
       ], 
       "grilo": [
@@ -14289,11 +14281,7 @@
         "graphviz.i686", 
         "graphviz.x86_64"
       ], 
-      "greenboot": [
-        "greenboot-grub2.x86_64", 
-        "greenboot-reboot.x86_64", 
-        "greenboot-rpm-ostree-grub2.x86_64", 
-        "greenboot-status.x86_64", 
+      "greenboot": [ 
         "greenboot.x86_64"
       ], 
       "grilo": [
diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index bdad5cb..ea35617 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -9,7 +9,6 @@ filter_packages = [
             "tuned-profiles-sap-hana",  # RCM-53604 - This should be only in SAPHANA
             "java-*slowdebug*",              # Jira: RHELCMP-1407 Jira: RHELCMP-1512 Jira: RHELCMP-4189
             "java-*fastdebug*",              # Jira: RHELCMP-1407 Jira: RHELCMP-1512 Jira: RHELCMP-4189
-            "grubby-deprecated*",            # Jira: RHELCMP-6812
         ]
     }),
 
@@ -64,6 +63,7 @@ additional_packages = [
             "bind9.16-utils", #ENGCMP-1675
             "bind9.16-libs", #ENGCMP-1675
             "bind9.16-license", #ENGCMP-1675
+            "cockpit-leapp", #ENGCMP-1819
             "libasan5", #RCM-61474
             "libubsan1",
             "gnome-software-editor",
@@ -132,6 +132,7 @@ additional_packages = [
             "hyperv-tools", #ENGCMP-1668
             "nmstate-libs", #ENGCMP-1702
             "php-pecl-xdebug3", #ENGCMP-1718
+            "fdo-admin-cli", #ENGCMP-1993
             "fdo-init", #ENGCMP-1717
             "fdo-client", #ENGCMP-1717
             "fdo-manufacturing-server", #ENGCMP-1843
@@ -160,7 +161,7 @@ additional_packages = [
             "libreoffice-calc", #ENGCMP-1847
             "libreoffice-core", #ENGCMP-1797
             "libreoffice-data", #ENGCMP-1797
-            "libreoffice-data", #ENGCMP-1797
+            "libreoffice-graphicfilter", #ENGCMP-1847
             "libreoffice-help-en", #ENGCMP-1797
             "libreoffice-impress", #ENGCMP-1847
             "libreoffice-langpack-en", #ENGCMP-1797
@@ -175,6 +176,7 @@ additional_packages = [
             "libzmf", #ENGCMP-1847
             "lpsolve", #ENGCMP-1847
             "greenboot-default-health-checks", #ENGCMP-1801
+            "fence-virtd-cpg", #ENGCMP-1972
         ]
     }),
     ("^BaseOS$", {
@@ -183,6 +185,7 @@ additional_packages = [
             "python3-debuginfo", # RCM-73713
             "compat-hwloc1", #RhBug 1979150
             "libqrtr-glib", #RHBug 2016402, RHELCMP-7140
+            "NetworkManager-initscripts-updown", #ENGCMP-1991
             "shadow-utils-subid", #ENGCMP-1597
         ]
     }),