diff --git a/fedora/variables.conf b/fedora/variables.conf
index 9bb6de5..49ab958 100644
--- a/fedora/variables.conf
+++ b/fedora/variables.conf
@@ -1,11 +1,9 @@
+# This file sets the values of variables defined in
+# the `../shared/variables.conf`.
+
 RELEASE_NAME = "Fedora-ELN"
 RELEASE_SHORT = "Fedora-ELN"
-RELEASE_VERSION = "Rawhide"
-RELEASE_VERSION_X = "9"
-RELEASE_VERSION_Y = "0"
-RELEASE_VERSION_Z = "0"
-RELEASE_VERSION_XY = "%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y)
-RELEASE_VERSION_XYZ = "%s.%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y, RELEASE_VERSION_Z)
+RELEASE_VERSION = "10"
 
 
 COMPS_REPO = "https://pagure.io/fedora-comps.git"
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 2b6bcb6..2a0ec2f 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -1,11 +1,41 @@
 filter_packages = [
+     ("^(BaseOS|AppStream|CRB|HighAvailability|ResilientStorage|SAP|SAPHANA)$", {
+         "*": [
+             "kernel-rt*", #RhBug 1973568
+             "javapackages-bootstrap", #CS-636
+         ]
+     }),
+
      ("^.*$", {
          "*": [
              "glibc32",
              "libgcc32",
-             "*openh264*"       # https://fedoraproject.org/wiki/Non-distributable-rpms
+             "scap-security-guide-rule-playbooks",
+             "*openh264*",      # https://fedoraproject.org/wiki/Non-distributable-rpms
+             "python3-openipmi", #RhBug 1982794
+             "OpenIPMI-perl", #RhBug 1982794
          ]
+         "ppc64le": [
+             "SLOF",
+             "guestfs-tools",
+             "libguestfs",
+             "libvirt-daemon-kvm",
+             "libvirt-daemon-driver-qemu",
+             "qemu-kiwi",
+             "qemu-kvm",
+             "supermin",
+             "virt-manager",
+             "virt-v2v",
+             "virt-p2v",
+             "virt-top",
+             "cockpit-machines",
+         ],
+       "s390x": [
+             "rust-std-static-wasm32-unknown-unknown", #ENGCMP-1255
+             "rust-std-static-wasm32-wasi",
+         ],
      }),
+
 ]
 
 
