diff --git a/common/include-excludes.conf b/common/include-excludes.conf
index e4f2cdb..262768b 100644
--- a/common/include-excludes.conf
+++ b/common/include-excludes.conf
@@ -376,7 +376,6 @@ additional_packages = [
             "libreoffice-officebean-common",
             "libreoffice-postgresql",
             "libreofficekit-devel",
-            "libreport-centos",
             "libreport-compat",
             "libreport-plugin-mantisbt",
             "libreport-plugin-systemd-journal",
@@ -608,8 +607,6 @@ additional_packages = [
             "redland-pgsql",
             "relaxngDatatype-javadoc",
             "resteasy-javadoc",
-            "rhc",
-            "rhc-worker-playbook",
             "rhythmbox-devel",
             "rocky-bookmarks",
             "rpm-ostree-devel",
@@ -742,10 +739,153 @@ additional_packages = [
             "xorg-x11-drv-intel-devel",
         ],
         "aarch64": [
+            "alsa-sof-firmware-debug",
+            "awscli",
+            "dleyna-connector-dbus",
+            "dleyna-core",
+            "dleyna-renderer",
+            "dleyna-server",
+            "fence-agents-aws",
+            "fence-agents-lpar",
+            "mingw32-bzip2",
+            "mingw32-bzip2-static",
+            "mingw32-cairo",
+            "mingw32-expat",
+            "mingw32-fontconfig",
+            "mingw32-freetype",
+            "mingw32-freetype-static",
+            "mingw32-gettext",
+            "mingw32-gettext-static",
+            "mingw32-glib2",
+            "mingw32-glib2-static",
+            "mingw32-gstreamer1",
+            "mingw32-harfbuzz",
+            "mingw32-harfbuzz-static",
+            "mingw32-icu",
+            "mingw32-libffi",
+            "mingw32-libjpeg-turbo",
+            "mingw32-libjpeg-turbo-static",
+            "mingw32-libpng",
+            "mingw32-libpng-static",
+            "mingw32-libtiff",
+            "mingw32-libtiff-static",
+            "mingw32-openssl",
+            "mingw32-pcre",
+            "mingw32-pcre-static",
+            "mingw32-pixman",
+            "mingw32-readline",
+            "mingw32-sqlite",
+            "mingw32-sqlite-static",
+            "mingw32-termcap",
+            "mingw32-win-iconv",
+            "mingw32-win-iconv-static",
+            "mingw32-zlib",
+            "mingw32-zlib-static",
+            "mingw64-bzip2",
+            "mingw64-bzip2-static",
+            "mingw64-cairo",
+            "mingw64-expat",
+            "mingw64-fontconfig",
+            "mingw64-freetype",
+            "mingw64-freetype-static",
+            "mingw64-gettext",
+            "mingw64-gettext-static",
+            "mingw64-glib2",
+            "mingw64-glib2-static",
+            "mingw64-gstreamer1",
+            "mingw64-harfbuzz",
+            "mingw64-harfbuzz-static",
+            "mingw64-icu",
+            "mingw64-libffi",
+            "mingw64-libjpeg-turbo",
+            "mingw64-libjpeg-turbo-static",
+            "mingw64-libpng",
+            "mingw64-libpng-static",
+            "mingw64-libtiff",
+            "mingw64-libtiff-static",
+            "mingw64-openssl",
+            "mingw64-pcre",
+            "mingw64-pcre-static",
+            "mingw64-pixman",
+            "mingw64-readline",
+            "mingw64-sqlite",
+            "mingw64-sqlite-static",
+            "mingw64-termcap",
+            "mingw64-win-iconv",
+            "mingw64-win-iconv-static",
+            "mingw64-zlib",
+            "mingw64-zlib-static",
+            "pentaho-libxml",
+            "pentaho-reporting-flow-engine",
+            "python3-boto3",
+            "python3-botocore",
+            "python3-libvoikko",
+            "python3-s3transfer",
+            "sac",
+            "sassist",
+            "systemtap-runtime-virthost",
+        ]
+    }),
+
+    ("^PowerTools$", {
+        "*": [
+            "libdnf-devel",
+            "librepo-devel",
+            "librhsm-devel",
+            "libsolv-devel",
+            "libsolv-tools",
+            "ibus-typing-booster-tests",
+        ]
+    }),
+    ("PowerTools", {
+        "aarch64": [
+            "java-1.8.0-openjdk-*slowdebug*",
+            "java-11-openjdk-*slowdebug*",
+        ],
+        "ppc64le": [
+            "java-1.8.0-openjdk-*slowdebug*",
+            "java-11-openjdk-*slowdebug*",
+        ],
+        "x86_64": [
+            "java-1.8.0-openjdk-*slowdebug*",
+            "java-11-openjdk-*slowdebug*",
+        ],
+    }),
+
+    ("PowerTools", {
+        "x86_64": [
+            "java-1.8.0-openjdk-*fastdebug*",
+            "java-11-openjdk-*fastdebug*",
+        ]
+    }),
+
+    # Consolidation
+    ('^plus$', {
+        '*': [
+            'openldap-servers',
+        ],
+    }),
+
+    ('^extras$', {
+        '*': [
+            'rpaste',
+            'epel-release',
+            'rpmfusion-free-release',
+            'rocky-release-gluster9',
+        ],
+    }),
+
+    ('^extras$', {
+        'x86_64': [
+            'elrepo-release',
+        ],
+    }),
+
+    ('^extras$', {
+        'aarch64': [
             "LibRaw",
             "LibRaw-devel",
             "alsa-sof-firmware",
-            "alsa-sof-firmware-debug",
             "autocorr-af",
             "autocorr-bg",
             "autocorr-ca",
@@ -779,18 +919,11 @@ additional_packages = [
             "autocorr-tr",
             "autocorr-vi",
             "autocorr-zh",
-            "awscli",
             "brasero",
             "brasero-nautilus",
             "cheese",
-            "dleyna-connector-dbus",
-            "dleyna-core",
-            "dleyna-renderer",
-            "dleyna-server",
             "edk2-ovmf",
             "eog",
-            "fence-agents-aws",
-            "fence-agents-lpar",
             "flute",
             "fprintd",
             "fprintd-pam",
@@ -810,24 +943,6 @@ additional_packages = [
             "hexchat-devel",
             "hyperv-daemons-license",
             "hyperv-tools",
-            "libabw",
-            "libbase",
-            "libcdr",
-            "libcmis",
-            "libdmapsharing",
-            "libexttextcat",
-            "libfonts",
-            "libformula",
-            "libfprint",
-            "libfreehand",
-            "liblayout",
-            "libloader",
-            "libmediaart",
-            "libmspub",
-            "libmwaw",
-            "liborcus",
-            "libpagemaker",
-            "libqxp",
             "libreoffice-base",
             "libreoffice-calc",
             "libreoffice-core",
@@ -967,93 +1082,35 @@ additional_packages = [
             "libreoffice-x11",
             "libreoffice-xsltfilter",
             "libreofficekit",
+            "libabw",
+            "libbase",
+            "libcdr",
+            "libcmis",
+            "libdmapsharing",
+            "libexttextcat",
+            "libfonts",
+            "libformula",
+            "libfprint",
+            "libfreehand",
+            "liblayout",
+            "libloader",
+            "libmediaart",
+            "libmspub",
+            "libmwaw",
+            "liborcus",
+            "libpagemaker",
+            "libqxp",
             "librepository",
             "libserializer",
             "libstaroffice",
             "libzmf",
             "lpsolve",
             "mesa-vulkan-drivers",
-            "mingw32-bzip2",
-            "mingw32-bzip2-static",
-            "mingw32-cairo",
-            "mingw32-expat",
-            "mingw32-fontconfig",
-            "mingw32-freetype",
-            "mingw32-freetype-static",
-            "mingw32-gettext",
-            "mingw32-gettext-static",
-            "mingw32-glib2",
-            "mingw32-glib2-static",
-            "mingw32-gstreamer1",
-            "mingw32-harfbuzz",
-            "mingw32-harfbuzz-static",
-            "mingw32-icu",
-            "mingw32-libffi",
-            "mingw32-libjpeg-turbo",
-            "mingw32-libjpeg-turbo-static",
-            "mingw32-libpng",
-            "mingw32-libpng-static",
-            "mingw32-libtiff",
-            "mingw32-libtiff-static",
-            "mingw32-openssl",
-            "mingw32-pcre",
-            "mingw32-pcre-static",
-            "mingw32-pixman",
-            "mingw32-readline",
-            "mingw32-sqlite",
-            "mingw32-sqlite-static",
-            "mingw32-termcap",
-            "mingw32-win-iconv",
-            "mingw32-win-iconv-static",
-            "mingw32-zlib",
-            "mingw32-zlib-static",
-            "mingw64-bzip2",
-            "mingw64-bzip2-static",
-            "mingw64-cairo",
-            "mingw64-expat",
-            "mingw64-fontconfig",
-            "mingw64-freetype",
-            "mingw64-freetype-static",
-            "mingw64-gettext",
-            "mingw64-gettext-static",
-            "mingw64-glib2",
-            "mingw64-glib2-static",
-            "mingw64-gstreamer1",
-            "mingw64-harfbuzz",
-            "mingw64-harfbuzz-static",
-            "mingw64-icu",
-            "mingw64-libffi",
-            "mingw64-libjpeg-turbo",
-            "mingw64-libjpeg-turbo-static",
-            "mingw64-libpng",
-            "mingw64-libpng-static",
-            "mingw64-libtiff",
-            "mingw64-libtiff-static",
-            "mingw64-openssl",
-            "mingw64-pcre",
-            "mingw64-pcre-static",
-            "mingw64-pixman",
-            "mingw64-readline",
-            "mingw64-sqlite",
-            "mingw64-sqlite-static",
-            "mingw64-termcap",
-            "mingw64-win-iconv",
-            "mingw64-win-iconv-static",
-            "mingw64-zlib",
-            "mingw64-zlib-static",
-            "pentaho-libxml",
-            "pentaho-reporting-flow-engine",
             "pidgin",
             "pidgin-devel",
             "pidgin-sipe",
-            "python3-boto3",
-            "python3-botocore",
-            "python3-libvoikko",
-            "python3-s3transfer",
             "redhat-menus",
             "rhythmbox",
-            "sac",
-            "sassist",
             "seabios-bin",
             "seavgabios-bin",
             "sgabios-bin",
@@ -1061,47 +1118,12 @@ additional_packages = [
             "syslinux-extlinux-nonlinux",
             "syslinux-nonlinux",
             "syslinux-tftpboot",
-            "systemtap-runtime-virthost",
             "totem",
             "totem-nautilus",
             "virtio-win",
-        ]
-    }),
-
-    ("^PowerTools$", {
-        "*": [
-            "libdnf-devel",
-            "librepo-devel",
-            "librhsm-devel",
-            "libsolv-devel",
-            "libsolv-tools",
-            "ibus-typing-booster-tests",
-        ]
-    }),
-    ("PowerTools", {
-        "aarch64": [
-            "java-1.8.0-openjdk-*slowdebug*",
-            "java-11-openjdk-*slowdebug*",
-        ],
-        "ppc64le": [
-            "java-1.8.0-openjdk-*slowdebug*",
-            "java-11-openjdk-*slowdebug*",
-        ],
-        "x86_64": [
-            "java-1.8.0-openjdk-*slowdebug*",
-            "java-11-openjdk-*slowdebug*",
         ],
     }),
 
-    ("PowerTools", {
-        "x86_64": [
-            "java-1.8.0-openjdk-*fastdebug*",
-            "java-11-openjdk-*fastdebug*",
-        ]
-    }),
-
-
-
     ("^BaseOS$", {
         "*": [
 	    "rocky-obsolete-packages",
diff --git a/r8.conf b/r8.conf
index f0d7765..cee88f3 100644
--- a/r8.conf
+++ b/r8.conf
@@ -103,7 +103,8 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage)$", {
+    #("^(AppStream|PowerTools|HighAvailability|ResilientStorage)$", {
+    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|extras|Devel|Plus)$", {
        "*": True
        }),
 ]
@@ -120,7 +121,8 @@ image_volid_formats = [ '{release_short}-8.4-{arch}-{disc_type}', ]
 create_optional_isos = False
 
 createiso_skip = [
-    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage)$', {
+    #('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage)$', {
+    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|extras|Devel|Plus)$', {
         '*': True,
         'src':True
     }),
diff --git a/variants.xml b/variants.xml
index 321e6d5..8e30d8d 100644
--- a/variants.xml
+++ b/variants.xml
@@ -315,4 +315,29 @@
     </arches>
   </variant>
 
+  <!-- Variant consolidation -->
+  <variant id="plus" name="plus" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+      <arch>ppc64le</arch>
+      <arch>x86_64</arch>
+    </arches>
+  </variant>
+
+  <variant id="extras" name="extras" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+      <arch>ppc64le</arch>
+      <arch>x86_64</arch>
+    </arches>
+  </variant>
+
+  <variant id="Devel" name="Devel" type="variant" has_optional="false">
+    <arches>
+      <arch>aarch64</arch>
+      <arch>ppc64le</arch>
+      <arch>x86_64</arch>
+    </arches>
+  </variant>
+
 </variants>