diff --git a/c8-stream.conf b/c8-stream.conf
index 77b6592..326470b 100644
--- a/c8-stream.conf
+++ b/c8-stream.conf
@@ -3,17 +3,17 @@ from stream-include-excludes import *
 #from stream-images import *
 
 # PRODUCT INFO
-release_name = "CentOS Stream" 
+release_name = "CentOS Stream"
 release_short = "CentOS-Stream"
 release_version = "8"
 version = "8"
 
 # GENERAL SETTINGS
 comps_file = {
-        'scm': 'git',
-        'repo': 'https://git.centos.org/centos/comps.git',
-        'branch': 'master',
-        'file': 'comps-centos-8-stream.xml',
+    'scm': 'git',
+    'repo': 'https://git.centos.org/centos/comps.git',
+    'branch': 'master',
+    'file': 'comps-centos-8-stream.xml',
 }
 
 link_type = 'hardlink-or-copy'
@@ -22,10 +22,10 @@ sigkeys = ['8483C65D']
 tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
 
 module_defaults_dir = {
-        'scm': 'git',
-        'repo': 'https://git.centos.org/centos/centos-module-defaults.git',
-        'branch': 'c8s',
-        'dir': '.',
+    'scm': 'git',
+    'repo': 'https://git.centos.org/centos/centos-module-defaults.git',
+    'branch': 'c8s',
+    'dir': '.',
 }
 
 multilib = [
@@ -34,7 +34,7 @@ multilib = [
     }),
 ]
 
-# RUNROOT SETTINGS
+# RUNROOT settings
 runroot_channel = 'image'
 runroot_tag = 'dist-c8-build'
 runroot_method = 'koji'
@@ -59,10 +59,10 @@ repoclosure_backend = "dnf"
 gather_prepopulate = "centos-stream-packages.json"
 
 gather_method = {
-        "^(?!(AppStream|PowerTools|CR)).*$":{
-                "comps": "deps"
-        },
-        "^(AppStream|PowerTools|CR)$": "hybrid",
+    "^(?!(AppStream|PowerTools|CR)).*$": {
+        "comps": "deps",
+    },
+    "^(AppStream|PowerTools|CR)$": "hybrid",
 }
 
 hashed_directories = False
@@ -107,7 +107,7 @@ lorax_options = [
 
 buildinstall_skip = [
     ("^(AppStream|PowerTools|CR|HighAvailability|RT|ResilientStorage|NFV)$", {
-       "*": True
+        "*": True
     }),
 ]
 
@@ -133,8 +133,7 @@ extra_isos = {
         "include_variants": ["AppStream"],
         "filename": "{release_short}-{version}-{arch}-{date}-{disc_type}{disc_num}{suffix}",
         "skip_src": True,
-    },
-    ]
+    }]
 }
 
 restricted_volid = True
@@ -167,13 +166,13 @@ extra_files = [
                 ],
                 "target": "",
             },
-        ]
+        ],
     }),
 ]
 
 productimg = False
 
 translate_paths = [
-	("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
-	("/compose", "http://172.22.0.123/compose"),
+        ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
+        ("/compose", "http://172.22.0.123/compose"),
 ]
diff --git a/centos-stream-packages.json b/centos-stream-packages.json
index 09d8a6d..4e4da71 100644
--- a/centos-stream-packages.json
+++ b/centos-stream-packages.json
@@ -33,6 +33,7 @@
         "SDL.aarch64"
       ],
       "WALinuxAgent": [
+        "WALinuxAgent-udev.noarch",
         "WALinuxAgent.noarch"
       ],
       "Xaw3d": [
@@ -453,7 +454,6 @@
         "cmake.aarch64"
       ],
       "cockpit-appstream": [
-        "cockpit-dashboard.noarch",
         "cockpit-machines.noarch",
         "cockpit-packagekit.noarch",
         "cockpit-pcp.aarch64",
@@ -584,6 +584,9 @@
       "dcraw": [
         "dcraw.aarch64"
       ],
+      "dejavu-fonts": [
+        "dejavu-lgc-sans-fonts.noarch"
+      ],
       "desktop-file-utils": [
         "desktop-file-utils.aarch64"
       ],
@@ -842,9 +845,12 @@
         "fribidi.aarch64"
       ],
       "frr": [
-        "frr-contrib.aarch64",
         "frr.aarch64"
       ],
+      "fstrm": [
+        "fstrm-devel.aarch64",
+        "fstrm.aarch64"
+      ],
       "ftp": [
         "ftp.aarch64"
       ],
@@ -882,6 +888,7 @@
         "gcc-toolset-10-dwz.aarch64"
       ],
       "gcc-toolset-10-dyninst": [
+        "gcc-toolset-10-dyninst-devel.aarch64",
         "gcc-toolset-10-dyninst.aarch64"
       ],
       "gcc-toolset-10-elfutils": [
@@ -1417,22 +1424,10 @@
         "gpm.aarch64"
       ],
       "grafana": [
-        "grafana-azure-monitor.aarch64",
-        "grafana-cloudwatch.aarch64",
-        "grafana-elasticsearch.aarch64",
-        "grafana-graphite.aarch64",
-        "grafana-influxdb.aarch64",
-        "grafana-loki.aarch64",
-        "grafana-mssql.aarch64",
-        "grafana-mysql.aarch64",
-        "grafana-opentsdb.aarch64",
-        "grafana-postgres.aarch64",
-        "grafana-prometheus.aarch64",
-        "grafana-stackdriver.aarch64",
         "grafana.aarch64"
       ],
       "grafana-pcp": [
-        "grafana-pcp.noarch"
+        "grafana-pcp.aarch64"
       ],
       "graphite2": [
         "graphite2-devel.aarch64",
@@ -2188,7 +2183,7 @@
       ],
       "icedtea-web": [
         "icedtea-web-javadoc.noarch",
-        "icedtea-web.noarch"
+        "icedtea-web.aarch64"
       ],
       "icoutils": [
         "icoutils.aarch64"
@@ -2319,6 +2314,9 @@
       "js-d3-flame-graph": [
         "js-d3-flame-graph.noarch"
       ],
+      "json-c": [
+        "json-c-devel.aarch64"
+      ],
       "json-glib": [
         "json-glib-devel.aarch64"
       ],
@@ -2699,6 +2697,10 @@
         "libeasyfc-gobject.aarch64",
         "libeasyfc.aarch64"
       ],
