diff --git a/c8-armhfp.conf b/c8-armhfp.conf
deleted file mode 100644
index e4a1e93..0000000
--- a/c8-armhfp.conf
+++ /dev/null
@@ -1,143 +0,0 @@
-from multilib import *
-from include-excludes import *
-#from images-armhfp import *
-
-# PRODUCT INFO 
-release_name = "CentOS Altarch" 
-release_short = "CentOS-Altarch"
-release_version = "8"
-version = "8.1.1911"
-
-# GENERAL SETTINGS
-comps_file = {
-        'scm': 'git',
-        'repo': 'https://git.centos.org/centos/comps.git',
-        'branch': 'master',
-        'file': 'comps-centos-8.1.0.1911.xml',
-}
-
-link_type = 'hardlink-or-copy'
-
-module_defaults_dir = {
-        'scm': 'git',
-        'repo': 'https://git.centos.org/centos/centos-module-defaults.git',
-        'branch': 'c8.1',
-        'dir': '.',
-}
-
-multilib = []
-
-variants_file = 'variants-armhfp.xml'
-sigkeys = ['8483C65D']
-#sigkeys = [None]
-hashed_directories = False
-
-tree_arches = ['armhfp']
-
-# RUNROOT SETTINGS
-runroot_channel = 'image'
-runroot_tag = 'dist-c8-build'
-runroot_method = 'koji'
-
-# PKGSET
-pkgset_source = "koji"
-koji_profile = "armhfp-mbox"
-
-# PKGSET - KOJI
-pkgset_koji_tag = "dist-c8-compose"
-pkgset_koji_inherit = False
-pkgset_koji_module_tag = "modular-updates-candidate"
-
-filter_system_release_packages = False
-
-# GATHER
-gather_prepopulate = "centos-armhfp-packages.json"
-
-gather_method = {
-        "^(?!(AppStream|PowerTools|CR)).*$": {
-		"comps": "deps"
-	},
-        "^(AppStream|PowerTools|CR)$": "hybrid",
-}
-
-gather_backend = "dnf"
-check_deps = False
-greedy_method = "none"
-repoclosure_backend = "dnf"
-
-# CREATEREPO
-createrepo_deltas = False
-createrepo_database = True
-createrepo_c = True
-createrepo_checksum = "sha256"
-createrepo_use_xz = True
-createrepo_num_threads = 8
-createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:centos:centos:8,CentOS 8', '--revision=8.1.1911']
-
-# CHECKSUMS
-media_checksums = ['sha256']
-media_checksum_one_file = True
-create_jigdo = False
-
-# BUILDINSTALL
-bootable = True
-buildinstall_method = "lorax"
-
-lorax_options = [
-    ("^.*$", {
-        "*": {
-            "noupgrade": False,
-            "rootfs_size": 3,
-            "version": "8"
-        }
-    })
-]
-
-buildinstall_skip = [
-    ("^(AppStream|PowerTools|)$", {
-       "*": True
-       }),
-]
-
-image_name_format = {
-    "^BaseOS$": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
-    ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
-}
-
-image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ]
-
-# CREATEISO
-create_optional_isos = False
-
-createiso_skip = [
-    ('^(BaseOS|AppStream|PowerTools)$', {
-        '*': True,
-        'src':True
-    }),
-]
-
-extra_isos = {
-    "BaseOS": [{
-        "include_variants": ["AppStream"],
-        "filename": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
-        "skip_src": True,
-    }]
-}
-
-restricted_volid = True
-
-# LOOKASIDE
-variant_as_lookaside = [
-    ('AppStream', 'BaseOS'),
-    ('PowerTools', 'BaseOS'),
-    ('PowerTools', 'AppStream'),
-]
-
-productimg = False
-
-translate_paths = [
-	("/mnt/koji", "https://koji.armhfp-mbox.centos.org/pkgs"),
-	("/compose", "http://172.22.0.123/compose"),
-]
-
diff --git a/c8-cloud.conf b/c8-cloud.conf
deleted file mode 100644
index 61dde9e..0000000
--- a/c8-cloud.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-from multilib import * 
-from include-excludes import *
-from images import *
-
-release_name = 'CentOS-Cloud'
-release_short = 'CentOS-Cloud'
-release_version = '8'
-release_is_layered = False
-
-skip_phases = ['buildinstall','productimg','pkgset','gather','extra_files','createrepo']
-
-
-variants_file = 'variants.xml'
-sigkeys = ['8483C65D']
-hashed_directories = False
-
-tree_arches = ['i386', 'x86_64', 'ppc64le', 'aarch64']
-tree_variants = ['Cloud']
-
-# PKGSET
-pkgset_source = "koji"
-koji_profile = "mbox"
-
-# PKGSET - KOJI
-pkgset_koji_tag = "dist-c8-compose"
-pkgset_koji_inherit = False
-pkgset_koji_module_tag = "modular-updates-candidate"
-
-# GATHER
-gather_prepopulate = "centos-packages.json"
-
-gather_method = {
-        "^(?!(AppStream|PowerTools)).*$":{
-                "comps": "deps"
-        },
-        "^(AppStream|PowerTools)$": "hybrid",
-}
-
-# CREATEREPO createrepo_deltas = False createrepo_database = True
-createrepo_c = True
-createrepo_checksum = "sha256"
-createrepo_use_xz = True
-createrepo_num_threads = 8
-createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:centos:centos:8,CentOS 8', '--revision=8.0.1905']
-
-# CHECKSUMS
-media_checksums = ['sha256']
-media_checksum_one_file = True
-create_jigdo = False
-
-createiso_skip = [
-        ('^BaseOS$', {
-            '*': True,
-            'src': True
-        }),
-        ('^AppStream$', {
-            '*': True,
-            'src': True
-        }),
-        ('^PowerTools$', {
-            '*': True,
-            'src': True
-        }),
-]
-
diff --git a/c8-developmental.conf b/c8-developmental.conf
deleted file mode 100644
index 8d1e931..0000000
--- a/c8-developmental.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-from multilib import *
-from include-excludes import *
-from images import *
-
-# PRODUCT INFO 
-release_name = "CentOS Linux" 
-release_short = "CentOS"
-release_version = "8.1.1911"
-version = "8"
-
-# GENERAL SETTINGS
-comps_file = {
-        'scm': 'git',
-        'repo': 'https://git.centos.org/centos/comps.git',
-        'branch': 'master',
-        'file': 'comps-centos-devel-8.xml',
-}
-
-variants_file = 'variants.xml'
-
-sigkeys = ['8483C65D']
-
-# RUNROOT SETTINGS
-runroot_channel = 'image'
-runroot_tag = 'dist-c8-build'
-runroot_method = 'koji'
-
-# PKGSET
-pkgset_source = "koji"
-koji_profile = "mbox"
-
-# PKGSET - KOJI
-pkgset_koji_tag = "dist-c8-compose"
-pkgset_koji_inherit = False
-pkgset_koji_module_tag = "modular-updates-candidate"
-
-gather_method = "deps"
-check_deps = False
-greedy_method = "build"
-
-gather_lookaside_repos = [
-#TODO: Fill this in
-]
-
-# CREATEREPO
-createrepo_deltas = False
-createrepo_database = True
-createrepo_c = True
-createrepo_checksum = "sha256"
-createrepo_use_xz = True
-createrepo_num_threads = 8
-createrepo_num_workers = 4
diff --git a/c8-stream-devel.conf b/c8-stream-devel.conf
deleted file mode 100644
index 54d0ebc..0000000
--- a/c8-stream-devel.conf
+++ /dev/null
@@ -1,201 +0,0 @@
-from multilib import *
-from include-excludes import *
-from stream-images import *
-
-# PRODUCT INFO 
-release_name = "CentOS Stream Developmental" 
-release_short = "CentOS-devel"
-release_version = "Stream"
-version = "8-devel"
-
-# # GENERAL SETTINGS
-# comps_file = {
-#         'scm': 'git',
-#         'repo': 'https://git.centos.org/centos/comps.git',
-#         'branch': 'master',
-#         'file': 'comps-centos-8-stream.xml',
-# }
-comps_file = 'comps-centos-8-stream-devel.xml'
-
-link_type = 'hardlink-or-copy'
-
-module_defaults_dir = {
-        'scm': 'git',
-        'repo': 'https://git.centos.org/centos/centos-module-defaults.git',
-        'branch': 'c8.2',
-        'dir': '.',
-}
-
-multilib = [
-    ('^.*$', {
-        'x86_64': ['devel', 'runtime']
-    }),
-]
-
-variants_file = 'variants-devel.xml'
-sigkeys = ['8483C65D', None]
-hashed_directories = False
-
-# tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
-tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
-# tree_arches = ['x86_64']
-
-# RUNROOT SETTINGS
-runroot_channel = 'image'
-runroot_tag = 'dist-c8-build'
-runroot_method = 'koji'
-
-# PKGSET
-pkgset_source = "koji"
-koji_profile = "mbox"
-
-# PKGSET - KOJI
-pkgset_koji_tag = "dist-c8-stream-compose"
-pkgset_koji_inherit = False
-pkgset_koji_module_tag = "modular-updates-candidate"
-
-filter_system_release_packages = False
-
-# GATHER
-gather_prepopulate = "centos-packages.json"
-
-gather_method = {
-        "^(?!(AppStream|PowerTools|CR)).*$":{
-                "comps": "deps"
-        },
-        "^(AppStream|PowerTools|CR)$": "hybrid",
-}
-
-gather_backend = "dnf"
-check_deps = False
-greedy_method = "all"
-repoclosure_backend = "dnf"
-
-# CREATEREPO
-createrepo_deltas = False
-createrepo_database = True
-createrepo_c = True
-createrepo_checksum = "sha256"
-createrepo_use_xz = True
-createrepo_num_threads = 8
-createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:centos-stream:centos-stream:8,CentOS Stream 8', '--revision=8-stream']
-
-# CHECKSUMS
-media_checksums = ['sha256']
-media_checksum_one_file = True
-create_jigdo = False
-
-# BUILDINSTALL
-bootable = True
-buildinstall_method = "lorax"
-
-lorax_options = [
-    ("^.*$", {
-        "*": {
-            "noupgrade": False,
-            "rootfs_size": 3,
-            "version": "8-stream"
-        }
-    })
-]
-
-buildinstall_skip = [
-    ("^(Devel|AppStream|PowerTools|CR|HighAvailability)$", {
-       "*": True
-       }),
-]
-
-image_name_format = {
-    "^BaseOS$": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
-    ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
-}
-
-image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ]
-
-# CREATEISO
-create_optional_isos = False
-
-createiso_skip = [
-    ('^(Devel|AppStream|PowerTools|HighAvailability|CR)$', {
-        '*': True,
-        'src':True
-    }),
-]
-
-extra_isos = {
-    "BaseOS": [{
-        "include_variants": ["AppStream"],
-        "filename": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
-        "skip_src": True,
-    },
-    ]
-}
-
-restricted_volid = True
-
-# LOOKASIDE
-variant_as_lookaside = [
-#    ('AppStream', 'BaseOS'),
-#    ('PowerTools', 'BaseOS'),
-#    ('PowerTools', 'AppStream'),
-]
-
-gather_lookaside_repos = [
-    ("^Devel$", {
-        "x86_64": [
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/x86_64/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/x86_64/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/x86_64/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/x86_64/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/x86_64/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/x86_64/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/x86_64/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/x86_64/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/source/tree",
-        ],
-        "ppc64": [
-        ],
-        "ppc64le": [
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/ppc64le/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/ppc64le/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/ppc64le/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/ppc64le/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/ppc64le/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/ppc64le/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/ppc64le/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/ppc64le/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/source/tree",
-        ],
-        "s390x": [
-        ],
-        "aarch64": [
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/aarch64/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/aarch64/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/aarch64/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/aarch64/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/aarch64/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/aarch64/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/source/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/aarch64/os",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/aarch64/os/debug/tree",
-            "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/source/tree",
-        ],
-    }),
-]
-
-productimg = False
-
-translate_paths = [
-	("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
-	# ("/compose", "http://172.22.0.123/compose"),
-]
-
diff --git a/c8-updates.conf b/c8-updates.conf
deleted file mode 100644
index cbd008d..0000000
--- a/c8-updates.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-from c8 import *
-#from images import *
-release_type = 'updates'
diff --git a/c8.conf b/c8.conf
deleted file mode 100644
index 774f97b..0000000
--- a/c8.conf
+++ /dev/null
@@ -1,165 +0,0 @@
-from multilib import *
-from include-excludes import *
-#from images import *
-
-# PRODUCT INFO 
-release_name = "CentOS Linux" 
-release_short = "CentOS"
-release_version = "8"
-version = "8.1.1911"
-
-# GENERAL SETTINGS
-comps_file = {
-        'scm': 'git',
-        'repo': 'https://git.centos.org/centos/comps.git',
-        'branch': 'master',
-        'file': 'comps-centos-8.1.0.1911.xml',
-}
-
-link_type = 'hardlink-or-copy'
-
-module_defaults_dir = {
-        'scm': 'git',
-        'repo': 'https://git.centos.org/centos/centos-module-defaults.git',
-        'branch': 'c8.1',
-        'dir': '.',
-}
-
-multilib = [
-    ('^.*$', {
-        'x86_64': ['devel', 'runtime']
-    }),
-]
-
-variants_file = 'variants.xml'
-sigkeys = ['8483C65D']
-hashed_directories = False
-
-tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
-
-# RUNROOT SETTINGS
-runroot_channel = 'image'
-runroot_tag = 'dist-c8-build'
-runroot_method = 'koji'
-
-# PKGSET
-pkgset_source = "koji"
-koji_profile = "mbox"
-
-# PKGSET - KOJI
-pkgset_koji_tag = "dist-c8-compose"
-pkgset_koji_inherit = False
-pkgset_koji_module_tag = "dist-c8-module-compose"
-
-filter_system_release_packages = False
-
-# GATHER
-gather_prepopulate = "centos-packages.json"
-
-gather_method = {
-        "^(?!(AppStream|PowerTools|CR)).*$":{
-                "comps": "deps"
-        },
-        "^(AppStream|PowerTools|CR)$": "hybrid",
-}
-
-gather_backend = "dnf"
-check_deps = False
-greedy_method = "none"
-repoclosure_backend = "dnf"
-
-# CREATEREPO
-createrepo_deltas = False
-createrepo_database = True
-createrepo_c = True
-createrepo_checksum = "sha256"
-createrepo_use_xz = True
-createrepo_num_threads = 8
-createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:centos:centos:8,CentOS 8', '--revision=8.1.1911']
-
-# CHECKSUMS
-media_checksums = ['sha256']
-media_checksum_one_file = True
-create_jigdo = False
-
-# BUILDINSTALL
-bootable = True
-buildinstall_method = "lorax"
-
-lorax_options = [
-    ("^.*$", {
-        "*": {
-            "noupgrade": False,
-            "rootfs_size": 3,
-            "version": "8"
-        }
-    })
-]
-
-buildinstall_skip = [
-    ("^(AppStream|PowerTools|CR|HighAvailability)$", {
-       "*": True
-       }),
-]
-
-image_name_format = {
-    "^BaseOS$": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}",
-    ".*": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}",
-}
-
-image_volid_formats = [ '{release_short}-8.1.1911-{arch}-{disc_type}', ]
-
-# CREATEISO
-create_optional_isos = False
-
-createiso_skip = [
-    ('^(BaseOS|AppStream|PowerTools|HighAvailability|CR)$', {
-        '*': True,
-        'src':True
-    }),
-]
-
-extra_isos = {
-    "BaseOS": [{
-        "include_variants": ["AppStream"],
-        "filename": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}",
-        "skip_src": True,
-    }]
-}
-
-restricted_volid = True
-
-# LOOKASIDE
-variant_as_lookaside = [
-    ('AppStream', 'BaseOS'),
-    ('PowerTools', 'BaseOS'),
-    ('PowerTools', 'AppStream'),
-    ('HighAvailability', 'BaseOS'),
-    ('HighAvailability', 'AppStream'),
-]
-
-extra_files = [
-    ("^.*$", {
-        "*": [
-            {
-                "scm": "git",
-                "repo": "https://git.centos.org/rpms/centos-release.git",
-                "branch": "c8",
-                "file": [
-                    'SOURCES/GPL',
-                    'SOURCES/EULA',
-                ],
-                "target": "",
-            },
-        ]
-    }),
-]
-
-productimg = False
-
-translate_paths = [
-	("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
-	("/compose", "http://172.22.0.123/compose"),
-]
-
diff --git a/comps-centos-8-stream-devel.xml b/comps-centos-8-stream-devel.xml
deleted file mode 100644
index 0254948..0000000
--- a/comps-centos-8-stream-devel.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE comps PUBLIC "-//CentOS//DTD Comps info//EN" "comps.dtd">
-<comps>
-  <group variant="Devel">
-    <id>centos-stream-devel</id>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">argparse-manpage</packagereq>
-      <packagereq type="mandatory">autogen-libopts-devel</packagereq>
-      <packagereq type="mandatory">gfbgraph-devel</packagereq>
-      <packagereq type="mandatory">http-parser-devel</packagereq>
-      <packagereq type="mandatory">jbig2dec-devel</packagereq>
-      <packagereq type="mandatory">liba52-devel</packagereq>
-      <packagereq type="mandatory">libavc1394-devel</packagereq>
-      <packagereq type="mandatory">libdvdnav-devel</packagereq>
-      <packagereq type="mandatory">libnml-devel</packagereq>
-      <packagereq type="mandatory">libss-devel</packagereq>
-      <packagereq type="mandatory">libssh2-devel</packagereq>
-      <packagereq type="mandatory">libuv-devel</packagereq>
-      <packagereq type="mandatory">libXvMC-devel</packagereq>
-      <packagereq type="mandatory">mobile-broadband-provider-info-devel</packagereq>
-      <packagereq type="mandatory">openslp-devel</packagereq>
-      <packagereq type="mandatory">protobuf-lite-devel</packagereq>
-      <packagereq type="mandatory">python3-protobuf</packagereq>
-      <packagereq type="mandatory">quota-devel</packagereq>
-      <packagereq type="mandatory">rest-devel</packagereq>
-      <packagereq type="mandatory">tracker-devel</packagereq>
-    </packagelist>
-  </group>
-</comps>
diff --git a/container.conf b/container.conf
deleted file mode 100644
index 7ded8e1..0000000
--- a/container.conf
+++ /dev/null
@@ -1,100 +0,0 @@
-from multilib import * 
-from include-excludes import *
-
-release_name = 'CentOS-Container'
-release_short = 'CentOS-Container'
-release_version = '8'
-release_is_layered = False
-
-skip_phases = ['buildinstall','productimg','pkgset','gather','extra_files','createrepo']
-
-
-variants_file = 'variants.xml'
-sigkeys = ['8483C65D']
-hashed_directories = False
-
-tree_arches = ['i386', 'x86_64']
-tree_variants = ['Cloud']
-
-# PKGSET
-pkgset_source = "koji"
-koji_profile = "mbox"
-
-# PKGSET - KOJI
-pkgset_koji_tag = "dist-c8-compose"
-pkgset_koji_inherit = False
-pkgset_koji_module_tag = "modular-updates-candidate"
-
-# GATHER
-gather_prepopulate = "centos-packages.json"
-
-gather_method = {
-        "^(?!(AppStream|PowerTools)).*$":{
-                "comps": "deps"
-        },
-        "^(AppStream|PowerTools)$": "hybrid",
-}
-
-# CREATEREPO
-createrepo_deltas = False
-createrepo_database = True
-createrepo_c = True
-createrepo_checksum = "sha256"
-createrepo_use_xz = True
-createrepo_num_threads = 8
-createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:centos:centos:8,CentOS 8', '--revision=8.0.1905']
-
-# CHECKSUMS
-media_checksums = ['sha256']
-media_checksum_one_file = True
-create_jigdo = False
-
-createiso_skip = [
-        ('^BaseOS$', {
-            '*': True,
-            'src': True
-        }),
-        ('^AppStream$', {
-            '*': True,
-            'src': True
-        }),
-        ('^PowerTools$', {
-            '*': True,
-            'src': True
-        }),
-]
-
-image_build = {
-    "^Cloud$": [
-        {
-            "image-build": {
-                "format": [("docker", "tar.gz")],
-                "name": "CentOS-8-Container",
-                "target": "image-centos-8",
-                "version": "8.0.1905",
-                "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD",
-                "kickstart": "CentOS-8-Container.ks",
-                "ksversion": "F26",
-                "distro": "Fedora-20",
-                "disk-size": "10",
-                "arches": ["x86_64","ppc64le","aarch64"],
-                "repo": [
-		     'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/os', 
-		     ],
-		"install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/os',
-                "failable": ["ppc64le","aarch64"],
-            },
-            "factory-parameters": {
-                "generate_icicle": False,
-                "docker_cmd": '[ "/bin/bash" ]',
-                "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8.0.1905"}',
-            }
-        }
-    ]
-}
-
-translate_paths = [
-	("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
-	("/compose", "http://172.22.0.123/compose"),
-]
diff --git a/images-armhfp.conf b/images-armhfp.conf
deleted file mode 100644
index f3ecdd3..0000000
--- a/images-armhfp.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-image_build = {
-    "^BaseOS$": [
-        { 
-            "image-build": {
-                "format": [("qcow2", "qcow2")],
-                "name": "CentOS-8-Altarch-GenericCloud",
-                "target": "image-centos-8",
-                "version": "8.1.1911",
-                "release": "!RELEASE_FROM_DATE_RESPIN"
-                "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD",
-                "kickstart": "CentOS-8-GenericCloud.ks",
-                "ksversion": "F26",
-                "distro": "Fedora-20",
-                "disk-size": "10",
-                "arches": ["armv7hl"],
-                "repo": ["BaseOS", "AppStream"],
-                "failable": [*],
-            },
-            "factory-parameters": {
-                "generate_icicle": False,
-            }
-        },
-        {
-            "image-build": {
-                "format": [("docker", "tar.gz")],
-                "name": "CentOS-8-Altarch-Container",
-                "target": "image-centos-8",
-                "version": "8.1.1911",
-                "release": "!RELEASE_FROM_DATE_RESPIN"
-                "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD",
-                "kickstart": "CentOS-8-Container.ks",
-                "ksversion": "F26",
-                "distro": "Fedora-20",
-                "disk-size": "10",
-                "arches": ["armv7hl"],
-                "repo": ["BaseOS", "AppStream"],
-                "failable": [*],
-            },
-            "factory-parameters": {
-                "generate_icicle": False,
-            }
-        }
-    ]
-}
diff --git a/images-cloud.conf b/images-cloud.conf
deleted file mode 100644
index dfea1c2..0000000
--- a/images-cloud.conf
+++ /dev/null
@@ -1,109 +0,0 @@
-image_build = {
-    "(^BaseOS$|^Cloud$)": [
-        {
-            "image-build": {
-                "format": [("docker", "tar.gz")],
-                "name": "CentOS-8-Container",
-		"subvariant": "container",
-                "version": "8.1.1911",
-                "release": "!RELEASE_FROM_DATE_RESPIN"
-                "target": "image-centos-8",
-                "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
-                "kickstart": "CentOS-8-Container.ks",
-                "ksversion": "F26",
-                "distro": "Fedora-20",
-                "disk-size": "8",
-                "arches": ["x86_64","ppc64le","aarch64"],
-                "failable": ["ppc64le"],
-                "repo": [
-		     "http://qa.centos.org/centos/8/BaseOS/$arch/os/", 
-		     "http://qa.centos.org/centos/8/AppStream/$arch/os/", 
-	        ],
-		"install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", 
-            },
-            "factory-parameters": {
-                "generate_icicle": False,
-                "docker_cmd": '[ "/bin/bash" ]',
-                "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8"}',
-            }
-        },
-        { 
-            "image-build": {
-                "format": [("qcow2", "qcow2")],
-                "name": "CentOS-8-GenericCloud",
-		"subvariant": "generic",
-                "version": "8.1.1911",
-                "release": "!RELEASE_FROM_DATE_RESPIN"
-                "target": "image-centos-8",
-                "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
-                "kickstart": "CentOS-8-GenericCloud.ks",
-                "ksversion": "F26",
-                "distro": "Fedora-20",
-                "disk-size": "8",
-                "arches": ["x86_64","ppc64le","aarch64"],
-                "repo": [
-		     "http://qa.centos.org/centos/8/BaseOS/$arch/os/", 
-		     "http://qa.centos.org/centos/8/AppStream/$arch/os/", 
-	        ],
-		"install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", 
-            },
-            "factory-parameters": {
-                "generate_icicle": False,
-            }
-        },
-        {
-            "image-build": {
-                "format": [("qcow2", "qcow2")],
-                "name": "CentOS-8-ec2",
-		"subvariant": "ec2",
-                "version": "8.1.1911",
-                "release": "!RELEASE_FROM_DATE_RESPIN"
-                "target": "image-centos-8",
-                "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
-                "kickstart": "CentOS-8-EC2.ks",
-                "ksversion": "F26",
-                "distro": "Fedora-20",
-                "disk-size": "8",
-                "arches": ["x86_64", "aarch64"],
-                "repo": [
-		     "http://qa.centos.org/centos/8/BaseOS/$arch/os/", 
-		     "http://qa.centos.org/centos/8/AppStream/$arch/os/", 
-	        ],
-		"install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", 
-            },
-            "factory-parameters": {
-                "generate_icicle": False,
-            }
-        },
-        {
-            "image-build": {
-                "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')],
-                "name": "CentOS-8-Vagrant",
-		"subvariant": "vagrant",
-                "version": "8.1.1911",
-                "release": "!RELEASE_FROM_DATE_RESPIN"
-                "target": "image-centos-8",
-                "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
-                "kickstart": "CentOS-8-x86_64-Vagrant.ks",
-                "ksversion": "F26",
-                "distro": "Fedora-20",
-                "disk-size": "8",
-                "arches": ["x86_64"],
-                "repo": [
-		     "http://qa.centos.org/centos/8/BaseOS/$arch/os/", 
-		     "http://qa.centos.org/centos/8/AppStream/$arch/os/", 
-	        ],
-		"install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", 
-                "failable": ["ppc64le","aarch64"],
-            },
-            "factory-parameters": {
-                "generate_icicle": False,
-            }
-        },
-    ]
-}
-
-translate_paths = [
-	("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
-	("/compose", "http://172.22.0.123/compose"),
-]
diff --git a/include-excludes.conf b/include-excludes.conf
deleted file mode 100644
index 8084b7d..0000000
--- a/include-excludes.conf
+++ /dev/null
@@ -1,589 +0,0 @@
-filter_packages = [
-    ("^Devel$", {
-        "*": [
-            "glibc*",
-            # This is a massive hack... using diff | egrep -v '^[+-]' | perl -pe 's/(.*)-[^-]+-[^-]+[.]rpm/$1/' | sort -u
- "acl-debuginfo",
- "attr-debuginfo",
- "bash",
- "bzip2-debuginfo",
- "bzip2-libs",
- "chkconfig",
- "coreutils",
- "coreutils-common",
- "coreutils-single",
- "e2fsprogs-debuginfo",
- "expat",
- "filesystem",
- "gawk",
- "gdbm",
- "gdbm-libs",
- "gmp",
- "grep",
- "info",
- "keyutils-debuginfo",
- "keyutils-libs",
- "krb5-debuginfo",
- "krb5-libs",
- "libacl",
- "libattr",
- "libcap",
- "libcom_err",
- "libffi",
- "libnsl2",
- "libpkgconf",
- "libselinux",
- "libsepol",
- "libsigsegv",
- "libtasn1",
- "libtirpc",
- "libuv",
- "libverto",
- "libxcrypt",
- "mpfr",
- "ncurses",
- "ncurses-base",
- "ncurses-libs",
- "openssl-debuginfo",
- "openssl-libs",
- "p11-kit",
- "p11-kit-trust",
- "pcre",
- "pcre2",
- "pkgconf",
- "pkgconf-m4",
- "pkgconf-pkg-config",
- "platform-python",
- "platform-python-pip",
- "platform-python-setuptools",
- "popt",
- "popt-devel",
- "python3-libs",
- "python3-pip-wheel",
- "python3-setuptools-wheel",
- "readline",
- "sed",
- "xz-debuginfo",
- "xz-libs",
- "zlib",
- "a52dec-debuginfo",
- "aajohan-comfortaa-fonts",
- "abattis-cantarell-fonts",
- "acl",
- "acl-debuginfo",
- "adwaita-cursor-theme",
- "adwaita-icon-theme",
- "alsa-lib",
- "aspell",
- "atk",
- "atk-devel",
- "at-spi2-atk",
- "at-spi2-atk-devel",
- "at-spi2-core",
- "at-spi2-core-devel",
- "attr-debuginfo",
- "audit-debuginfo",
- "audit-libs",
- "autoconf",
- "autogen",
- "autogen-libopts",
- "automake",
- "avahi-debuginfo",
- "avahi-glib",
- "avahi-libs",
- "bitmap-console-fonts",
- "bitmap-fangsongti-fonts",
- "bitmap-fixed-fonts",
- "bitmap-lucida-typewriter-fonts",
- "bpg-fonts-common",
- "bpg-mrgvlovani-caps-fonts",
- "bpg-mrgvlovani-fonts",
- "bpg-nateli-caps-fonts",
- "bpg-nateli-condenced-fonts",
- "bpg-nateli-fonts",
- "brotli",
- "bubblewrap",
- "bzip2-debuginfo",
- "bzip2-devel",
- "cairo",
- "cairo-devel",
- "cairo-gobject",
- "cairo-gobject-devel",
- "cmake-filesystem",
- "colord-debuginfo",
- "colord-libs",
- "comic-neue-angular-fonts",
- "comic-neue-fonts",
- "comic-neue-fonts-common",
- "cpp",
- "cracklib",
- "cryptsetup-debuginfo",
- "cryptsetup-libs",
- "cups-debuginfo",
- "cups-libs",
- "dbus",
- "dbus-common",
- "dbus-daemon",
- "dbus-devel",
- "dbus-libs",
- "dbus-tools",
- "dejavu-fonts-common",
- "dejavu-lgc-sans-fonts",
- "dejavu-lgc-sans-mono-fonts",
- "dejavu-sans-fonts",
- "dejavu-sans-mono-fonts",
- "dejavu-serif-fonts",
- "e2fsprogs-debuginfo",
- "elfutils-debuginfo",
- "elfutils-default-yama-scope",
- "elfutils-libelf",
- "elfutils-libs",
- "emacs-filesystem",
- "enchant",
- "enchant2",
- "expat-devel",
- "findutils",
- "fontconfig",
- "fontconfig-devel",
- "fontpackages-filesystem",
- "freetype",
- "freetype-devel",
- "gc",
- "gcc",
- "gcc-debuginfo",
- "gcr",
- "gdbm-debuginfo",
- "gdk-pixbuf2",
- "gdk-pixbuf2-devel",
- "gdk-pixbuf2-modules",
- "geoclue2",
- "gettext",
- "gettext-libs",
- "gfbgraph",
- "glib2",
- "glib2-devel",
- "glib-networking",
- "gnome-online-accounts",
- "gnome-online-accounts-devel",
- "gnutls",
- "gobject-introspection",
- "gobject-introspection-devel",
- "google-crosextra-caladea-fonts",
- "google-crosextra-carlito-fonts",
- "google-droid-sans-fonts",
- "google-droid-sans-mono-fonts",
- "google-droid-serif-fonts",
- "google-noto-cjk-fonts-common",
- "google-noto-fonts-common",
- "google-noto-mono-fonts",
- "google-noto-sans-cjk-jp-fonts",
- "google-noto-sans-cjk-kr-fonts",
- "google-noto-sans-cjk-sc-fonts",
- "google-noto-sans-cjk-tc-fonts",
- "google-noto-sans-cjk-ttc-fonts",
- "google-noto-sans-fonts",
- "google-noto-sans-jp-fonts",
- "google-noto-sans-kr-fonts",
- "google-noto-sans-mono-cjk-jp-fonts",
- "google-noto-sans-mono-cjk-kr-fonts",
- "google-noto-sans-mono-cjk-sc-fonts",
- "google-noto-sans-mono-cjk-tc-fonts",
- "google-noto-sans-sc-fonts",
- "google-noto-sans-tc-fonts",
- "google-noto-sans-ui-fonts",
- "google-noto-serif-cjk-jp-fonts",
- "google-noto-serif-cjk-kr-fonts",
- "google-noto-serif-cjk-sc-fonts",
- "google-noto-serif-cjk-tc-fonts",
- "google-noto-serif-cjk-ttc-fonts",
- "google-noto-serif-fonts",
- "google-noto-serif-jp-fonts",
- "google-noto-serif-kr-fonts",
- "google-noto-serif-sc-fonts",
- "google-noto-serif-tc-fonts",
- "google-roboto-slab-fonts",
- "graphite2",
- "graphite2-devel",
- "gsettings-desktop-schemas",
- "gstreamer1",
- "gstreamer1-plugins-base",
- "gtk3",
- "gtk3-devel",
- "gtk-update-icon-cache",
- "guile",
- "gzip",
- "harfbuzz",
- "harfbuzz-devel",
- "harfbuzz-icu",
- "hicolor-icon-theme",
- "http-parser",
- "hunspell",
- "hunspell-en-US",
- "hyphen",
- "icu-debuginfo",
- "iptables-debuginfo",
- "iptables-libs",
- "isl",
- "iso-codes",
- "jasper-debuginfo",
- "jasper-libs",
- "jbig2dec-debuginfo",
- "jbig2dec-libs",
- "jbigkit-debuginfo",
- "jbigkit-libs",
- "jomolhari-fonts",
- "json-c",
- "json-glib",
- "json-glib-debuginfo",
- "json-glib-devel",
- "julietaula-montserrat-fonts",
- "khmeros-base-fonts",
- "khmeros-battambang-fonts",
- "khmeros-bokor-fonts",
- "khmeros-fonts-common",
- "khmeros-handwritten-fonts",
- "khmeros-metal-chrieng-fonts",
- "khmeros-muol-fonts",
- "khmeros-siemreap-fonts",
- "kmod-debuginfo",
- "kmod-libs",
- "krb5-debuginfo",
- "lato-fonts",
- "lcms2",
- "liba52",
- "libasan",
- "libatomic",
- "libatomic_ops",
- "libavc1394",
- "libblkid",
- "libcap-ng",
- "libcom_err-devel",
- "libcroco",
- "libdatrie",
- "libdb",
- "libdrm",
- "libdrm-devel",
- "libdvdnav",
- "libdvdread",
- "libdvdread-devel",
- "libepoxy",
- "libepoxy-devel",
- "liberation-fonts-common",
- "liberation-mono-fonts",
- "liberation-narrow-fonts",
- "liberation-sans-fonts",
- "liberation-serif-fonts",
- "libfdisk",
- "libffi-devel",
- "libfontenc",
- "libgcc",
- "libgcrypt",
- "libglvnd",
- "libglvnd-core-devel",
- "libglvnd-devel",
- "libglvnd-egl",
- "libglvnd-gles",
- "libglvnd-glx",
- "libglvnd-opengl",
- "libgomp",
- "libgpg-error",
- "libgusb",
- "libICE",
- "libicu",
- "libicu-devel",
- "libidn2",
- "libjpeg-turbo",
- "libmcpp",
- "libmodman",
- "libmount",
- "libmpc",
- "libnotify",
- "libogg",
- "libpciaccess",
- "libpng",
- "libpng-devel",
- "libproxy",
- "libpwquality",
- "libraw1394",
- "libraw1394-devel",
- "librtas",
- "libseccomp",
- "libsecret",
- "libsemanage",
- "libSM",
- "libsmartcols",
- "libsoup",
- "libsoup-devel",
- "libss",
- "libstdc++",
- "libthai",
- "libtheora",
- "libtiff",
- "libtool",
- "libtool-debugsource",
- "libtool-ltdl",
- "libubsan",
- "libunistring",
- "libusbx",
- "libutempter",
- "libuuid",
- "libuuid-devel",
- "libvisual",
- "libvorbis",
- "libwayland-client",
- "libwayland-cursor",
- "libwayland-egl",
- "libwayland-server",
- "libwebp",
- "libX11",
- "libX11-common",
- "libX11-devel",
- "libX11-xcb",
- "libXau",
- "libXau-devel",
- "libxcb",
- "libxcb-devel",
- "libXcomposite",
- "libXcomposite-devel",
- "libXcursor",
- "libXcursor-devel",
- "libXdamage",
- "libXdamage-devel",
- "libXext",
- "libXext-devel",
- "libXfixes",
- "libXfixes-devel",
- "libXft",
- "libXft-devel",
- "libXi",
- "libXi-devel",
- "libXinerama",
- "libXinerama-devel",
- "libxkbcommon",
- "libxkbcommon-devel",
- "libxml2",
- "libxml2-devel",
- "libXmu",
- "libXrandr",
- "libXrandr-devel",
- "libXrender",
- "libXrender-devel",
- "libxshmfence",
- "libxslt",
- "libXt",
- "libXtst",
- "libXv",
- "libXv-devel",
- "libXvMC",
- "libXxf86misc",
- "libXxf86vm",
- "libXxf86vm-devel",
- "lohit-devanagari-fonts",
- "lohit-telugu-fonts",
- "lz4-debuginfo",
- "lz4-libs",
- "m4",
- "mcpp",
- "mobile-broadband-provider-info",
- "ModemManager-debuginfo",
- "ModemManager-glib",
- "ncurses-debuginfo",
- "nettle",
- "open-sans-fonts",
- "openslp",
- "openssl-debuginfo",
- "opus",
- "orc",
- "overpass-fonts",
- "overpass-mono-fonts",
- "paktype-naqsh-fonts",
- "paktype-naskh-basic-fonts",
- "paktype-tehreer-fonts",
- "pam",
- "pango",
- "pango-devel",
- "paratype-pt-sans-caption-fonts",
- "paratype-pt-sans-fonts",
- "pcre-cpp",
- "pcre-devel",
- "pcre-utf16",
- "pcre-utf32",
- "perl-Carp",
- "perl-Data-Dumper",
- "perl-debuginfo",
- "perl-Errno",
- "perl-File-Path",
- "perl-Getopt-Long",
- "perl-interpreter",
- "perl-IO",
- "perl-libs",
- "perl-macros",
- "perl-PathTools",
- "perl-Scalar-List-Utils",
- "perl-Socket",
- "perl-threads",
- "perl-threads-shared",
- "perl-Unicode-Normalize",
- "pixman",
- "pixman-devel",
- "protobuf",
- "protobuf-compiler",
- "protobuf-devel",
- "protobuf-debuginfo",
- "protobuf-lite",
- "python3-mako",
- "python3-markupsafe",
- "python3-six",
- "quota",
- "quota-debugsource",
- "rest",
- "shadow-utils",
- "shared-mime-info",
- "sil-abyssinica-fonts",
- "sil-scheherazade-fonts",
- "stix-fonts",
- "stix-math-fonts",
- "tar",
- "thai-scalable-fonts-common",
- "thai-scalable-garuda-fonts",
- "thai-scalable-kinnari-fonts",
- "thai-scalable-tlwgtypo-fonts",
- "thai-scalable-umpush-fonts",
- "thai-scalable-waree-fonts",
- "tibetan-machine-uni-fonts",
- "tracker",
- "urw-base35-bookman-fonts",
- "urw-base35-c059-fonts",
- "urw-base35-d050000l-fonts",
- "urw-base35-fonts-common",
- "urw-base35-gothic-fonts",
- "urw-base35-nimbus-mono-ps-fonts",
- "urw-base35-nimbus-roman-fonts",
- "urw-base35-nimbus-sans-fonts",
- "urw-base35-p052-fonts",
- "urw-base35-z003-fonts",
- "util-linux",
- "wayland-debuginfo",
- "wayland-devel",
- "wayland-protocols-devel",
- "woff2",
- "wqy-microhei-fonts",
- "wqy-unibit-fonts",
- "xkeyboard-config",
- "xml-common",
- "xorg-x11-font-utils",
- "xorg-x11-proto-devel",
- "xorg-x11-server-utils",
- "xz-debuginfo",
- "xz-devel",
- "zlib-devel",
-        ]
-    }),
-
-    ("^(BaseOS|AppStream)$", {
-        "*": [
-            "python36",
-        ]
-    }),
-
-    ("^BaseOS$", {
-        "*": [
-            "compat-openssl10-devel",
-            "compat-openssl10-pkcs11-helper",
-            "openldap-servers-debuginfo",
-            "ongres-scram",
-        ]
-    }),
-]
-
-additional_packages = [
-    ("^AppStream$", {
-        "*": [
-            "langpacks-*",
-	    "dotnet-*",
-            "ansible-freeipa",
-            "fapolicyd",
-            "python3-rpmfluff",
-            "gcc-toolset-9",
-            "gcc-toolset-9-annobin",
-            "gcc-toolset-9-binutils",
-            "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",
-            "libubsan1",
-            "lttng-ust",
-        ]
-    }),
-
-    ("^AppStream$", {
-        "x86_64": [
-
-            "libreoffice-langpack-*",
-            "libreoffice-help-*",
-        ],
-	"armhfp": [
-            "libreoffice-*",
-            "libreoffice-help-*",
-            "libreoffice-langpack-*",
-	    "emacs-*",
-	    "autocorr*",
-            "fence-agents*",
-            "gnome-shell-extension*",
-            "google-noto*",
-            "hunspell-*",
-            "hyphen-*",
-	]
-    }),
-
-    ("^BaseOS$", {
-        "*": [
-            "kernel-doc",
-	    "centos-obsolete-packages",
-        ],
-	"armhfp": [
-	    "kernel-lpae*",
-	    "uboot-tools",
-            "uboot-images*",
-            "grub2*",
-            "grubby-deprecated",
-            "efibootmgr",
-            "cloud-utils-growpart",
-            "bcm283x-firmware",
-            "efivar*",
-	]
-    }),
-]
diff --git a/plus.conf b/plus.conf
deleted file mode 100644
index 9cec3c6..0000000
--- a/plus.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-release_name = "CentOS-Plus"
-release_short = "Plus"
-release_version = "8"
-release_is_layered = False
-
-variants_file='variants-Plus.xml'
-sigkeys = ['8483C65D']
-create_jigdo = False
-
-pkgset_source='koji'
-
-pkgset_koji_tag='dist-c8-plus'
-gather_method = {
-    '^.*': {                # For all variants
-        'comps': 'deps',    # resolve dependencies for packages from comps file
-        'module': 'nodeps', # but not for packages from modules
-    }
-}
-
-gather_backend = 'dnf'
-greedy_method = 'build'
-koji_profile = "mbox"
-
-check_deps = False
-
-additional_packages = [
-	('^plus$', {
-		'*': [ 
-			'*',
-		],
-	}),
-]
-
-createiso_skip = [
-	
-        ('^plus$', {
-            '*': True,
-            'src': True
-        }),
-]
diff --git a/variants-Extras.xml b/variants-Extras.xml
deleted file mode 100644
index 8741a16..0000000
--- a/variants-Extras.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
-<variants>
-    <variant id="extras" name="extras" type="variant">
-        <arches>
-            <arch>aarch64</arch>
-            <arch>ppc64le</arch>
-            <arch>x86_64</arch>
-        </arches>
-    </variant>
-</variants>
diff --git a/variants-Plus.xml b/variants-Plus.xml
deleted file mode 100644
index d60b516..0000000
--- a/variants-Plus.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
-<variants>
-    <variant id="plus" name="plus" type="variant">
-        <arches>
-            <arch>aarch64</arch>
-            <arch>ppc64le</arch>
-            <arch>x86_64</arch>
-        </arches>
-    </variant>
-</variants>
diff --git a/variants-armhfp.xml b/variants-armhfp.xml
deleted file mode 100644
index 0c93fd6..0000000
--- a/variants-armhfp.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
-<variants>
-  <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
-    <!-- List of architectures for BaseOS compose variant -->
-    <arches>
-      <arch>armhfp</arch>
-    </arches>
-    <!-- List of comps groups that should be part of BaseOS compose variant -->
-    <groups>
-      <!-- Essential groups for Anaconda installation -->
-      <group default="true">guest-agents</group>
-      <group default="true">standard</group>
-      <group default="true">base</group>
-      <group default="true">core</group>
-      <!-- Other groups -->
-      <group default="true">binary-intentionally-in-rhel-8</group>
-      <group default="true">additional-devel</group>
-      <group default="false">anaconda-tools</group>
-      <group default="false">conflicts-baseos</group>
-      <group default="true">development</group>
-      <group default="true">server-product</group>
-      <group default="true">dial-up</group>
-      <group default="true">networkmanager-submodules</group>
-      <group default="true">file-server</group>
-      <group default="true">fonts</group>
-      <group default="true">gnome-desktop</group>
-      <group default="true">graphical-admin-tools</group>
-      <group default="true">hardware-monitoring</group>
-      <group default="true">hardware-support</group>
-      <group default="true">infiniband</group>
-      <group default="true">headless-management</group>
-      <group default="true">large-systems</group>
-      <group default="true">legacy-unix</group>
-      <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">smb-server</group>
-      <group default="true">network-tools</group>
-      <group default="true">network-file-system-client</group>
-      <group default="true">network-server</group>
-      <group default="true">performance</group>
-      <group default="true">platform-devel</group>
-      <group default="true">python-web</group>
-      <group default="true">remote-system-management</group>
-      <group default="true">scientific</group>
-      <group default="true">security-tools</group>
-      <group default="true">system-tools</group>
-      <group default="true">workstation-product</group>
-    </groups>
-    <!-- List of environments from comps that should be part of BaseOS compose variant -->
-    <environments>
-      <environment display_order="3">minimal-environment</environment>
-      <environment display_order="99">custom-environment</environment>
-      <environment display_order="1">server-product-environment</environment>
-    </environments>
-  </variant>
-  <variant id="AppStream" name="AppStream" type="variant">
-    <!-- List of architectures for AppStream compose variant -->
-    <arches>
-      <arch>armhfp</arch>
-    </arches>
-    <!-- List of comps groups that should be part of AppStream compose variant -->
-    <groups>
-      <group default="true">nonmodular-appstream</group>
-      <group default="true">standard</group>
-      <group default="false">anaconda-tools</group>
-      <group default="true">base</group>
-      <group default="false">conflicts-appstream</group>
-      <group default="true">core</group>
-      <group default="true">additional-devel</group>
-      <group default="true">base-x</group>
-      <group default="true">debugging</group>
-      <group default="true">development</group>
-      <group default="true">dotnet-core</group>
-      <group default="true">file-server</group>
-      <group default="true">ftp-server</group>
-      <group default="true">gnome-apps</group>
-      <group default="true">gnome-desktop</group>
-      <group default="true">guest-desktop-agents</group>
-      <group default="true">graphical-admin-tools</group>
-      <group default="true">graphics</group>
-      <group default="true">infiniband</group>
-      <group default="true">workstation-product</group>
-      <group default="true">multimedia</group>
-      <group default="true">mail-server</group>
-      <group default="true">mainframe-access</group>
-      <group default="true">network-server</group>
-      <group default="true">network-tools</group>
-      <group default="true">container-management</group>
-      <group default="true">smb-server</group>
-      <group default="true">dial-up</group>
-      <group default="true">fonts</group>
-      <group default="true">input-methods</group>
-      <group default="true">multimedia</group>
-      <group default="true">networkmanager-submodules</group>
-      <group default="true">network-file-system-client</group>
-      <group default="true">print-client</group>
-      <group default="true">desktop-debugging</group>
-      <group default="true">internet-browser</group>
-      <group default="true">gnome-desktop</group>
-      <group default="true">guest-agents</group>
-      <group default="true">guest-desktop-agents</group>
-      <group default="true">headless-management</group>
-      <group default="true">java-platform</group>
-      <group default="true">gnome-apps</group>
-      <group default="true">internet-applications</group>
-      <group default="true">office-suite</group>
-      <group default="true">performance</group>
-      <group default="true">platform-devel</group>
-      <group default="true">platform-kvm</group>
-      <group default="true">platform-microsoft</group>
-      <group default="true">platform-vmware</group>
-      <group default="true">scientific</group>
-      <group default="true">ostree-support</group>
-      <group default="true">security-tools</group>
-      <group default="true">smart-card</group>
-      <group default="true">system-tools</group>
-      <group default="true">texlive</group>
-      <group default="true">legacy-x</group>
-      <group default="true">backup-client</group>
-      <group default="true">remote-desktop-clients</group>
-      <group default="true">remote-system-management</group>
-      <group default="true">rpm-development-tools</group>
-      <group default="true">virtualization-client</group>
-      <group default="true">virtualization-hypervisor</group>
-      <group default="true">virtualization-platform</group>
-      <group default="true">virtualization-tools</group>
-      <group default="true">web-server</group>
-    </groups>
-    <!-- List of environments from comps that should be part of BaseOS compose variant -->
-    <environments>
-      <environment display_order="3">minimal-environment</environment>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="99">custom-environment</environment>
-      <environment display_order="2">server-product-environment</environment>
-      <environment display_order="1">graphical-server-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
-    </environments>
-    <!-- List of modules that should be part of AppStream compose variant -->
-    <modules>
-      <module>389-ds:1.4</module>
-      <module>ant:1.10</module>
-      <module>perl-App-cpanminus:1.7044</module>
-      <module>perl-DBD-MySQL:4.046</module>
-      <module>perl-DBD-Pg:3.7</module>
-      <module>perl-DBD-SQLite:1.58</module>
-      <module>perl-DBI:1.641</module>
-      <module>container-tools:1.0</module>
-      <module>container-tools:rhel8</module>
-      <module>freeradius:3.0</module>
-      <module>gimp:2.8</module>
-      <module>go-toolset:rhel8</module>
-      <module>httpd:2.4</module>
-      <module>idm:DL1</module>
-      <module>idm:client</module>
-      <module>inkscape:0.92.3</module>
-      <module>javapackages-runtime:201801</module>
-      <module>libselinux-python:2.8</module>
-      <module>llvm-toolset:rhel8</module>
-      <module>mailman:2.1</module>
-      <module>mariadb:10.3</module>
-      <module>maven:3.5</module>
-      <module>mercurial:4.8</module>
-      <module>mod_auth_openidc:2.3</module>
-      <module>mysql:8.0</module>
-      <module>nginx:1.14</module>
-      <module>nginx:1.16</module>
-      <module>nodejs:10</module>
-      <module>nodejs:12</module>
-      <module>parfait:0.5</module>
-      <module>perl:5.24</module>
-      <module>perl:5.26</module>
-      <module>perl-FCGI:0.78</module>
-      <module>php:7.2</module>
-      <module>php:7.3</module>
-      <module>pki-core:10.6</module>
-      <module>pki-deps:10.6</module>
-      <module>postgresql:10</module>
-      <module>postgresql:9.6</module>
-      <module>python27:2.7</module>
-      <module>python36:3.6</module>
-      <module>redis:5</module>
-      <module>rhn-tools:1.0</module>
-      <module>ruby:2.5</module>
-      <module>ruby:2.6</module>
-      <module>rust-toolset:rhel8</module>
-      <module>satellite-5-client:1.0</module>
-      <module>scala:2.10</module>
-      <module>squid:4</module>
-      <module>subversion:1.10</module>
-      <module>swig:3.0</module>
-      <module>varnish:6</module>
-      <module>virt:rhel</module>
-      <module>perl-YAML:1.24</module>
-    </modules>
-
-  </variant>
-
-  <variant id="PowerTools" name="PowerTools" type="variant">
-    <!-- List of architectures for Powertools compose variant -->
-    <arches>
-      <arch>armhfp</arch>
-    </arches>
-    <groups>
-      <group default="true">centos-powertools</group>
-    </groups>
-    <!-- List of modules that should be part of CRB compose variant -->
-    <modules>
-      <module>javapackages-tools:201801</module>
-      <!-- List AppStream modules for which we want -devel version. AppStream is
-      used as lookaside for CRB, so the module will not actually get into
-      CRB, but it's needed here for creating the -devel module.
-      -->
-    </modules>
-  </variant>
-
-</variants>
diff --git a/variants-devel.xml b/variants-devel.xml
deleted file mode 100644
index 9a66a90..0000000
--- a/variants-devel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
-<variants>
-  <variant id="Devel" name="Devel" type="variant" has_optional="false">
-    <!-- List of architectures for BaseOS compose variant -->
-    <arches>
-      <arch>aarch64</arch>
-      <arch>x86_64</arch>
-      <arch>ppc64le</arch>
-    </arches>
-    <!-- List of comps groups that should be part of Devel compose variant -->
-    <groups>
-      <group default="true">centos-stream-devel</group>
-    </groups>
-  </variant>
-
-</variants>
diff --git a/variants.xml b/variants.xml
deleted file mode 100644
index addab7a..0000000
--- a/variants.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
-<variants>
-  <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
-    <!-- List of architectures for BaseOS compose variant -->
-    <arches>
-      <arch>aarch64</arch>
-      <arch>x86_64</arch>
-      <arch>ppc64le</arch>
-    </arches>
-    <!-- List of comps groups that should be part of BaseOS compose variant -->
-    <groups>
-      <!-- Essential groups for Anaconda installation -->
-      <group default="true">guest-agents</group>
-      <group default="true">standard</group>
-      <group default="true">base</group>
-      <group default="true">core</group>
-      <!-- Other groups -->
-      <group default="true">binary-intentionally-in-rhel-8</group>
-      <group default="true">additional-devel</group>
-      <group default="false">anaconda-tools</group>
-      <group default="false">conflicts-baseos</group>
-      <group default="true">development</group>
-      <group default="true">server-product</group>
-      <group default="true">dial-up</group>
-      <group default="true">networkmanager-submodules</group>
-      <group default="true">file-server</group>
-      <group default="true">fonts</group>
-      <group default="true">gnome-desktop</group>
-      <group default="true">graphical-admin-tools</group>
-      <group default="true">hardware-monitoring</group>
-      <group default="true">hardware-support</group>
-      <group default="true">infiniband</group>
-      <group default="true">headless-management</group>
-      <group default="true">large-systems</group>
-      <group default="true">legacy-unix</group>
-      <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>
-      <group default="true">network-file-system-client</group>
-      <group default="true">network-server</group>
-      <group default="true">performance</group>
-      <group default="true">platform-devel</group>
-      <group default="true">python-web</group>
-      <group default="true">remote-system-management</group>
-      <group default="true">scientific</group>
-      <group default="true">security-tools</group>
-      <group default="true">system-tools</group>
-      <group default="true">workstation-product</group>
-    </groups>
-    <!-- List of environments from comps that should be part of BaseOS compose variant -->
-    <environments>
-      <environment display_order="3">minimal-environment</environment>
-      <environment display_order="99">custom-environment</environment>
-      <environment display_order="1">server-product-environment</environment>
-    </environments>
-  </variant>
-  <variant id="AppStream" name="AppStream" type="variant">
-    <!-- List of architectures for AppStream compose variant -->
-    <arches>
-      <arch>aarch64</arch>
-      <arch>ppc64le</arch>
-      <arch>x86_64</arch>
-    </arches>
-    <!-- List of comps groups that should be part of AppStream compose variant -->
-    <groups>
-      <group default="true">nonmodular-appstream</group>
-      <group default="true">standard</group>
-      <group default="false">anaconda-tools</group>
-      <group default="true">base</group>
-      <group default="false">conflicts-appstream</group>
-      <group default="true">core</group>
-      <group default="true">additional-devel</group>
-      <group default="true">base-x</group>
-      <group default="true">debugging</group>
-      <group default="true">development</group>
-      <group default="true">dotnet-core</group>
-      <group default="true">file-server</group>
-      <group default="true">ftp-server</group>
-      <group default="true">gnome-apps</group>
-      <group default="true">gnome-desktop</group>
-      <group default="true">guest-desktop-agents</group>
-      <group default="true">graphical-admin-tools</group>
-      <group default="true">graphics</group>
-      <group default="true">infiniband</group>
-      <group default="true">workstation-product</group>
-      <group default="true">multimedia</group>
-      <group default="true">mail-server</group>
-      <group default="true">mainframe-access</group>
-      <group default="true">network-server</group>
-      <group default="true">network-tools</group>
-      <group default="true">container-management</group>
-      <group default="true">smb-server</group>
-      <group default="true">dial-up</group>
-      <group default="true">fonts</group>
-      <group default="true">input-methods</group>
-      <group default="true">multimedia</group>
-      <group default="true">networkmanager-submodules</group>
-      <group default="true">network-file-system-client</group>
-      <group default="true">print-client</group>
-      <group default="true">desktop-debugging</group>
-      <group default="true">internet-browser</group>
-      <group default="true">gnome-desktop</group>
-      <group default="true">guest-agents</group>
-      <group default="true">guest-desktop-agents</group>
-      <group default="true">headless-management</group>
-      <group default="true">java-platform</group>
-      <group default="true">gnome-apps</group>
-      <group default="true">internet-applications</group>
-      <group default="true">office-suite</group>
-      <group default="true">performance</group>
-      <group default="true">platform-devel</group>
-      <group default="true">platform-kvm</group>
-      <group default="true">platform-microsoft</group>
-      <group default="true">platform-vmware</group>
-      <group default="true">scientific</group>
-      <group default="true">ostree-support</group>
-      <group default="true">security-tools</group>
-      <group default="true">smart-card</group>
-      <group default="true">system-tools</group>
-      <group default="true">texlive</group>
-      <group default="true">legacy-x</group>
-      <group default="true">backup-client</group>
-      <group default="true">remote-desktop-clients</group>
-      <group default="true">remote-system-management</group>
-      <group default="true">rpm-development-tools</group>
-      <group default="true">virtualization-client</group>
-      <group default="true">virtualization-hypervisor</group>
-      <group default="true">virtualization-platform</group>
-      <group default="true">virtualization-tools</group>
-      <group default="true">web-server</group>
-    </groups>
-    <!-- List of environments from comps that should be part of BaseOS compose variant -->
-    <environments>
-      <environment display_order="3">minimal-environment</environment>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="99">custom-environment</environment>
-      <environment display_order="2">server-product-environment</environment>
-      <environment display_order="1">graphical-server-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
-    </environments>
-    <!-- List of modules that should be part of AppStream compose variant -->
-    <modules>
-      <module>389-ds:1.4</module>
-      <module>ant:1.10</module>
-      <module>perl-App-cpanminus:1.7044</module>
-      <module>perl-DBD-MySQL:4.046</module>
-      <module>perl-DBD-Pg:3.7</module>
-      <module>perl-DBD-SQLite:1.58</module>
-      <module>perl-DBI:1.641</module>
-      <module>container-tools:1.0</module>
-      <module>container-tools:rhel8</module>
-      <module>freeradius:3.0</module>
-      <module>gimp:2.8</module>
-      <module>go-toolset:rhel8</module>
-      <module>httpd:2.4</module>
-      <module>idm:DL1</module>
-      <module>idm:client</module>
-      <module>inkscape:0.92.3</module>
-      <module>javapackages-runtime:201801</module>
-      <module>jmc:rhel8</module>
-      <module>libselinux-python:2.8</module>
-      <module>llvm-toolset:rhel8</module>
-      <module>mailman:2.1</module>
-      <module>mariadb:10.3</module>
-      <module>maven:3.5</module>
-      <module>mercurial:4.8</module>
-      <module>mod_auth_openidc:2.3</module>
-      <module>mysql:8.0</module>
-      <module>nginx:1.14</module>
-      <module>nginx:1.16</module>
-      <module>nodejs:10</module>
-      <module>nodejs:12</module>
-      <module>parfait:0.5</module>
-      <module>perl:5.24</module>
-      <module>perl:5.26</module>
-      <module>perl-FCGI:0.78</module>
-      <module>php:7.2</module>
-      <module>php:7.3</module>
-      <module>pki-core:10.6</module>
-      <module>pki-deps:10.6</module>
-      <module>postgresql:10</module>
-      <module>postgresql:12</module>
-      <module>postgresql:9.6</module>
-      <module>python27:2.7</module>
-      <module>python36:3.6</module>
-      <module>redis:5</module>
-      <module>rhn-tools:1.0</module>
-      <module>ruby:2.5</module>
-      <module>ruby:2.6</module>
-      <module>rust-toolset:rhel8</module>
-      <module>satellite-5-client:1.0</module>
-      <module>scala:2.10</module>
-      <module>squid:4</module>
-      <module>subversion:1.10</module>
-      <module>swig:3.0</module>
-      <module>varnish:6</module>
-      <module>virt:rhel</module>
-      <module>perl-YAML:1.24</module>
-    </modules>
-
-  </variant>
-
-  <variant id="PowerTools" name="PowerTools" type="variant">
-    <!-- List of architectures for Powertools compose variant -->
-    <arches>
-      <arch>aarch64</arch>
-      <arch>ppc64le</arch>
-      <arch>x86_64</arch>
-    </arches>
-    <groups>
-      <group default="true">centos-powertools</group>
-    </groups>
-    <!-- List of modules that should be part of CRB compose variant -->
-    <modules>
-      <module>javapackages-tools:201801</module>
-      <!-- List AppStream modules for which we want -devel version. AppStream is
-      used as lookaside for CRB, so the module will not actually get into
-      CRB, but it's needed here for creating the -devel module.
-      -->
-      <module>mariadb-devel:10.3</module>
-      <module>virt-devel:rhel</module>
-    </modules>
-  </variant>
-
-  <!-- ADDONS (Defined as variants in RHEL-8) -->
-
-  <variant id="HighAvailability" name="High Availability" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-      <arch>x86_64</arch>
-      <arch>ppc64le</arch>
-    </arches>
-    <groups>
-      <group default="true">ha</group>
-      <group default="true">ha-devel</group>
-    </groups>
-  </variant>
-  <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
-    <arches>
-      <arch>ppc64le</arch>
-      <arch>x86_64</arch>
-      <arch>ppc64le</arch>
-    </arches>
-  </variant>
-
-</variants>