@@ -18,1042 +48,238 @@ additional_packages = [
     }),
     ("^BaseOS$", {
         "*": [
-            "kernel",
-            "kernel-modules",
-            "kernel-modules-extra",
-            "kernel-debug",
-            "glibc-all-langpacks",
-            "glibc-langpack-*",
-            "glibc-minimal-langpack",
-            "libbpf",
-            "elfutils-debuginfod",
-            "elfutils-debuginfod-client",
-            "python3-nftables",
-            "accel-config", #RHELPLAN-59160
-            "accel-config-libs", #RHELPLAN-59160
-            "acpica-tools", #RhBug 1902909
-            "dracut-tools", # ENGCMP-160
-            "policycoreutils-restorecond", #RhBug 1903193
-            "selinux-policy-doc", #RhBug 1903184
-            "selinux-policy-sandbox",
-            "dnf-automatic", #RhBug 1901980
-            "trace-cmd", #RhBug 1902652
-            "krb5-workstation", #RhBug 1903532
-            "krb5-pkinit",
-            "krb5-server-ldap", #RhBug 1919353
-            "nvme-cli", # ENGCMP-184
-            "chkconfig", #RhBug 1905660
-            "libcap-ng-utils", #RhBug 1907470
-            "audispd-plugins", #RhBug 1907469
-            "audispd-plugins-zos",
-            "subscription-manager-plugin-ostree", #RhBug 1909872
-            "openssh-keycat", #RhBug 1913812
-            "dhcp-client", # ENGCMP-350
-            "dhcp-libs", # ENGCMP-350
-            "dhcp-relay", # ENGCMP-350
-            "libnsl", #RhBug 1915349
-            "sssd-dbus", #RhBug 1918694
-            "sssd-nfs-idmap",
-            "sssd-proxy",
-            "sssd-tools",
-            "sssd-winbind-idmap",
-            "libsss_autofs",
-            "libsss_simpleifp",
-            "libsss_sudo",
-            "python3-libipa_hbac",
-            "python3-libsss_nss_idmap",
-            "python3-sss",
-            "python3-sss-murmur",
-            "python3-sssdconfig",
-            "nscd", #RhBug 1922153
+            "NetworkManager-initscripts-updown", #ENGCMP-1991
+            "python3.*-debuginfo", #ENGCMP-1433
         ]
     }),
     ("^BaseOS$", {
+         "aarch64": [
+             "grub2-efi-x64-modules", #RhBug1997734
+             "grub2-efi-aa64-modules", #RhBug1997734
+         ],
+         "ppc64le": [
+             "grub2-efi-x64-modules", #RhBug1997734
+             "grub2-efi-aa64-modules", #RhBug1997734
+         ],
          "x86_64": [
              "biosdevname", #ENCGMP-458
+             "grub2-efi-x64-modules", #RhBug1997734
+             "grub2-efi-aa64-modules", #RhBug1997734
          ],
          "s390x": [
              "openssl-ibmca", #RhBug 1916681
+             "kernel-zfcpdump", #RhBug 1981836
+             "kernel-zfcpdump-core",
+             "kernel-zfcpdump-modules",
+             "kernel-zfcpdump-modules-extra",
          ],
      }),
     ("^AppStream$", {
         "*": [
-            "cloud-init",
-            "cloud-utils-growpart",
-            "dnf-utils",
-            "langpacks-*",
-            "libreoffice-langpack-*",
-            "libreoffice-help-*",
-            "autocorr-*",
-            "hyphen-*",
-            "hunspell-*",
-            "whois",
-            "python3-networkx",
-            "fapolicyd",
-            "fapolicyd-selinux",
-            "python3-rpmfluff",
-            "perl-Convert-ASN1",
-            "perl-LDAP",
-            "setools-console-analyses",
-            "setools-gui",
-            "python3-protobuf",
-            "usbguard-selinux",
-            "usbguard-notifier",
-            "ghostscript-x11", #RhBug 1713413
-            "python3-libmount", #RhBug 1824727
-            "itstool",
-            "js-d3-flame-graph",
-            "python3-wx-siplib", #RhBug 1774207
-            "osbuild",
-            "osbuild-composer",
-            "osbuild-ostree",
-            "osbuild-selinux",
-            "python3-brotli", #RhBug 1737412
-            "git-lfs", #RHELCMP-1257
-            "tigervnc-server-module", #RhBug 1855181
-            "greenboot", #RhBug 1856828
-            "greenboot-grub2", #RhBug 1856828
-            "greenboot-reboot", #RhBug 1856828
-            "greenboot-rpm-ostree-grub2", #RhBug 1856828
-            "greenboot-status", #RhBug 1856828
-            "python3-libmodulemd",
-            "net-snmp-perl",
-            "pipewire0.2-devel",
-            "pipewire0.2-libs",
-            "rsyslog-omamqp1",
-            "git-all",
-            "fio-engine-*", #RhBug 1900998
-            "daxio",
-            "libpmem",
-            "libpmem-devel",
-            "libpmemblk",
-            "libpmemblk-devel",
-            "libpmemlog",
-            "libpmemlog-devel",
-            "libpmemobj",
-            "libpmemobj-devel",
-            "libpmemobj++-doc",
-            "libpmemobj++-devel",
-            "libpmempool",
-            "libpmempool-devel",
-            "librpmem",
-            "librpmem-devel",
-            "libvmem",
-            "libvmem-devel",
-            "libvmmalloc",
-            "libvmmalloc-devel",
-            "pmempool",
-            "pmemreorder",
-            "rpmemd",
-            "go-toolset", # ENGCMP-108
-            "golang", # ENGCMP-108
-            "delve", # ENGCMP-108
-            "rust-toolset", # ENGCMP-108
-            "rust", # ENGCMP-108
-            "llvm-toolset", # ENGCMP-108
-            "llvm", # ENGCMP-108
-            "clang", # ENGCMP-108
-            "lld", # ENGCMP-108
-            "lldb", # ENGCMP-108
-            "libomp", # ENGCMP-108
-            "compiler-rt", # ENGCMP-108
-            "python-lit", # ENGCMP-108
-            "hwloc-gui", # ENGCMP-119
-            "hyperv-tools", # ENGCMP-154
-            "WALinuxAgent", # ENGCMP-155
-            "policycoreutils-sandbox", #RhBug 1903193
-            "krb5-devel", #RhBug 1903532
-            "setools", #RhBug 1904076"
-            "annobin-annocheck", #RhBug 1903941
-            "scrub", #RhBug 1907472
-            "man-pages-overrides", #RhBug 1907645
-            "python-rpm-macros",
-            "python3-rpm-generators",
-            "python3-rpm-macros",
-            "python3-setuptools",
-            "NetworkManager-cloud-setup", #ENGCMP-377
-            "openssl-perl", #RhBug 1916170
-            "clevis", #RhBug 1909210
-            "clevis-dracut",
-            "clevis-luks",
-            "clevis-systemd",
-            "clevis-udisks2",
-            "ModemManager-vala", # Starting here it's missing required packages from Content Resolver
-            "NetworkManager-config-connectivity-redhat",
-            "NetworkManager-dispatcher-routing-rules",
-            "NetworkManager-libreswan-gnome",
-            "NetworkManager-ovs",
-            "NetworkManager-ppp",
-            "OpenIPMI",
-            "OpenIPMI-lanserv",
-            "OpenIPMI-perl",
-            "SuperLU-doc",
-            "a52dec",
-            "aajohan-comfortaa-fonts",
-            "acpid",
-            "adcli",
-            "adwaita-gtk2-theme",
-            "afterburn",
-            "afterburn-dracut",
-            "alsa-firmware",
-            "alsa-plugins-arcamav",
-            "alsa-plugins-maemo",
-            "alsa-plugins-oss",
-            "alsa-plugins-samplerate",
-            "alsa-plugins-speex",
-            "alsa-plugins-upmix",
-            "alsa-plugins-usbstream",
-            "alsa-plugins-vdownmix",
-            "alsa-sof-firmware",
-            "alsa-tools",
-            "anaconda-dracut",
-            "ansible-freeipa",
-            "apr-util-ldap",
-            "apr-util-mysql",
-            "apr-util-odbc",
-            "apr-util-pgsql",
-            "apr-util-sqlite",
-            "arptables-services",
-            "atlas-z14",
-            "atlas-z15",
-            "augeas",
-            "autoconf-archive",
-            "autogen",
-            "babel",
-            "babeltrace",
-            "babl-devel-docs",
-            "bacula-console",
-            "bacula-console-bat",
-            "bacula-director",
-            "bacula-libs-sql",
-            "bacula-logwatch",
-            "bacula-storage",
-            "bacula-traymonitor",
-            "bfscripts",
-            "bind-chroot",
-            "bison-runtime",
-            "bitmap-fangsongti-fonts",
-            "bmc-snmp-proxy",
-            "boom-boot",
-            "boom-boot-conf",
-            "boom-boot-grub2",
-            "boost-b2",
-            "boost-doc",
-            "boost-doctools",
-            "boost-examples",
-            "boost-graph-mpich",
-            "boost-graph-openmpi",
-            "boost-mpich",
-            "boost-mpich-python3",
-            "boost-openmpi",
-            "boost-openmpi-python3",
-            "bootupd",
-            "brltty-at-spi2",
-            "brltty-docs",
-            "brltty-dracut",
-            "brltty-espeak-ng",
-            "brltty-xw",
-            "byteman-javadoc",
-            "c2esp",
-            "celt051",
-            "clippy",
-            "cmake-doc",
-            "cmake-gui",
-            "cockpit-composer",
-            "cockpit-machines",
-            "cockpit-packagekit",
-            "cockpit-pcp",
-            "cockpit-session-recording",
-            "cockpit-storaged",
-            "compat-hesiod",
-            "compat-libgfortran-48",
-            "connections",
-            "conntrack-tools",
-            "console-login-helper-messages-issuegen",
-            "console-login-helper-messages-motdgen",
-            "console-login-helper-messages-profile",
-            "console-setup",
-            "crit",
-            "cscope",
-            "cups-lpd",
-            "curl-minimal",
-            "cyrus-sasl-gs2",
-            "cyrus-sasl-ldap",
-            "cyrus-sasl-ntlm",
-            "cyrus-sasl-sql",
-            "daxctl",
-            "dconf-editor",
-            "ddiskit",
-            "dejavu-lgc-sans-mono-fonts",
-            "dejavu-lgc-serif-fonts",
-            "devhelp",
-            "dialog",
-            "dnsmasq-utils",
-            "docbook-style-dsssl",
-            "docbook-utils",
-            "docbook-utils-pdf",
-            "docbook5-schemas",
-            "docbook5-style-xsl",
-            "docbook5-style-xsl-extensions",
-            "dotnet-sdk-6.0",
-            "dovecot-mysql",
-            "dovecot-pgsql",
-            "doxygen",
-            "doxygen-doxywizard",
-            "doxygen-latex",
-            "dpdk",
-            "dpdk-doc",
-            "dpdk-tools",
-            "dracut-caps",
-            "driverctl",
-            "dtc",
-            "dump",
-            "dwarves",
-            "dyninst-doc",
-            "dyninst-testsuite",
-            "ebtables-services",
-            "eclipse-pde",
-            "efivar",
-            "elfutils-debuginfod",
-            "emacs-auctex",
-            "environment-modules-compat",
-            "esc",
-            "evolution-bogofilter",
-            "evolution-data-server-doc",
-            "evolution-data-server-perl",
-            "evolution-data-server-tests",
-            "evolution-pst",
-            "evolution-spamassassin",
-            "exchange-bmc-os-info",
-            "fabtests",
-            "fence-agents-compute",
-            "fence-agents-virsh",
-            "fence-virt",
-            "fence-virtd-tcp",
-            "festival",
-            "firewall-applet",
-            "firewall-config",
-            "flex-doc",
-            "flite",
-            "freeipmi",
-            "freeipmi-bmc-watchdog",
-            "freeipmi-ipmidetectd",
-            "freeipmi-ipmiseld",
-            "fuse-sshfs",
-            "galera",
-            "gcc-offload-nvptx",
-            "gdb-doc",
-            "gegl04",
-            "gegl04-devel-docs",
-            "gegl04-tools",
-            "genwqe-tools",
-            "genwqe-vpd",
-            "genwqe-zlib",
-            "geolite2-city",
-            "geolite2-country",
-            "ghostscript-doc",
-            "ghostscript-tools-dvipdf",
-            "ghostscript-tools-fonts",
-            "ghostscript-tools-printing",
-            "gitk",
-            "glade",
-            "glib2-doc",
-            "glib2-tests",
-            "glibc-locale-source",
-            "glslang",
-            "gnome-backgrounds-extras",
-            "gnome-common",
-            "gnome-devel-docs",
-            "gnome-extensions-app",
-            "gnome-photos",
-            "gnome-photos-tests",
-            "gnome-shell-extension-systemMonitor",
-            "gnome-shell-extension-top-icons",
-            "gnome-tweaks",
-            "gnu-efi",
-            "golang-docs",
-            "golang-misc",
-            "golang-race",
-            "golang-tests",
-            "google-noto-serif-gurmukhi-vf-fonts",
-            "google-noto-serif-sinhala-vf-fonts",
-            "google-roboto-slab-fonts",
-            "gperf",
-            "graphviz-doc",
-            "graphviz-gd",
-            "graphviz-python3",
-            "gtk2-immodules",
-            "haproxy",
-            "help2man",
-            "hexedit",
-            "hivex",
-            "i2c-tools",
-            "i2c-tools-perl",
-            "ibus-table-chinese-cangjie",
-            "ibus-table-chinese-cantonese",
-            "ibus-table-chinese-easy",
-            "ibus-table-chinese-erbi",
-            "ibus-table-chinese-quick",
-            "ibus-table-chinese-scj",
-            "ibus-table-chinese-stroke5",
-            "ibus-table-chinese-wu",
-            "ibus-table-chinese-wubi-haifeng",
-            "ibus-table-chinese-wubi-jidian",
-            "ibus-table-chinese-yong",
-            "ibus-wayland",
-            "icu",
-            "ignition",
-            "inkscape",
-            "inkscape-view",
-            "insights-client",
-            "ipmievd",
-            "ipset-service",
-            "iptables-services",
-            "iputils-ninfod",
-            "ipa-client*", # ENGCMP-521
-            "ipvsadm",
-            "ipxe-bootimgs",
-            "ipxe-roms",
-            "jasper",
-            "jasper-utils",
-            "java-1.8.0-openjdk-accessibility",
-            "java-1.8.0-openjdk-demo",
-            "java-1.8.0-openjdk-javadoc",
-            "java-1.8.0-openjdk-javadoc-zip",
-            "java-1.8.0-openjdk-src",
-            "java-11-openjdk-demo",
-            "java-11-openjdk-javadoc",
-            "java-11-openjdk-javadoc-zip",
-            "java-11-openjdk-jmods",
-            "java-11-openjdk-src",
-            "java-11-openjdk-static-libs",
-            "java-17-openjdk",
-            "jbigkit",
-            "jmc",
-            "jmc-core",
-            "kabi-dw",
-            "kbd-legacy",
-            "keepalived",
-            "kernelshark",
-            "keycloak-httpd-client-install",
-            "kmod-kvdo",
-            "ksh",
-            "lame",
-            "latex2html",
-            "latexmk",
-            "leveldb",
-            "libblockdev-lvm-dbus",
-            "libblockdev-tools",
-            "libburn-doc",
-            "libcap-ng-python3",
-            "libcgroup",
-            "libcmpiCppImpl0",
-            "libdap-doc",
-            "libecpg",
-            "liberation-fonts",
-            "liberation-narrow-fonts",
-            "libev",
-            "libevent-doc",
-            "libgomp-offload-nvptx",
-            "libguestfs-winsupport",
-            "libisoburn-doc",
-            "libisofs-doc",
-            "libitm",
-            "libkcapi-fipscheck",
-            "libkeepalive",
-            "liblognorm-doc",
-            "liblsan",
-            "libocxl",
-            "liboggz",
-            "liboggz-doc",
-            "libomp-test",
-            "libopenraw",
-            "libpmem-debug",
-            "libpmemblk-debug",
-            "libpmemlog-debug",
-            "libpmemobj-debug",
-            "libpmempool-debug",
-            "librabbitmq",
-            "librabbitmq-tools",
-            "libreoffice-filters",
-            "libreoffice-gtk3",
-            "libreoffice-pdfimport",
-            "libreoffice-xsltfilter",
-            "libreofficekit",
-            "librpmem-debug",
-            "librx",
-            "libselinux-ruby",
-            "libsndfile-utils",
-            "libstdc++-docs",
-            "libstoragemgmt-arcconf-plugin",
-            "libstoragemgmt-hpsa-plugin",
-            "libstoragemgmt-local-plugin",
-            "libstoragemgmt-megaraid-plugin",
-            "libstoragemgmt-nfs-plugin",
-            "libstoragemgmt-smis-plugin",
-            "libstoragemgmt-targetd-plugin",
-            "libstoragemgmt-udev",
-            "libtsan",
-            "libucil",
-            "libunicap",
-            "libusb",
-            "libvdpau",
-            "libvma-utils",
-            "libyami",
-            "libzfcphbaapi-docs",
-            "linux-system-roles",
-            "linuxdoc-tools",
-            "linuxptp",
-            "lklug-fonts",
-            "lksctp-tools-doc",
-            "lld-test",
-            "lldpd",
-            "llvm-googletest",
-            "lm_sensors-sensord",
-            "lorax",
-            "lorax-templates-rhel",
-            "lvm2-lockd",
-            "mariadb",
-            "mariadb-backup",
-            "mariadb-connector-c-test",
-            "mariadb-connector-odbc",
-            "mariadb-embedded",
-            "mariadb-gssapi-server",
-            "mariadb-java-client",
-            "mariadb-oqgraph-engine",
-            "mariadb-server",
-            "mariadb-server-galera",
-            "mariadb-server-utils",
-            "mariadb-test",
-            "maven",
-            "mecab-ipadic",
-            "mecab-ipadic-EUCJP",
-            "memcached-selinux",
-            "memkind",
-            "memtest86+",
-            "mesa-demos",
-            "microdnf",
-            "micropipenv",
-            "mlogc",
-            "mlxbf-bootctl",
-            "mod_auth_mellon",
-            "mod_auth_openidc",
-            "mod_authnz_pam",
-            "mod_dav_svn",
-            "mod_intercept_form_submit",
-            "mod_ldap",
-            "mod_md",
-            "mod_proxy_html",
-            "modulemd-tools",
-            "mpg123",
-            "mpich-autoload",
-            "mpich-doc",
-            "mpitests-mpich",
-            "mpitests-mvapich2",
-            "mpitests-openmpi",
-            "mptcpd",
-            "mtr-gtk",
-            "mvapich2",
-            "mvapich2-doc",
-            "nbdkit",
-            "ncurses-term",
-            "netcf",
-            "netpbm-doc",
-            "network-manager-applet",
-            "nfs-utils-coreos",
-            "nginx",
-            "nginx-all-modules",
-            "nmstate-plugin-ovsdb",
-            "npm",
-            "ntpstat",
-            "ntsysv",
-            "oathtool",
-            "oci-seccomp-bpf-hook",
-            "ocl-icd",
-            "omping",
-            "opae",
-            "opal-firmware",
-            "opal-utils",
-            "open-vm-tools-test",
-            "opencl-filesystem",
-            "opencl-headers",
-            "opencv",
-            "opencv-contrib",
-            "opencv-core",
-            "opencv-doc",
-            "openhpi",
-            "openhpi-libs",
-            "openjade",
-            "openmpi-java",
-            "openslp-server",
-            "opensp",
-            "openssl-ibmpkcs11",
-            "oscap-anaconda-addon",
-            "oval-graph",
-            "pam_cifscreds",
-            "pam_ssh_agent_auth",
-            "papi-testsuite",
-            "passivetex",
-            "pcp-pmda-nutcracker",
-            "pgaudit",
-            "plotnetcfg",
-            "plotutils",
-            "plymouth-plugin-fade-throbber",
-            "plymouth-plugin-script",
-            "plymouth-plugin-space-flares",
-            "plymouth-theme-charge",
-            "plymouth-theme-fade-in",
-            "plymouth-theme-script",
-            "plymouth-theme-solar",
-            "plymouth-theme-spinfinity",
-            "pmreorder",
-            "postfix-mysql",
-            "postfix-pgsql",
-            "postgres-decoderbufs",
-            "postgresql",
-            "postgresql-contrib",
-            "postgresql-llvmjit",
-            "postgresql-odbc",
-            "postgresql-plperl",
-            "postgresql-plpython3",
-            "postgresql-pltcl",
-            "postgresql-server",
-            "postgresql-test",
-            "postgresql-upgrade",
-            "power-profiles-daemon",
-            "pptp",
-            "prefixdevname",
-            "ps_mem",
-            "pskctool",
-            "ptscotch-mpich",
-            "ptscotch-mpich-devel-parmetis",
-            "ptscotch-openmpi",
-            "ptscotch-openmpi-devel-parmetis",
-            "python-cups-doc",
-            "python3-PyMySQL",
-            "python3-boom",
-            "python3-clang",
-            "python3-dbus-client-gen",
-            "python3-dbus-python-client-gen",
-            "python3-dbus-signature-pyparsing",
-            "python3-dnf-plugin-post-transaction-actions",
-            "python3-dnf-plugin-versionlock",
-            "python3-idle",
-            "python3-into-dbus-python",
-            "python3-iscsi-initiator-utils",
-            "python3-justbases",
-            "python3-justbytes",
-            "python3-opencv",
-            "python3-openipmi",
-            "python3-pyodbc",
-            "python3-pyverbs",
-            "python3-pywbem",
-            "python3-requests-gssapi",
-            "python3-scapy",
-            "python3-subversion",
-            "python3-tbb",
-            "python3-urllib-gssapi",
-            "python3-volume_key",
-            "qt5",
-            "qt5-assistant",
-            "qt5-doc",
-            "qt5-qt3d-examples",
-            "qt5-qtbase-examples",
-            "qt5-qtcanvas3d-examples",
-            "qt5-qtconnectivity-examples",
-            "qt5-qtdeclarative-examples",
-            "qt5-qtlocation-examples",
-            "qt5-qtmultimedia-examples",
-            "qt5-qtquickcontrols-examples",
-            "qt5-qtquickcontrols2-examples",
-            "qt5-qtscript-examples",
-            "qt5-qtsensors-examples",
-            "qt5-qtserialbus-examples",
-            "qt5-qtserialport-examples",
-            "qt5-qtsvg-examples",
-            "qt5-qttools-examples",
-            "qt5-qtwayland-examples",
-            "qt5-qtwebchannel-examples",
-            "qt5-qtwebsockets-examples",
-            "qt5-qtxmlpatterns-examples",
-            "quota-doc",
-            "quota-nld",
-            "quota-rpc",
-            "quota-warnquota",
-            "redhat-backgrounds",
-            "redhat-bookmarks",
-            "redhat-logos",
-            "redhat-logos-httpd",
-            "redhat-logos-ipa",
-            "redis",
-            "redis-doc",
-            "rhino",
-            "rig",
-            "rls",
-            "rpcgen",
-            "rpm-apidocs",
-            "rpm-cron",
-            "rpm-plugin-ima",
-            "rpm-plugin-syslog",
-            "rshim",
-            "rsync-daemon",
-            "rsyslog-crypto",
-            "rsyslog-doc",
-            "rsyslog-elasticsearch",
-            "rsyslog-kafka",
-            "rsyslog-mmaudit",
-            "rsyslog-mmjsonparse",
-            "rsyslog-mmkubernetes",
-            "rsyslog-mmnormalize",
-            "rsyslog-mmsnmptrapd",
-            "rsyslog-snmp",
-            "rt-tests",
-            "rteval-common",
-            "ruby-default-gems", # ENGCMP-518
-            "ruby-devel", # ENGCMP-518
-            "ruby-libs", # ENGCMP-518
-            "rubygem-abrt",
-            "rubygem-bigdecimal", # ENGCMP-518
-            "rubygem-bundler", # ENGCMP-518
-            "rubygem-diff-lcs",
-            "rubygem-io-console", # ENGCMP-518
-            "rubygem-irb", # ENGCMP-518
-            "rubygem-json", # ENGCMP-518
-            "rubygem-minitest", # ENGCMP-518
-            "rubygem-power_assert", # ENGCMP-518
-            "rubygem-psych", # ENGCMP-518
-            "rubygem-rake", # ENGCMP-518
-            "rubygem-rbs", # ENGCMP-518
-            "rubygem-rdoc", # ENGCMP-518
-            "rubygem-rexml", # ENGCMP-518
-            "rubygem-rspec",
-            "rubygem-rspec-core",
-            "rubygem-rspec-expectations",
-            "rubygem-rspec-mocks",
-            "rubygem-rspec-support",
-            "rubygem-rss", # ENGCMP-518
-            "rubygem-test-unit", # ENGCMP-518
-            "rubygem-thread_order",
-            "rubygem-tilt",
-            "rubygem-typeprof", # ENGCMP-518
-            "rubygems", # ENGCMP-518
-            "rubygems-devel", # ENGCMP-518
-            "rust-analysis",
-            "rust-doc",
-            "rustfmt",
-            "s-nail",
-            "sane-backends-daemon",
-            "sane-backends-doc",
-            "sanlock",
-            "sbc",
-            "sblim-sfcc",
-            "scotch-doc",
-            "seabios",
-            "seahorse",
-            "sgabios",
-            "sgpio",
-            "shim-unsigned-aarch64",
-            "shim-unsigned-x64",
-            "sid",
-            "sid-base-libs",
-            "sid-iface-libs",
-            "sid-log-libs",
-            "sid-mod-block-blkid",
-            "sid-mod-block-dm-mpath",
-            "sid-mod-dummies",
-            "sid-resource-libs",
-            "sid-tools",
-            "smc-tools",
-            "speech-dispatcher-doc",
-            "splix",
-            "squid",
-            "ssh-key-dir",
-            "sshpass",
-            "stratis-cli",
-            "stratisd",
-            "subversion-gnome",
-            "subversion-perl",
-            "subversion-tools",
-            "supermin",
-            "support-tools-container",
-            "syslinux-tftpboot",
-            "system-storage-manager",
-            "systemd-journal-remote",
-            "systemtap-exporter",
-            "systemtap-runtime-java",
-            "systemtap-runtime-python3",
-            "systemtap-runtime-virtguest",
-            "systemtap-runtime-virthost",
-            "systemtap-server",
-            "systemtap-testsuite",
-            "tbb-doc",
-            "tcl-doc",
-            "telnet-server",
-            "tex-fonts-hebrew",
-            "texi2html",
-            "texinfo",
-            "texinfo-tex",
-            "tftp",
-            "thermald",
-            "thunderbird",
-            "tigervnc-selinux",
-            "tigervnc-server",
-            "tlog",
-            "tmpwatch",
-            "toolbox",
-            "tpm-tools-pkcs11",
-            "tpm2-abrmd",
-            "tpm2-abrmd-selinux",
-            "tpm2-pkcs11",
-            "tpm2-pkcs11-tools",
-            "tuned-gtk",
-            "tuned-profiles-atomic",
-            "tuned-profiles-mssql",
-            "tuned-profiles-oracle",
-            "tuned-profiles-spectrumscale",
-            "twolame",
-            "tycho",
-            "ucx-cma",
-            "ucx-ib",
-            "ucx-rdmacm",
-            "udisks2-lsm",
-            "udisks2-lvm2",
-            "unbound",
-            "uresourced",
-            "usbguard-dbus",
-            "usbguard-tools",
-            "uuid-c++",
-            "uuid-dce",
-            "uuid-perl",
-            "uuidd",
-            "varnish",
-            "varnish-docs",
-            "varnish-modules",
-            "vdo",
-            "vhostmd",
-            "vim-X11",
-            "virt-p2v",
-            "virt-v2v",
-            "virtio-win",
-            "volume_key",
-            "watchdog",
-            "wayland-utils",
-            "waypipe",
-            "xapian-core",
-            "xfsprogs-xfs_scrub",
-            "xmlto",
-            "xmlto-tex",
-            "xmlto-xhtml",
-            "xmltoman",
-            "xorg-x11-drivers",
-            "xorg-x11-drv-v4l",
-            "xorg-x11-server-Xdmx",
-            "xorg-x11-server-Xnest",
-            "xorg-x11-server-Xvfb",
-            "xsane",
-            "zincati",
-            "zziplib-utils",
-            "pam-docs", #RhBug 1918770
-            "cups-printerapp", #RhBug 1919173
-            "libxcrypt-compat", #RhBug 1921132
-            "php",
-            "php-bcmath",
-            "php-cli",
-            "php-common",
-            "php-dba",
-            "php-dbg",
-            "php-enchant",
-            "php-ffi",
-            "php-fpm",
-            "php-gd",
-            "php-gmp",
-            "php-intl",
-            "php-json",
-            "php-ldap",
-            "php-mbstring",
-            "php-mysqlnd",
-            "php-odbc",
-            "php-opcache",
-            "php-pdo",
-            "php-pear",
-            "php-pecl-apcu",
-            "php-pecl-rrd",
-            "php-pecl-xdebug",
-            "php-pecl-zip",
-            "php-pgsql",
-            "php-process",
-            "php-snmp",
-            "php-soap",
-            "php-xml",
-            "php-xmlrpc",
-            "python3-mod_wsgi", #RhBug 1923308
-            "perl", #ENGCMP-482  Remove this once the perl module is ready
-            "libvirt-admin", #RhBug 1925844
-            "libvirt-lock-sanlock",
-            "mecab-ipadic", #ENGCMP-486
-            "mecab-ipadic-EUCJP",
-            "mysql",
-            "mysql-devel",
-            "mysql-server",
-            "mysql-test",
-            "mysql-selinux",
-            "qatengine",
-            "qatlib",
-            "munge", #RhBug 1923880
-            "freeradius",
-            "freeradius-devel",
-            "freeradius-doc",
-            "freeradius-krb5",
-            "freeradius-ldap",
-            "freeradius-utils",
-            "python3-freeradius",
+            "afterburn-dracut", #ENGCMP-1791
+            "afterburn", #ENGCMP-1791
+            "bootupd", #ENGCMP-1787
+            "butane", #ENGCMP-1893
+            "console-login-helper-messages", #ENGCMP-1802
+            "console-login-helper-messages-issuegen", #ENGCMP-1802/CS-1007
+            "console-login-helper-messages-motdgen", #ENGCMP-1802/CS-1007
+            "console-login-helper-messages-profile", #ENGCMP-1802/CS-1007
+            "disruptor", #RhBug 2054991
+            "fence-agents-ibm-powervs", #ENGCMP-2001
+            "fence-agents-ibm-vpc", #ENGCMP-2031
+            "fence-agents-kubevirt", #ENGCMP-2001
+            "fdo-admin-cli", #ENGCMP-1993
+            "freeglut-devel", #ENGCMP-2073
+            "glslc", #ENGCMP-1987
+            "ipxe-bootimgs-aarch64", #ENGCMP-2123
+            "ipxe-bootimgs-x86", #ENGCMP-2123
+            "jctools", #RhBug 2054992
+            "libasan", #ENGCMP-2006
+            "libshaderc", #ENGCMP-1987
+            "libubsan", #ENGCMP-2006
+            "google-noto-sans-mono-fonts", #ENGCMP-1977
+            "gimp", #ENGCMP-1985
+            "mpg123-plugins-pulseaudio", #RhBug 2063186
+            "mypaint-brushes", #ENGCMP-1873
+            "pulseaudio-module-bluetooth", #RhBug 2063186
+            "pulseaudio-module-x11", #RhBug 2063186
+            "python3-wcwidth", #ENGCMP-2093
+            "qemu-ga-win", #ENGCMP-2035
+            "spirv-tools", #ENGCMP-1987
+            "ssh-key-dir", #ENGCMP-1789
+            "system-backgrounds",
+            "tuned-profiles-postgresql", #ENGCMP-2126
+            "vulkan-loader", #ENGCMP-1987
+            "vulkan-tools", #ENGCMP-1987
+            "vulkan-validation-layers", #ENGCMP-1987
+            "xdg-desktop-portal-gnome", #ENGCMP-2146
         ]
     }),