+      "libecpg": [
+        "libecpg.aarch64",
+        "libpgtypes.aarch64"
+      ],
       "libepoxy": [
         "libepoxy-devel.aarch64",
         "libepoxy.aarch64"
@@ -2894,6 +2896,9 @@
         "libnotify-devel.aarch64",
         "libnotify.aarch64"
       ],
+      "libnumbertext": [
+        "libnumbertext.aarch64"
+      ],
       "liboauth": [
         "liboauth-devel.aarch64",
         "liboauth.aarch64"
@@ -3334,6 +3339,9 @@
       "metacity": [
         "metacity.aarch64"
       ],
+      "micropipenv": [
+        "micropipenv.noarch"
+      ],
       "mod_auth_gssapi": [
         "mod_auth_gssapi.aarch64"
       ],
@@ -3387,6 +3395,7 @@
       ],
       "mpich": [
         "mpich-devel.aarch64",
+        "mpich-doc.noarch",
         "mpich.aarch64"
       ],
       "mpitests": [
@@ -3426,8 +3435,13 @@
         "mutter.aarch64"
       ],
       "mvapich2": [
+        "mvapich2-devel.aarch64",
+        "mvapich2-doc.noarch",
         "mvapich2.aarch64"
       ],
+      "mysql-selinux": [
+        "mysql-selinux.noarch"
+      ],
       "mythes": [
         "mythes.aarch64"
       ],
@@ -3541,6 +3555,11 @@
         "newt-devel.aarch64",
         "python3-newt.aarch64"
       ],
+      "nispor": [
+        "nispor-devel.aarch64",
+        "nispor.aarch64",
+        "python3-nispor.noarch"
+      ],
       "nmap": [
         "nmap-ncat.aarch64",
         "nmap.aarch64"
@@ -3767,7 +3786,6 @@
         "pcp-import-sar2pcp.aarch64",
         "pcp-libs-devel.aarch64",
         "pcp-libs.aarch64",
-        "pcp-manager.aarch64",
         "pcp-pmda-activemq.aarch64",
         "pcp-pmda-apache.aarch64",
         "pcp-pmda-bash.aarch64",
@@ -4024,6 +4042,9 @@
       "perl-IO-Socket-IP": [
         "perl-IO-Socket-IP.noarch"
       ],
+      "perl-IO-String": [
+        "perl-IO-String.noarch"
+      ],
       "perl-IPC-Cmd": [
         "perl-IPC-Cmd.noarch"
       ],
@@ -4362,11 +4383,14 @@
         "prometheus-jmx-exporter.noarch"
       ],
       "protobuf": [
+        "protobuf-compiler.aarch64",
         "protobuf-lite.aarch64",
         "protobuf.aarch64",
         "python3-protobuf.noarch"
       ],
       "protobuf-c": [
+        "protobuf-c-compiler.aarch64",
+        "protobuf-c-devel.aarch64",
         "protobuf-c.aarch64"
       ],
       "pulseaudio": [
@@ -4394,6 +4418,9 @@
         "pykickstart.noarch",
         "python3-kickstart.noarch"
       ],
+      "pyodbc": [
+        "python3-pyodbc.aarch64"
+      ],
       "pyparted": [
         "python3-pyparted.aarch64"
       ],
@@ -4857,6 +4884,7 @@
         "rsyslog-pgsql.aarch64",
         "rsyslog-relp.aarch64",
         "rsyslog-snmp.aarch64",
