diff --git a/c8.conf b/c8.conf
index 79f0592..d46e874 100644
--- a/c8.conf
+++ b/c8.conf
@@ -1,22 +1,19 @@
 from multilib import *
 from include-excludes import *
-from version import *
+from images import *
 
 # PRODUCT INFO 
 release_name = "CentOS Linux" 
 release_short = "CentOS"
-release_type = "updates"
-release_version = "8"
-release_is_layered = False
+release_version = "8.1.1911"
 version = "8"
 
 # GENERAL SETTINGS
-bootable = True
 comps_file = {
         'scm': 'git',
         'repo': 'https://git.centos.org/centos/comps.git',
         'branch': 'master',
-        'file': 'comps-centos-8.0.0.1905.xml',
+        'file': 'comps-centos-8.1.0.1911.xml',
 }
 
 link_type = 'hardlink-or-copy'
@@ -24,7 +21,7 @@ link_type = 'hardlink-or-copy'
 module_defaults_dir = {
         'scm': 'git',
         'repo': 'https://git.centos.org/centos/centos-module-defaults.git',
-        'branch': 'c8.0',
+        'branch': 'c8.1',
         'dir': '.',
 }
 
@@ -41,7 +38,6 @@ hashed_directories = False
 tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
 
 # RUNROOT SETTINGS
-runroot = True
 runroot_channel = 'image'
 runroot_tag = 'dist-c8-build'
 runroot_method = 'koji'
@@ -52,6 +48,7 @@ koji_profile = "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
@@ -60,10 +57,10 @@ filter_system_release_packages = False
 gather_prepopulate = "centos-packages.json"
 
 gather_method = {
-        "^(?!(AppStream|PowerTools)).*$":{
+        "^(?!(AppStream|PowerTools|CR)).*$":{
                 "comps": "deps"
         },
-        "^(AppStream|PowerTools)$": "hybrid",
+        "^(AppStream|PowerTools|CR)$": "hybrid",
 }
 
 gather_backend = "dnf"
@@ -79,7 +76,7 @@ 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']
+createrepo_extra_args = ['--distro=cpe:/o:centos:centos:8,CentOS 8', '--revision=8.1.1911']
 
 # CHECKSUMS
 media_checksums = ['sha256']
@@ -95,27 +92,29 @@ lorax_options = [
         "*": {
             "noupgrade": False,
             "rootfs_size": 3,
-            "version": "8.0.1905"
+            "version": "8"
         }
     })
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|PowerTools)$", {
+    ("^(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}",
+    "^BaseOS$": "{release_short}-{release_version}-{arch}-{disc_type}{disc_num}{suffix}",
+    ".*": "{release_short}-{release_version}-{arch}-{disc_type}{disc_num}{suffix}",
 }
 
+image_volid_formats = [ '{release_short}-{release_version}-{arch}-{disc_type}', ]
+
 # CREATEISO
 create_optional_isos = False
 
 createiso_skip = [
-    ('^(BaseOS|AppStream|PowerTools|)$', {
+    ('^(BaseOS|AppStream|PowerTools|HighAvailability|CR)$', {
         '*': True,
         'src':True
     }),
@@ -136,6 +135,8 @@ variant_as_lookaside = [
     ('AppStream', 'BaseOS'),
     ('PowerTools', 'BaseOS'),
     ('PowerTools', 'AppStream'),
+    ('HighAvailability', 'BaseOS'),
+    ('HighAvailability', 'AppStream'),
 ]
 
 productimg = False
diff --git a/images.conf b/images.conf
index f52cfc0..5e613bd 100644
--- a/images.conf
+++ b/images.conf
@@ -1,12 +1,38 @@
 image_build = {
-    "^Cloud$": [
+    "^BaseOS$": [
+        {
+            "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": "10",
+                "arches": ["x86_64","ppc64le","aarch64"],
+                "failable": ["ppc64le"],
+                "repo": [
+		     'BaseOS', 
+		     ],
+            },
+            "factory-parameters": {
+                "generate_icicle": False,
+                "docker_cmd": '[ "/bin/bash" ]',
+                "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8-stream"}',
+            }
+        },
         { 
             "image-build": {
                 "format": [("qcow2", "qcow2")],
                 "name": "CentOS-8-GenericCloud",
-                "target": "image-centos-8",
+		"subvariant": "generic",
                 "version": "8.1.1911",
-                "release": None,
+                "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",
@@ -16,7 +42,6 @@ image_build = {
                 "repo": [
 		     'BaseOS', 
 		     'AppStream'],
-                "failable": ["ppc64le","aarch64"],
             },
             "factory-parameters": {
                 "generate_icicle": False,
@@ -26,19 +51,19 @@ image_build = {
             "image-build": {
                 "format": [("qcow2", "qcow2")],
                 "name": "CentOS-8-ec2",
-                "target": "image-centos-8",
+		"subvariant": "ec2",
                 "version": "8.1.1911",
-                "release": None,
-                "ksurl": "git+https://git.centos.org/forks/davdunc/centos/kickstarts.git?#6f0660635fad0eb2e8d02219c56036d2035b24a3",
+                "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": "10",
-                "arches": ["x86_64"],
+                "arches": ["x86_64", "ppc64le", "aarch64"],
                 "repo": [
 		     'BaseOS', 
 		     'AppStream'],
-                "failable": ["ppc64le","aarch64"],
             },
             "factory-parameters": {
                 "generate_icicle": False,
@@ -48,9 +73,10 @@ image_build = {
             "image-build": {
                 "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')],
                 "name": "CentOS-8-Vagrant",
-                "target": "image-centos-8",
+		"subvariant": "stream-vagrant",
                 "version": "8.1.1911",
-                "release": None,
+                "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",