+    ("^AppStream$", {
+         "x86_64": [
+             "qemu-kvm-ui-opengl", #RhBug 1951493
+             "supermin",
+             "libguestfs-bash-completion", #RhBug 1932821
+             "libguestfs-rescue",
+             "libguestfs-rsync",
+             "libguestfs-winsupport",
+             "virt-dib",
+             "virt-p2v",
+             "virt-v2v",
+             "virt-v2v-bash-completion",
+             "virtio-win",
+             "libreoffice-filters", #ENGCMP-759
+             "libreoffice-gtk3",
+             "libreoffice-xsltfilter",
+             "libreofficekit",
+             "libreoffice-langpack-*",
+             "libreoffice-help-*",
+             "python3-libguestfs", #RhBug 2019914
+             "redfish-finder", #RhBug 1954620
+             "opa-address-resolution", #RhBug 1924903
+             "opa-fastfabric",
+             "opa-libopamgt",
+             "opa-fm", #RhBug 1924901
+             "cockpit-machines",
+             "mvapich2-psm2", #RhBug 1974837
+             "flashrom",
+             "fwupd-plugin-flashrom",
+             "libreoffice-gdb-debug-support",
+             "libmad",
+             "vorbis-tools",
+             "eth-tools-basic",
+             "eth-tools-fastfabric",
+             "mpitests-mvapich2-psm2", #RhBug 1974837
+             "rust-std-static-wasm32-unknown-unknown",
+             "rust-std-static-wasm32-wasi",
+             "qemu-kvm-block-curl", #ENGCMP-1697
+             "aspnetcore-runtime-6.0", #CS-1025
+             "aspnetcore-targeting-pack-6.0", #CS-1025
+             "dotnet-apphost-pack-6.0", #CS-1025
+             "dotnet-host", #CS-1025
+             "dotnet-hostfxr-6.0", #CS-1025
+             "dotnet-runtime-6.0", #CS-1025
+             "dotnet-sdk-6.0", #CS-1025
+             "dotnet-targeting-pack-6.0", #CS-1025
+             "dotnet-templates-6.0", #CS-1025
+             "netstandard-targeting-pack-2.1", #CS-1025
+             "fence-virtd-cpg", #ENGCMP-2155
+         ],
+         "aarch64": [
+             "supermin",
+             "libguestfs-bash-completion", #RhBug 1932821
+             "libguestfs-rescue",
+             "libguestfs-rsync",
+             "libguestfs-winsupport",
+             "virt-dib",
+             "virt-p2v",
+             "virt-v2v",
+             "virt-v2v-bash-completion",
+             "redfish-finder", #RhBug 1954620
+             "opencsd", #ENGCMP-790
+             "cockpit-machines",
+             "flashrom", #ENGCMP-1019
+             "fwupd-plugin-flashrom",
+             "rust-std-static-wasm32-unknown-unknown",
+             "rust-std-static-wasm32-wasi",
+             "python3-libguestfs", #RhBug 2019914
+             "open-vm-tools",
+             "open-vm-tools-test",
+             "hyperv-tools",
+             "qemu-kvm-block-curl", #ENGCMP-1697
+             "aspnetcore-runtime-6.0", #CS-1025
+             "aspnetcore-targeting-pack-6.0", #CS-1025
+             "dotnet-apphost-pack-6.0", #CS-1025
+             "dotnet-host", #CS-1025
+             "dotnet-hostfxr-6.0", #CS-1025
+             "dotnet-runtime-6.0", #CS-1025
+             "dotnet-sdk-6.0", #CS-1025
+             "dotnet-targeting-pack-6.0", #CS-1025
+             "dotnet-templates-6.0", #CS-1025
+             "netstandard-targeting-pack-2.1", #CS-1025
+         ],
+         "s390x": [
+             "supermin",
+             "libguestfs-bash-completion", #RhBug 1932821
+             "libguestfs-rescue",
+             "libguestfs-rsync",
+             "libguestfs-winsupport",
+             "virt-dib",
+             "virt-p2v",
+             "virt-v2v",
+             "virt-v2v-bash-completion",
+             "cockpit-machines",
+             "kernel-zfcpdump-devel", #RhBug 1981836
+             "kernel-zfcpdump-devel-matched", #ENGCMP-1358
+             "python3-libguestfs", #RhBug 2019914
+             "qemu-kvm-block-curl", #ENGCMP-1697
+             "aspnetcore-runtime-6.0", #CS-1025
+             "aspnetcore-targeting-pack-6.0", #CS-1025
+             "dotnet-apphost-pack-6.0", #CS-1025
+             "dotnet-host", #CS-1025
+             "dotnet-hostfxr-6.0", #CS-1025
+             "dotnet-runtime-6.0", #CS-1025
+             "dotnet-sdk-6.0", #CS-1025
+             "dotnet-targeting-pack-6.0", #CS-1025
+             "dotnet-templates-6.0", #CS-1025
+             "netstandard-targeting-pack-2.1", #CS-1025
+         ],
+         "ppc64le": [
+             "flashrom",
+             "fwupd-plugin-flashrom",
+             "libmad",
+             "vorbis-tools",
+             "rust-std-static-wasm32-unknown-unknown",
+             "rust-std-static-wasm32-wasi",
+         ],
+
+     }),
+    ("^CRB$", {
+        "*": [
+             "ruby-doc", #ENGCMP-1556
+             "rubygem-mysql2-doc", #ENGCMP-1556
+             "rubygem-pg-doc", #ENGCMP-1556
+             "shadow-utils-subid-devel", #ENGCMP-1597
+             "plotnetcfg", #ENGCMP-2020
+         ], 
+        "x86_64": [
+             "efivar-devel", #RhBug 2030807
+             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
+             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+         ],
+         "aarch64": [
+             "efivar-devel", #RhBug 2030807
+             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
+             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+         ],
+         "s390x": [
+             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
+             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+         ],
+         "ppc64le": [
+             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
+         ],
+     }),
+
     ("^Buildroot$", {
         "*": [
             "*",
         ]
     }),
 ]