+        "rsyslog-udpspoof.aarch64",
         "rsyslog.aarch64"
       ],
       "rtkit": [
@@ -5059,6 +5087,9 @@
       "sscg": [
         "sscg.aarch64"
       ],
+      "stalld": [
+        "stalld.aarch64"
+      ],
       "startup-notification": [
         "startup-notification-devel.aarch64",
         "startup-notification.aarch64"
@@ -5554,6 +5585,10 @@
         "ucs-miscfixed-fonts.noarch"
       ],
       "ucx": [
+        "ucx-cma.aarch64",
+        "ucx-devel.aarch64",
+        "ucx-ib.aarch64",
+        "ucx-rdmacm.aarch64",
         "ucx.aarch64"
       ],
       "udisks2": [
@@ -5761,10 +5796,6 @@
       "xdg-utils": [
         "xdg-utils.noarch"
       ],
-      "xdp-tools": [
-        "libxdp.aarch64",
-        "xdp-tools.aarch64"
-      ],
       "xinetd": [
         "xinetd.aarch64"
       ],
@@ -5959,6 +5990,7 @@
         "SDL.ppc64le"
       ],
       "WALinuxAgent": [
+        "WALinuxAgent-udev.noarch",
         "WALinuxAgent.noarch"
       ],
       "Xaw3d": [
@@ -6383,7 +6415,6 @@
         "cmake.ppc64le"
       ],
       "cockpit-appstream": [
-        "cockpit-dashboard.noarch",
         "cockpit-machines.noarch",
         "cockpit-packagekit.noarch",
         "cockpit-pcp.ppc64le",
@@ -6514,6 +6545,9 @@
       "dcraw": [
         "dcraw.ppc64le"
       ],
+      "dejavu-fonts": [
+        "dejavu-lgc-sans-fonts.noarch"
+      ],
       "desktop-file-utils": [
         "desktop-file-utils.ppc64le"
       ],
@@ -6752,6 +6786,9 @@
       "fltk": [
         "fltk.ppc64le"
       ],
+      "flute": [
+        "flute.noarch"
+      ],
       "fontawesome-fonts": [
         "fontawesome-fonts.noarch"
       ],
@@ -6789,9 +6826,12 @@
         "fribidi.ppc64le"
       ],
       "frr": [
-        "frr-contrib.ppc64le",
         "frr.ppc64le"
       ],
+      "fstrm": [
+        "fstrm-devel.ppc64le",
+        "fstrm.ppc64le"
+      ],
       "ftp": [
         "ftp.ppc64le"
       ],
@@ -6831,6 +6871,7 @@
         "gcc-toolset-10-dwz.ppc64le"
       ],
       "gcc-toolset-10-dyninst": [
+        "gcc-toolset-10-dyninst-devel.ppc64le",
         "gcc-toolset-10-dyninst.ppc64le"
       ],
       "gcc-toolset-10-elfutils": [
@@ -7390,22 +7431,10 @@
         "gpm.ppc64le"
       ],
       "grafana": [
-        "grafana-azure-monitor.ppc64le",
-        "grafana-cloudwatch.ppc64le",
-        "grafana-elasticsearch.ppc64le",
-        "grafana-graphite.ppc64le",
-        "grafana-influxdb.ppc64le",
-        "grafana-loki.ppc64le",
-        "grafana-mssql.ppc64le",
-        "grafana-mysql.ppc64le",
-        "grafana-opentsdb.ppc64le",
-        "grafana-postgres.ppc64le",
-        "grafana-prometheus.ppc64le",
-        "grafana-stackdriver.ppc64le",
         "grafana.ppc64le"
       ],
       "grafana-pcp": [
-        "grafana-pcp.noarch"
+        "grafana-pcp.ppc64le"
       ],
       "graphite2": [
         "graphite2-devel.ppc64le",
@@ -8177,7 +8206,7 @@
       ],
       "icedtea-web": [
         "icedtea-web-javadoc.noarch",
-        "icedtea-web.noarch"
+        "icedtea-web.ppc64le"
       ],
       "icoutils": [
         "icoutils.ppc64le"
@@ -8308,6 +8337,9 @@
       "js-d3-flame-graph": [
         "js-d3-flame-graph.noarch"
       ],
+      "json-c": [
+        "json-c-devel.ppc64le"
+      ],
       "json-glib": [
         "json-glib-devel.ppc64le"
       ],
@@ -8613,6 +8645,9 @@
       "libavc1394": [
         "libavc1394.ppc64le"
       ],
+      "libbase": [
+        "libbase.noarch"
+      ],
       "libblockdev": [
         "libblockdev-crypto.ppc64le",
         "libblockdev-dm.ppc64le",
@@ -8703,6 +8738,10 @@
         "libeasyfc-gobject.ppc64le",
         "libeasyfc.ppc64le"
       ],
+      "libecpg": [
+        "libecpg.ppc64le",
+        "libpgtypes.ppc64le"
+      ],
       "libepoxy": [
         "libepoxy-devel.ppc64le",
         "libepoxy.ppc64le"
@@ -8740,6 +8779,12 @@
       "libfontenc": [
         "libfontenc.ppc64le"
       ],
+      "libfonts": [
+        "libfonts.noarch"
+      ],
+      "libformula": [
+        "libformula.noarch"
+      ],
       "libfprint": [
         "libfprint.ppc64le"
       ],
@@ -8859,6 +8904,12 @@
         "liblangtag-data.noarch",
         "liblangtag.ppc64le"
       ],
+      "liblayout": [
+        "liblayout.noarch"
+      ],
+      "libloader": [
+        "libloader.noarch"
+      ],
       "liblockfile": [
         "liblockfile.ppc64le"
       ],
@@ -8929,6 +8980,9 @@
         "libnotify-devel.ppc64le",
         "libnotify.ppc64le"
       ],
+      "libnumbertext": [
+        "libnumbertext.ppc64le"
+      ],
       "liboauth": [
         "liboauth-devel.ppc64le",
         "liboauth.ppc64le"
@@ -9045,6 +9099,7 @@
         "autocorr-tr.noarch",
         "autocorr-vi.noarch",
         "autocorr-zh.noarch",
+        "libreoffice-base.ppc64le",
         "libreoffice-calc.ppc64le",
         "libreoffice-core.ppc64le",
         "libreoffice-data.noarch",
@@ -9101,11 +9156,13 @@
         "libreoffice-impress.ppc64le",
         "libreoffice-langpack-en.ppc64le",
         "libreoffice-math.ppc64le",
+        "libreoffice-ogltrans.ppc64le",
         "libreoffice-opensymbol-fonts.noarch",
         "libreoffice-pdfimport.ppc64le",
         "libreoffice-pyuno.ppc64le",
         "libreoffice-ure-common.noarch",
         "libreoffice-ure.ppc64le",
+        "libreoffice-wiki-publisher.ppc64le",
         "libreoffice-writer.ppc64le",
         "libreoffice-x11.ppc64le",
         "libreoffice-xsltfilter.ppc64le",
@@ -9133,6 +9190,9 @@
         "libreport.ppc64le",
         "python3-libreport.ppc64le"
       ],
+      "librepository": [
+        "librepository.noarch"
+      ],
       "libreswan": [
         "libreswan.ppc64le"
       ],
@@ -9154,6 +9214,9 @@
       "libselinux": [
         "libselinux-ruby.ppc64le"
       ],
+      "libserializer": [
+        "libserializer.noarch"
+      ],
       "libshout": [
         "libshout.ppc64le"
       ],
@@ -9499,6 +9562,9 @@
       "metacity": [
         "metacity.ppc64le"
       ],
+      "micropipenv": [
+        "micropipenv.noarch"
+      ],
       "mod_auth_gssapi": [
         "mod_auth_gssapi.ppc64le"
       ],
@@ -9552,6 +9618,7 @@
       ],
       "mpich": [
         "mpich-devel.ppc64le",
+        "mpich-doc.noarch",
         "mpich.ppc64le"
       ],
       "mpitests": [
@@ -9591,8 +9658,13 @@
         "mutter.ppc64le"
       ],
       "mvapich2": [
+        "mvapich2-devel.ppc64le",
+        "mvapich2-doc.noarch",
         "mvapich2.ppc64le"
       ],
+      "mysql-selinux": [
+        "mysql-selinux.noarch"
+      ],
       "mythes": [
         "mythes.ppc64le"
       ],
@@ -9706,6 +9778,11 @@
         "newt-devel.ppc64le",
         "python3-newt.ppc64le"
       ],
+      "nispor": [
+        "nispor-devel.ppc64le",
+        "nispor.ppc64le",
+        "python3-nispor.noarch"
+      ],
       "nmap": [
         "nmap-ncat.ppc64le",
         "nmap.ppc64le"
@@ -9932,7 +10009,6 @@
         "pcp-import-sar2pcp.ppc64le",
         "pcp-libs-devel.ppc64le",
         "pcp-libs.ppc64le",
-        "pcp-manager.ppc64le",
         "pcp-pmda-activemq.ppc64le",
         "pcp-pmda-apache.ppc64le",
         "pcp-pmda-bash.ppc64le",
@@ -10012,6 +10088,12 @@
         "perl-PCP-PMDA.ppc64le",
         "python3-pcp.ppc64le"
       ],
+      "pentaho-libxml": [
+        "pentaho-libxml.noarch"
+      ],
+      "pentaho-reporting-flow-engine": [
+        "pentaho-reporting-flow-engine.noarch"
+      ],
       "peripety": [
         "peripety.ppc64le"
       ],
@@ -10189,6 +10271,9 @@
       "perl-IO-Socket-IP": [
         "perl-IO-Socket-IP.noarch"
       ],
+      "perl-IO-String": [
+        "perl-IO-String.noarch"
+      ],
       "perl-IPC-Cmd": [
         "perl-IPC-Cmd.noarch"
       ],
@@ -10526,11 +10611,14 @@
         "prometheus-jmx-exporter.noarch"
       ],
       "protobuf": [
+        "protobuf-compiler.ppc64le",
         "protobuf-lite.ppc64le",
         "protobuf.ppc64le",
         "python3-protobuf.noarch"
       ],
       "protobuf-c": [
+        "protobuf-c-compiler.ppc64le",
+        "protobuf-c-devel.ppc64le",
         "protobuf-c.ppc64le"
       ],
       "pulseaudio": [
@@ -10558,6 +10646,9 @@
         "pykickstart.noarch",
         "python3-kickstart.noarch"
       ],
+      "pyodbc": [
+        "python3-pyodbc.ppc64le"
+      ],
       "pyparted": [
         "python3-pyparted.ppc64le"
       ],
@@ -11033,6 +11124,7 @@
         "rsyslog-pgsql.ppc64le",
         "rsyslog-relp.ppc64le",
         "rsyslog-snmp.ppc64le",