-
-
-# 
-# filter_packages = [
-#     ("^(BaseOS|AppStream|HighAvailability|NFV|RT|ResilientStorage)$", {
-#         "*": [
-#             "python36",  # RCM-42305 - ursine python36 should be only in buildroot
-#             "gcc-toolset-9-*-testsuite", #RCM-58061
-#             "gcc-toolset-9-gcc-plugin-devel", #RCM-58061
-#         ]
-#     }),
-# 
-#     ("^(BaseOS|AppStream|HighAvailability|NFV|RT|ResilientStorage)$", {
-#         "*": [
-#             "tuned-profiles-sap",       # RCM-53604 - This should be only in SAP
-#             "tuned-profiles-sap-hana",  # RCM-53604 - This should be only in SAPHANA
-#         ]
-#     }),
-# 
-#     ("^BaseOS$", {
-#         "*": [
-#             "compat-openssl10-devel",  # RCM-26416
-#             "compat-openssl10-pkcs11-helper",  # RCM-28614
-#             "openldap-servers-debuginfo",  # RCM-28225
-#             "ongres-scram",  # RCM-31750
-#         ]
-#     }),
-# 
-#     ("^RT$", {
-#         "*": [
-#             "kernel-rt-kvm-debuginfo",  # RCM-33741
-#             "kernel-rt-debug-kvm-debuginfo",  # RCM-33741
-#         ]
-#     }),
-# 
-#     ("^.*$", {
-#         "*": [
-#             "kernel-*-internal",  # RCM-54000
-#         ]
-#     }),
-# ]
-# 
-# additional_packages = [
-#     ("^AppStream$", {
-#         "*": [
-#             "langpacks-*",  #RCM-31103
-#             "appstream-data",  #RhBug 1698813
-#             "ansible-freeipa", #RCM-57073
-#             "fapolicyd", #RCM-58975
-#             "python3-rpmfluff", #RCM-59949
-#             "gcc-toolset-9", #RCM-61473
-#             "gcc-toolset-9-annobin", #RCM-62712
-#             "gcc-toolset-9-binutils", #RCM-60564
-#             "gcc-toolset-9-binutils-devel",
-#             "gcc-toolset-9-build",
-#             "gcc-toolset-9-dwz",
-#             "gcc-toolset-9-dyninst",
-#             "gcc-toolset-9-elfutils",
-#             "gcc-toolset-9-elfutils-devel",
-#             "gcc-toolset-9-elfutils-libelf",
-#             "gcc-toolset-9-elfutils-libelf-devel",
-#             "gcc-toolset-9-elfutils-libs",
-#             "gcc-toolset-9-gcc",
-#             "gcc-toolset-9-gcc-c++",
-#             "gcc-toolset-9-gcc-gdb-plugin",
-#             "gcc-toolset-9-gcc-gfortran",
-#             "gcc-toolset-9-gdb",
-#             "gcc-toolset-9-gdb-doc",
-#             "gcc-toolset-9-gdb-gdbserver",
-#             "gcc-toolset-9-libitm-devel",
-#             "gcc-toolset-9-libquadmath-devel",
-#             "gcc-toolset-9-libstdc++-devel",
-#             "gcc-toolset-9-libstdc++-docs",
-#             "gcc-toolset-9-ltrace",
-#             "gcc-toolset-9-make",
-#             "gcc-toolset-9-make-devel",
-#             "gcc-toolset-9-perftools",
-#             "gcc-toolset-9-runtime",
-#             "gcc-toolset-9-strace",
-#             "gcc-toolset-9-systemtap",
-#             "gcc-toolset-9-systemtap-client",
-#             "gcc-toolset-9-systemtap-devel",
-#             "gcc-toolset-9-systemtap-initscript",
-#             "gcc-toolset-9-systemtap-runtime",
-#             "gcc-toolset-9-systemtap-sdt-devel",
-#             "gcc-toolset-9-systemtap-server",
-#             "gcc-toolset-9-toolchain",
-#             "gcc-toolset-9-valgrind",
-#             "gcc-toolset-9-valgrind-devel",
-#             "libasan5", #RCM-61474
-#             "libubsan1",
-#             "perl-Convert-ASN1", #RCM-66043
-#             "lttng-ust", #RHBZ 1750841
-#             "whois", # RCM-66001
-#             "librsvg2-tools",  #RHBZ 1700065
-#             "compat-exiv2-026",  #RHBZ 1759536 #RCM-67916
-#             "prometheus-jmx-exporter",  #RHBZ 1760017 #RCM-68051
-#             "jolokia-jvm-agent", #RHBZ 1759963 #RCM-68026
-#             "perl-LDAP", #RHBZ 1760231 #RHBZ 1663063 #RCM-68080
-#             "python3-networkx", #RHBZ 1764287 #RCM-68861 #RCM-71386
-#             "liburing", #RHBZ 1769034 #RCM-70072
-#             "setools-console-analyses", #RCM-71851
-#             "setools-gui", #RCM-71851
-#             "virt-p2v-maker", #RCM-71716 #RCM-72953
-#             "python3-protobuf", #RHELPLAN-25579
-#             "NetworkManager-cloud-setup", #RCM-72501
-#             "spice-client-win-x64", #RCM-73991
-#             "spice-client-win-x86", #RCM-73991
-#             "qt5-qtbase-private-devel", #RHBZ 1796335
-#         ]
-#     }),
-# 
-#     ("^AppStream$", {
-#         "x86_64": [
-# 
-#             "libreoffice-langpack-*",   # COMPOSE-2951
-#             "libreoffice-help-*",       # COMPOSE-2951
-#         ],
-#         "aarch64": [
-#             "vulkan-loader",
-#             "vulkan-loader-devel", #RhBug 1767950
-#         ]
-#     }),
-# 
-#     ("^BaseOS$", {
-#         "*": [
-#             "kernel-doc",  # Bug 1657609
-#             "python3-nftables",  # RCM-70485
-#             "elfutils-debuginfod", # RCM-71684
-#             "elfutils-debuginfod-client", # RCM-71684
-#             "elfutils-debuginfod-client-devel", # RCM-71684
-#             "libbpf", # RCM-71880
-#         ]
-#     }),
-# 
-#     ("^Buildroot$", {
-#         "*": [
-#             "*",
-#         ]
-#     })
-# ]
-# 
diff --git a/shared/createiso.conf b/shared/createiso.conf
index 85b5eb8..8963457 100644
--- a/shared/createiso.conf
+++ b/shared/createiso.conf
@@ -1,4 +1,5 @@
 create_optional_isos = False