+        "rsyslog-udpspoof.ppc64le",
         "rsyslog.ppc64le"
       ],
       "rtkit": [
@@ -11044,6 +11136,9 @@
       "saab-fonts": [
         "saab-fonts.noarch"
       ],
+      "sac": [
+        "sac.noarch"
+      ],
       "samyak-fonts": [
         "samyak-devanagari-fonts.noarch",
         "samyak-fonts-common.noarch",
@@ -11234,6 +11329,9 @@
       "sscg": [
         "sscg.ppc64le"
       ],
+      "stalld": [
+        "stalld.ppc64le"
+      ],
       "startup-notification": [
         "startup-notification-devel.ppc64le",
         "startup-notification.ppc64le"
@@ -11733,6 +11831,10 @@
         "ucs-miscfixed-fonts.noarch"
       ],
       "ucx": [
+        "ucx-cma.ppc64le",
+        "ucx-devel.ppc64le",
+        "ucx-ib.ppc64le",
+        "ucx-rdmacm.ppc64le",
         "ucx.ppc64le"
       ],
       "udisks2": [
@@ -11927,10 +12029,6 @@
       "xdg-utils": [
         "xdg-utils.noarch"
       ],
-      "xdp-tools": [
-        "libxdp.ppc64le",
-        "xdp-tools.ppc64le"
-      ],
       "xinetd": [
         "xinetd.ppc64le"
       ],
@@ -12121,6 +12219,7 @@
         "SDL.s390x"
       ],
       "WALinuxAgent": [
+        "WALinuxAgent-udev.noarch",
         "WALinuxAgent.noarch"
       ],
       "Xaw3d": [
@@ -12531,7 +12630,6 @@
         "cmake.s390x"
       ],
       "cockpit-appstream": [
-        "cockpit-dashboard.noarch",
         "cockpit-machines.noarch",
         "cockpit-packagekit.noarch",
         "cockpit-pcp.s390x",
@@ -12659,6 +12757,9 @@
       "dcraw": [
         "dcraw.s390x"
       ],
+      "dejavu-fonts": [
+        "dejavu-lgc-sans-fonts.noarch"
+      ],
       "desktop-file-utils": [
         "desktop-file-utils.s390x"
       ],
@@ -12903,9 +13004,12 @@
         "fribidi.s390x"
       ],
       "frr": [
-        "frr-contrib.s390x",
         "frr.s390x"
       ],
+      "fstrm": [
+        "fstrm-devel.s390x",
+        "fstrm.s390x"
+      ],
       "ftp": [
         "ftp.s390x"
       ],
@@ -13464,22 +13568,10 @@
         "gpm.s390x"
       ],
       "grafana": [
-        "grafana-azure-monitor.s390x",
-        "grafana-cloudwatch.s390x",
-        "grafana-elasticsearch.s390x",
-        "grafana-graphite.s390x",
-        "grafana-influxdb.s390x",
-        "grafana-loki.s390x",
-        "grafana-mssql.s390x",
-        "grafana-mysql.s390x",
-        "grafana-opentsdb.s390x",
-        "grafana-postgres.s390x",
-        "grafana-prometheus.s390x",
-        "grafana-stackdriver.s390x",
         "grafana.s390x"
       ],
       "grafana-pcp": [
-        "grafana-pcp.noarch"
+        "grafana-pcp.s390x"
       ],
       "graphite2": [
         "graphite2-devel.s390x",
@@ -14222,7 +14314,7 @@
       ],
       "icedtea-web": [
         "icedtea-web-javadoc.noarch",
-        "icedtea-web.noarch"
+        "icedtea-web.s390x"
       ],
       "icoutils": [
         "icoutils.s390x"
@@ -14353,6 +14445,9 @@
       "js-d3-flame-graph": [
         "js-d3-flame-graph.noarch"
       ],
+      "json-c": [
+        "json-c-devel.s390x"
+      ],
       "json-glib": [
         "json-glib-devel.s390x"
       ],
@@ -14725,6 +14820,10 @@
         "libeasyfc-gobject.s390x",
         "libeasyfc.s390x"
       ],
+      "libecpg": [
+        "libecpg.s390x",
+        "libpgtypes.s390x"
+      ],
       "libepoxy": [
         "libepoxy-devel.s390x",
         "libepoxy.s390x"
@@ -14911,6 +15010,9 @@
         "libnotify-devel.s390x",
         "libnotify.s390x"
       ],
+      "libnumbertext": [
+        "libnumbertext.s390x"
+      ],
       "liboauth": [
         "liboauth-devel.s390x",
         "liboauth.s390x"
@@ -15175,9 +15277,6 @@
       "lm_sensors": [
         "lm_sensors-sensord.s390x"
       ],
-      "lmdb": [
-        "lmdb-libs.s390x"
-      ],
       "lohit-assamese-fonts": [
         "lohit-assamese-fonts.noarch"
       ],
@@ -15337,6 +15436,9 @@
       "metacity": [
         "metacity.s390x"
       ],
+      "micropipenv": [
+        "micropipenv.noarch"
+      ],
       "mod_auth_gssapi": [
         "mod_auth_gssapi.s390x"
       ],
@@ -15390,6 +15492,7 @@
       ],
       "mpich": [
         "mpich-devel.s390x",
+        "mpich-doc.noarch",
         "mpich.s390x"
       ],
       "mpitests": [
@@ -15424,6 +15527,9 @@
       "mutter": [
         "mutter.s390x"
       ],
+      "mysql-selinux": [
+        "mysql-selinux.noarch"
+      ],
       "mythes": [
         "mythes.s390x"
       ],
@@ -15537,6 +15643,11 @@
         "newt-devel.s390x",
         "python3-newt.s390x"
       ],
+      "nispor": [
+        "nispor-devel.s390x",
+        "nispor.s390x",
+        "python3-nispor.noarch"
+      ],
       "nmap": [
         "nmap-ncat.s390x",
         "nmap.s390x"
@@ -15757,7 +15868,6 @@
         "pcp-import-sar2pcp.s390x",
         "pcp-libs-devel.s390x",
         "pcp-libs.s390x",
-        "pcp-manager.s390x",
         "pcp-pmda-activemq.s390x",
         "pcp-pmda-apache.s390x",
         "pcp-pmda-bash.s390x",
@@ -16012,6 +16122,9 @@
       "perl-IO-Socket-IP": [
         "perl-IO-Socket-IP.noarch"
       ],
+      "perl-IO-String": [
+        "perl-IO-String.noarch"
+      ],
       "perl-IPC-Cmd": [
         "perl-IPC-Cmd.noarch"
       ],
@@ -16352,11 +16465,14 @@
         "prometheus-jmx-exporter.noarch"
       ],
       "protobuf": [
+        "protobuf-compiler.s390x",
         "protobuf-lite.s390x",
         "protobuf.s390x",
         "python3-protobuf.noarch"
       ],
       "protobuf-c": [
+        "protobuf-c-compiler.s390x",
+        "protobuf-c-devel.s390x",
         "protobuf-c.s390x"
       ],
       "pulseaudio": [
@@ -16380,6 +16496,9 @@
         "pykickstart.noarch",
         "python3-kickstart.noarch"
       ],
+      "pyodbc": [
+        "python3-pyodbc.s390x"
+      ],
       "pyparted": [
         "python3-pyparted.s390x"
       ],
@@ -16834,6 +16953,7 @@
         "rsyslog-pgsql.s390x",
         "rsyslog-relp.s390x",
         "rsyslog-snmp.s390x",
+        "rsyslog-udpspoof.s390x",
         "rsyslog.s390x"
       ],
       "rtkit": [
@@ -17047,6 +17167,9 @@
       "sscg": [
         "sscg.s390x"
       ],
+      "stalld": [
+        "stalld.s390x"
+      ],
       "startup-notification": [
         "startup-notification-devel.s390x",
         "startup-notification.s390x"
@@ -17472,6 +17595,9 @@
         "thai-scalable-umpush-fonts.noarch",
         "thai-scalable-waree-fonts.noarch"
       ],
+      "thunderbird": [
+        "thunderbird.s390x"
+      ],
       "tibetan-machine-uni-fonts": [
         "tibetan-machine-uni-fonts.noarch"
       ],
@@ -17725,10 +17851,6 @@
       "xdg-utils": [
         "xdg-utils.noarch"
       ],
-      "xdp-tools": [
-        "libxdp.s390x",
-        "xdp-tools.s390x"
-      ],
       "xinetd": [
         "xinetd.s390x"
       ],
@@ -17750,6 +17872,12 @@
       "xorg-x11-docs": [
         "xorg-x11-docs.noarch"
       ],
+      "xorg-x11-drivers": [
+        "xorg-x11-drivers.s390x"
+      ],
+      "xorg-x11-drv-dummy": [
+        "xorg-x11-drv-dummy.s390x"
+      ],
       "xorg-x11-drv-evdev": [
         "xorg-x11-drv-evdev-devel.s390x",
         "xorg-x11-drv-evdev.s390x"
@@ -17910,6 +18038,7 @@
         "SDL.x86_64"
       ],
       "WALinuxAgent": [
+        "WALinuxAgent-udev.noarch",
         "WALinuxAgent.noarch"
       ],
       "Xaw3d": [
@@ -18431,7 +18560,6 @@
         "cmake.x86_64"
       ],
       "cockpit-appstream": [
-        "cockpit-dashboard.noarch",
         "cockpit-machines.noarch",
         "cockpit-packagekit.noarch",
         "cockpit-pcp.x86_64",
@@ -18583,6 +18711,9 @@
       "dcraw": [
         "dcraw.x86_64"
       ],
+      "dejavu-fonts": [
+        "dejavu-lgc-sans-fonts.noarch"
+      ],
       "desktop-file-utils": [
         "desktop-file-utils.x86_64"
       ],
@@ -18649,12 +18780,22 @@
         "aspnetcore-runtime-3.1.x86_64",
         "aspnetcore-targeting-pack-3.1.x86_64",
         "dotnet-apphost-pack-3.1.x86_64",
-        "dotnet-host.x86_64",
         "dotnet-hostfxr-3.1.x86_64",
         "dotnet-runtime-3.1.x86_64",
         "dotnet-sdk-3.1.x86_64",
         "dotnet-targeting-pack-3.1.x86_64",
-        "dotnet-templates-3.1.x86_64",
+        "dotnet-templates-3.1.x86_64"
+      ],
+      "dotnet5.0": [
+        "aspnetcore-runtime-5.0.x86_64",
+        "aspnetcore-targeting-pack-5.0.x86_64",
+        "dotnet-apphost-pack-5.0.x86_64",
+        "dotnet-host.x86_64",
+        "dotnet-hostfxr-5.0.x86_64",
+        "dotnet-runtime-5.0.x86_64",
+        "dotnet-sdk-5.0.x86_64",
+        "dotnet-targeting-pack-5.0.x86_64",
+        "dotnet-templates-5.0.x86_64",
         "dotnet.x86_64",
         "netstandard-targeting-pack-2.1.x86_64"
       ],
@@ -18936,9 +19077,14 @@
         "fribidi.x86_64"
       ],
       "frr": [
-        "frr-contrib.x86_64",
         "frr.x86_64"
       ],
+      "fstrm": [
+        "fstrm-devel.i686",
+        "fstrm-devel.x86_64",
+        "fstrm.i686",
+        "fstrm.x86_64"
+      ],
       "ftp": [
         "ftp.x86_64"
       ],
@@ -18985,6 +19131,7 @@
         "gcc-toolset-10-dwz.x86_64"
       ],
       "gcc-toolset-10-dyninst": [
+        "gcc-toolset-10-dyninst-devel.x86_64",
         "gcc-toolset-10-dyninst.x86_64"
       ],
       "gcc-toolset-10-elfutils": [
@@ -19613,22 +19760,10 @@
         "gpm.x86_64"
       ],
       "grafana": [
-        "grafana-azure-monitor.x86_64",
-        "grafana-cloudwatch.x86_64",
-        "grafana-elasticsearch.x86_64",
-        "grafana-graphite.x86_64",
-        "grafana-influxdb.x86_64",
-        "grafana-loki.x86_64",
-        "grafana-mssql.x86_64",
-        "grafana-mysql.x86_64",
-        "grafana-opentsdb.x86_64",
-        "grafana-postgres.x86_64",
-        "grafana-prometheus.x86_64",
-        "grafana-stackdriver.x86_64",
         "grafana.x86_64"
       ],
       "grafana-pcp": [
-        "grafana-pcp.noarch"
+        "grafana-pcp.x86_64"
       ],
       "graphite2": [
         "graphite2-devel.i686",
@@ -20467,7 +20602,7 @@
       ],
       "icedtea-web": [
         "icedtea-web-javadoc.noarch",
-        "icedtea-web.noarch"
+        "icedtea-web.x86_64"
       ],
       "icoutils": [
         "icoutils.x86_64"
@@ -20608,6 +20743,10 @@
       "js-d3-flame-graph": [
         "js-d3-flame-graph.noarch"
       ],
+      "json-c": [
+        "json-c-devel.i686",
+        "json-c-devel.x86_64"
+      ],
       "json-glib": [
         "json-glib-devel.i686",
         "json-glib-devel.x86_64"
@@ -21130,6 +21269,12 @@
         "libeasyfc.i686",
         "libeasyfc.x86_64"
       ],
+      "libecpg": [
+        "libecpg.i686",
+        "libecpg.x86_64",
+        "libpgtypes.i686",
+        "libpgtypes.x86_64"
+      ],
       "libepoxy": [
         "libepoxy-devel.i686",
         "libepoxy-devel.x86_64",
@@ -21458,6 +21603,10 @@
         "libnotify.i686",
         "libnotify.x86_64"
       ],
+      "libnumbertext": [
+        "libnumbertext.i686",
+        "libnumbertext.x86_64"
+      ],
       "liboauth": [
         "liboauth-devel.i686",
         "liboauth-devel.x86_64",
@@ -22038,10 +22187,6 @@
       "lm_sensors": [
         "lm_sensors-sensord.x86_64"
       ],
-      "lmdb": [
-        "lmdb-libs.i686",
-        "lmdb-libs.x86_64"
-      ],
       "lohit-assamese-fonts": [
         "lohit-assamese-fonts.noarch"
       ],
@@ -22239,6 +22384,9 @@
         "metacity.i686",
         "metacity.x86_64"
       ],
+      "micropipenv": [
+        "micropipenv.noarch"
+      ],
       "mod_auth_gssapi": [
         "mod_auth_gssapi.x86_64"
       ],
@@ -22298,6 +22446,7 @@
       "mpich": [
         "mpich-devel.i686",
         "mpich-devel.x86_64",
+        "mpich-doc.noarch",
         "mpich.i686",
         "mpich.x86_64"
       ],
@@ -22342,9 +22491,17 @@
         "mutter.x86_64"
       ],
       "mvapich2": [
+        "mvapich2-devel.i686",
+        "mvapich2-devel.x86_64",
+        "mvapich2-doc.noarch",
+        "mvapich2-psm2-devel.x86_64",
         "mvapich2-psm2.x86_64",
+        "mvapich2.i686",
         "mvapich2.x86_64"
       ],
+      "mysql-selinux": [
+        "mysql-selinux.noarch"
+      ],
       "mythes": [
         "mythes.i686",
         "mythes.x86_64"
@@ -22472,6 +22629,13 @@
         "newt-devel.x86_64",
         "python3-newt.x86_64"
       ],