+createiso_use_xorrisofs = True
 
 createiso_skip = [
     ("^(BaseOS|AppStream|CRB|NFV)$", {
diff --git a/shared/extra_isos.conf b/shared/extra_isos.conf
index 5742236..4c544e8 100644
--- a/shared/extra_isos.conf
+++ b/shared/extra_isos.conf
@@ -1,3 +1,4 @@
+iso_hfs_ppc64le_compatible = False
 
 extra_isos = {
     "BaseOS": [{
diff --git a/shared/general.conf b/shared/general.conf
index fa57a74..f46d24e 100644
--- a/shared/general.conf
+++ b/shared/general.conf
@@ -7,6 +7,8 @@ link_type = "abspath-symlink"
 product_id_allow_missing = True
 productimg = False
 
+create_jigdo = False
+
 # Wait for 60 * 20 seconds (20 minutes) for packages to sign.
 signed_packages_wait = 60
 signed_packages_retries = 20
diff --git a/shared/multilib.conf b/shared/multilib.conf
index bd6aaff..ca65327 100644
--- a/shared/multilib.conf
+++ b/shared/multilib.conf
@@ -13,6 +13,26 @@ multilib_blacklist = {
         "totem", #RCM-43729
         "ocaml*", # RCM-53665
         "fwupd*", # ENGCMP-488
+        "freeradius*", #RhBug 1923990
+        "httpd-*", #ENGCMP-716
+        "nginx-*",
+        "php-*",
+        "subversion-*",
+        "mariadb-common", #ENGCMP-1061
+        "mariadb-devel",
+        "mariadb-embedded*",
+        "mariadb-errmsg",
+        "mysql-common",
+        "mysql-devel",
+        "mysql-libs",
+        "mecab",
+        "postgresql-private*", #ENGCMP-1179
+        "postgresql-server*",
+        "bash*", #RhBug 2006138
+        "xapian-core*", #RhBug 2031780
+        "tk*", #RhBug 2053406
+        "tcl*",
+        "ldns-devel*", #RhBug 2058694
     ],
 }
 
diff --git a/shared/variables.conf b/shared/variables.conf
index 09eb33a..54f9f6a 100644
--- a/shared/variables.conf
+++ b/shared/variables.conf
@@ -33,3 +33,5 @@ global EXTRA_FILES
 EXTRA_FILES = []
 global EXTRA_ISOS_ARCHES
 EXTRA_ISOS_ARCHES = []
+global IMAGE_BUILD_SCRATCH
+IMAGE_BUILD_SCRATCH = False
diff --git a/variants.xml b/variants.xml
index f5a3106..f73b28e 100644
--- a/variants.xml
+++ b/variants.xml
@@ -3,7 +3,6 @@
 <variants>
 
     <!-- General variants built also in Fedora. -->
-
     <variant id="Everything" name="Everything" type="variant">
         <arches>
             <arch>aarch64</arch>
@@ -49,7 +48,6 @@
             <group default="true">mail-server</group>
             <group default="true">mainframe-access</group>
             <group default="true">multimedia</group>
-            <group default="true">dns-server</group>
             <group default="true">smart-card</group>
             <group default="true">smb-server</group>
             <group default="true">network-tools</group>
@@ -91,7 +89,8 @@
             <group default="true">console-internet</group>
             <group default="true">debugging</group>
             <group default="true">development</group>
-            <group default="true">dotnet-core</group>
+            <group default="true">dotnet</group>
+            <group default="true">dns-server</group>
             <group default="true">emacs</group>
             <group default="true">file-server</group>
             <group default="true">ftp-server</group>
@@ -124,6 +123,7 @@
             <group default="true">guest-desktop-agents</group>
             <group default="true">headless-management</group>
             <group default="true">java-platform</group>
+            <group default="true">java-development</group>
             <group default="true">gnome-apps</group>
             <group default="true">internet-applications</group>
             <group default="true">office-suite</group>
@@ -160,20 +160,7 @@
             <environment display_order="4">workstation-product-environment</environment>
         </environments>
         <modules>
-            <module>ant:1.10</module>
-            <module>httpd:2.4</module>
-            <module>jmc:7</module>
-            <module>mariadb:10.5</module>
-            <module>maven:3.6</module>
-            <module>nginx:1.18</module>
-            <module>nodejs:12</module>
-            <module>nodejs:14</module>
-            <module>perl:5.30</module>
-            <module>perl:5.32</module>
-            <module>ruby:2.5</module>
-            <module>subversion:1.14</module>
-            <module>swig:4.0</module>
-            <module>varnish:6.0</module>
+		<!--            <module>container-tools:latest</module> -->
         </modules>
     </variant>
     <variant id="CRB" name="CodeReady Builder" type="variant">