+      "nispor": [
+        "nispor-devel.i686",
+        "nispor-devel.x86_64",
+        "nispor.i686",
+        "nispor.x86_64",
+        "python3-nispor.noarch"
+      ],
       "nmap": [
         "nmap-ncat.x86_64",
         "nmap.x86_64"
@@ -22758,7 +22922,6 @@
         "pcp-libs-devel.x86_64",
         "pcp-libs.i686",
         "pcp-libs.x86_64",
-        "pcp-manager.x86_64",
         "pcp-pmda-activemq.x86_64",
         "pcp-pmda-apache.x86_64",
         "pcp-pmda-bash.x86_64",
@@ -23025,6 +23188,9 @@
       "perl-IO-Socket-IP": [
         "perl-IO-Socket-IP.noarch"
       ],
+      "perl-IO-String": [
+        "perl-IO-String.noarch"
+      ],
       "perl-IPC-Cmd": [
         "perl-IPC-Cmd.noarch"
       ],
@@ -23404,6 +23570,8 @@
         "prometheus-jmx-exporter.noarch"
       ],
       "protobuf": [
+        "protobuf-compiler.i686",
+        "protobuf-compiler.x86_64",
         "protobuf-lite.i686",
         "protobuf-lite.x86_64",
         "protobuf.i686",
@@ -23411,6 +23579,10 @@
         "python3-protobuf.noarch"
       ],
       "protobuf-c": [
+        "protobuf-c-compiler.i686",
+        "protobuf-c-compiler.x86_64",
+        "protobuf-c-devel.i686",
+        "protobuf-c-devel.x86_64",
         "protobuf-c.i686",
         "protobuf-c.x86_64"
       ],
@@ -23445,6 +23617,9 @@
         "pykickstart.noarch",
         "python3-kickstart.noarch"
       ],
+      "pyodbc": [
+        "python3-pyodbc.x86_64"
+      ],
       "pyparted": [
         "python3-pyparted.x86_64"
       ],
@@ -23996,8 +24171,12 @@
         "rsyslog-pgsql.x86_64",
         "rsyslog-relp.x86_64",
         "rsyslog-snmp.x86_64",
+        "rsyslog-udpspoof.x86_64",
         "rsyslog.x86_64"
       ],
+      "rt-tests": [
+        "rt-tests.x86_64"
+      ],
       "rtkit": [
         "rtkit.x86_64"
       ],
@@ -24234,6 +24413,9 @@
       "sscg": [
         "sscg.x86_64"
       ],
+      "stalld": [
+        "stalld.x86_64"
+      ],
       "startup-notification": [
         "startup-notification-devel.i686",
         "startup-notification-devel.x86_64",
@@ -24762,6 +24944,10 @@
         "ucs-miscfixed-fonts.noarch"
       ],
       "ucx": [
+        "ucx-cma.x86_64",
+        "ucx-devel.x86_64",
+        "ucx-ib.x86_64",
+        "ucx-rdmacm.x86_64",
         "ucx.x86_64"
       ],
       "udisks2": [
@@ -26082,6 +26268,7 @@
         "kmod-kvdo.aarch64"
       ],
       "kpatch": [
+        "kpatch-dnf.noarch",
         "kpatch.noarch"
       ],
       "krb5": [
@@ -27089,6 +27276,7 @@
         "libibverbs.aarch64",
         "librdmacm-utils.aarch64",
         "librdmacm.aarch64",
+        "python3-pyverbs.aarch64",
         "rdma-core-devel.aarch64",
         "rdma-core.aarch64",
         "srp_daemon.aarch64"
@@ -27255,7 +27443,6 @@
         "sssd-krb5-common.aarch64",
         "sssd-krb5.aarch64",
         "sssd-ldap.aarch64",
-        "sssd-libwbclient.aarch64",
         "sssd-nfs-idmap.aarch64",
         "sssd-polkit-rules.aarch64",
         "sssd-proxy.aarch64",
@@ -27293,6 +27480,9 @@
       "sysfsutils": [
         "libsysfs.aarch64"
       ],
+      "syslinux": [
+        "syslinux-tftpboot.noarch"
+      ],
       "system-storage-manager": [
         "system-storage-manager.noarch"
       ],
@@ -28346,6 +28536,7 @@
         "kmod-kvdo.ppc64le"
       ],
       "kpatch": [
+        "kpatch-dnf.noarch",
         "kpatch.noarch"
       ],
       "krb5": [
@@ -29386,6 +29577,7 @@
         "libibverbs.ppc64le",
         "librdmacm-utils.ppc64le",
         "librdmacm.ppc64le",
+        "python3-pyverbs.ppc64le",
         "rdma-core-devel.ppc64le",
         "rdma-core.ppc64le",
         "srp_daemon.ppc64le"
@@ -29549,7 +29741,6 @@
         "sssd-krb5-common.ppc64le",
         "sssd-krb5.ppc64le",
         "sssd-ldap.ppc64le",
-        "sssd-libwbclient.ppc64le",
         "sssd-nfs-idmap.ppc64le",
         "sssd-polkit-rules.ppc64le",
         "sssd-proxy.ppc64le",
@@ -29587,6 +29778,9 @@
       "sysfsutils": [
         "libsysfs.ppc64le"
       ],
+      "syslinux": [
+        "syslinux-tftpboot.noarch"
+      ],
       "system-storage-manager": [
         "system-storage-manager.noarch"
       ],
@@ -30629,6 +30823,7 @@
         "kmod-kvdo.s390x"
       ],
       "kpatch": [
+        "kpatch-dnf.noarch",
         "kpatch.noarch"
       ],
       "krb5": [
@@ -31046,6 +31241,9 @@
         "lm_sensors-libs.s390x",
         "lm_sensors.s390x"
       ],
+      "lmdb": [
+        "lmdb-libs.s390x"
+      ],
       "lockdev": [
         "lockdev.s390x"
       ],
@@ -31636,6 +31834,7 @@
         "libibverbs.s390x",
         "librdmacm-utils.s390x",
         "librdmacm.s390x",
+        "python3-pyverbs.s390x",
         "rdma-core-devel.s390x",
         "rdma-core.s390x",
         "srp_daemon.s390x"
@@ -31687,7 +31886,8 @@
         "rsync.s390x"
       ],
       "s390utils": [
-        "s390utils-base.s390x"
+        "s390utils-base.s390x",
+        "s390utils-core.s390x"
       ],
       "samba": [
         "ctdb-tests.s390x",
@@ -31796,7 +31996,6 @@
         "sssd-krb5-common.s390x",
         "sssd-krb5.s390x",
         "sssd-ldap.s390x",
-        "sssd-libwbclient.s390x",
         "sssd-nfs-idmap.s390x",
         "sssd-polkit-rules.s390x",
         "sssd-proxy.s390x",
@@ -31835,6 +32034,9 @@
         "libsysfs.s390x",
         "sysfsutils.s390x"
       ],
+      "syslinux": [
+        "syslinux-tftpboot.noarch"
+      ],
       "system-storage-manager": [
         "system-storage-manager.noarch"
       ],
@@ -32055,6 +32257,12 @@
       "aajohan-comfortaa-fonts": [
         "aajohan-comfortaa-fonts.noarch"
       ],
+      "accel-config": [
+        "accel-config-libs.i686",
+        "accel-config-libs.x86_64",
+        "accel-config.i686",
+        "accel-config.x86_64"
+      ],
       "acl": [
         "acl.x86_64",
         "libacl-devel.i686",
@@ -32070,6 +32278,7 @@
         "adcli.x86_64"
       ],
       "alsa-sof-firmware": [
+        "alsa-sof-firmware-debug.noarch",
         "alsa-sof-firmware.noarch"
       ],
       "arpwatch": [
@@ -33021,6 +33230,7 @@
         "kbd.x86_64"
       ],
       "kernel": [
+        "bpftool.x86_64",
         "kernel-abi-whitelists.noarch",
         "kernel-core.x86_64",
         "kernel-cross-headers.x86_64",
@@ -33040,9 +33250,6 @@
         "perf.x86_64",
         "python3-perf.x86_64"
       ],
-      "kernel-rt": [
-        "bpftool.x86_64"
-      ],
       "kexec-tools": [
         "kexec-tools.x86_64"
       ],
@@ -33062,6 +33269,7 @@
         "kmod-kvdo.x86_64"
       ],
       "kpatch": [
+        "kpatch-dnf.noarch",
         "kpatch.noarch"
       ],
       "krb5": [
@@ -33607,6 +33815,10 @@
         "lm_sensors-libs.x86_64",
         "lm_sensors.x86_64"
       ],
+      "lmdb": [
+        "lmdb-libs.i686",
+        "lmdb-libs.x86_64"
+      ],
       "lockdev": [
         "lockdev.i686",
         "lockdev.x86_64"
@@ -34289,6 +34501,7 @@
         "rasdaemon.x86_64"
       ],
       "rdma-core": [
+        "ibacm.i686",
         "ibacm.x86_64",
         "infiniband-diags.i686",
         "infiniband-diags.x86_64",
@@ -34301,6 +34514,7 @@
         "librdmacm-utils.x86_64",
         "librdmacm.i686",
         "librdmacm.x86_64",
+        "python3-pyverbs.x86_64",
         "rdma-core-devel.i686",
         "rdma-core-devel.x86_64",
         "rdma-core.i686",
@@ -34385,6 +34599,7 @@
         "samba-winbind-modules.i686",
         "samba-winbind-modules.x86_64",
         "samba-winbind.x86_64",
+        "samba-winexe.x86_64",
         "samba.x86_64"
       ],
       "sanlock": [
@@ -34495,7 +34710,6 @@
         "sssd-krb5-common.x86_64",
         "sssd-krb5.x86_64",
         "sssd-ldap.x86_64",
-        "sssd-libwbclient.x86_64",
         "sssd-nfs-idmap.x86_64",
         "sssd-polkit-rules.x86_64",
         "sssd-proxy.x86_64",
diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index 5b354c4..b268b27 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -14,24 +14,25 @@ filter_packages = [
 
     ("^BaseOS$", {
         "*": [
-            "compat-openssl10-devel",  
-            "compat-openssl10-pkcs11-helper",  
-            "openldap-servers-debuginfo",  
-            "ongres-scram",  
+            "compat-openssl10-devel",
+            "compat-openssl10-pkcs11-helper",
+            "openldap-servers-debuginfo",
+            "ongres-scram",
         ]
     }),
 
     ("^RT$", {
         "*": [
-            "kernel-rt-kvm-debuginfo",  
-            "kernel-rt-debug-kvm-debuginfo",  
+            "kernel-rt-kvm-debuginfo",
+            "kernel-rt-debug-kvm-debuginfo",
         ]
     }),
 
     ("^.*$", {
         "*": [
-            "kernel-*-internal",  
+            "kernel-*-internal",
             "kpatch-patch-*-internal",
+            "scap-security-guide-ansible-tasks",
         ]
     }),
 ]
@@ -39,7 +40,7 @@ filter_packages = [
 additional_packages = [
     ("^AppStream$", {
         "*": [
-            "libasan5", 
+            "libasan5",
             "libubsan1",
             "dotnet5.0",
             "gcc-toolset-10-dyninst-devel",
@@ -69,15 +70,19 @@ additional_packages = [
             "libecpg",
             "rsyslog-udpspoof",
             "mysql-selinux",
+            "pg_repack",
             "rshim",
             "qatlib",
             "tracer",
             "flatpak-xdg-utils",
             "modulemd-tools",
             "emoji-picker",
+            "gcc-toolset-11",
+            "xapian-core",
+            "gnome-session-kiosk-session",
+            "udftools",
         ]
     }),
-
     ("^BaseOS$", {
         "*": [
             "centos-stream-repos",
@@ -89,6 +94,7 @@ additional_packages = [
             "ima-evm-utils0",
         ]
     }),
+
     ("^BaseOS$", {
         "x86_64": [
             # Keep alsa-sof-firmware synchronized with
@@ -97,6 +103,12 @@ additional_packages = [
         ],
     }),
 
+    ("^BaseOS$", {
+       "aarch64": [
+            "opencsd",
+        ],
+    }),
+
     ("^Buildroot$", {
         "*": [
             "*",
@@ -111,10 +123,13 @@ additional_packages = [
             "libsolv-devel",
             "libsolv-tools",
             "ibus-typing-booster-tests",
+            "dotnet5.0-build-reference-packages",
+            "dotnet-sdk-3.1-source-built-artifacts",
+            "dotnet-sdk-5.0-source-built-artifacts",
         ]
     }),
 
-    ("PowerTools", {
+    ("^PowerTools$", {
         "aarch64": [
             "java-1.8.0-openjdk-*slowdebug*",
             "java-11-openjdk-*slowdebug*",
@@ -128,7 +143,7 @@ additional_packages = [
             "java-11-openjdk-*slowdebug*",
         ],
     }),
-    ("PowerTools", {
+    ("^PowerTools$", {
         "x86_64": [
             "java-1.8.0-openjdk-*fastdebug*",
             "java-11-openjdk-*fastdebug*",