diff --git a/c8-stream.conf b/c8-stream.conf
index e0e57dc..34824ec 100644
--- a/c8-stream.conf
+++ b/c8-stream.conf
@@ -1,12 +1,11 @@
 from multilib import *
 from include-excludes import *
-#from images import *
+from images import *
 from version import *
 
 # PRODUCT INFO 
 release_name = "CentOS Stream" 
 release_short = "CentOS"
-release_type = "updates"
 release_version = "Stream"
 release_is_layered = False
 version = "8"
@@ -25,7 +24,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': '.',
 }
 
@@ -36,7 +35,7 @@ multilib = [
 ]
 
 variants_file = 'variants.xml'
-sigkeys = ['8483C65D']
+sigkeys = [None]
 hashed_directories = False
 
 tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
@@ -81,7 +80,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-stream:centos-stream:8,CentOS Stream 8', '--revision=8.1.1911']
 
 # CHECKSUMS
 media_checksums = ['sha256']
@@ -97,7 +96,7 @@ lorax_options = [
         "*": {
             "noupgrade": False,
             "rootfs_size": 3,
-            "version": "8.0.1905"
+            "version": "8-stream"
         }
     })
 ]
@@ -113,6 +112,8 @@ image_name_format = {
     ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
 }
 
+image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ]
+
 # CREATEISO
 create_optional_isos = False
 
diff --git a/images.conf b/images.conf
index b5fc1d7..f52cfc0 100644
--- a/images.conf
+++ b/images.conf
@@ -1,68 +1,3 @@
-from multilib import * 
-from include-excludes 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']
-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$": [
         { 
@@ -70,7 +5,8 @@ image_build = {
                 "format": [("qcow2", "qcow2")],
                 "name": "CentOS-8-GenericCloud",
                 "target": "image-centos-8",
-                "version": "8.0.1905",
+                "version": "8.1.1911",
+                "release": None,
                 "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD",
                 "kickstart": "CentOS-8-GenericCloud.ks",
                 "ksversion": "F26",
@@ -78,9 +14,8 @@ image_build = {
                 "disk-size": "10",
                 "arches": ["x86_64","ppc64le","aarch64"],
                 "repo": [
-		     'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', 
-		     'http://mirror.centos.org/centos/8.0.1905/AppStream/$arch/kickstart'],
-		"install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart',
+		     'BaseOS', 
+		     'AppStream'],
                 "failable": ["ppc64le","aarch64"],
             },
             "factory-parameters": {
@@ -92,7 +27,8 @@ image_build = {
                 "format": [("qcow2", "qcow2")],
                 "name": "CentOS-8-ec2",
                 "target": "image-centos-8",
-                "version": "8.0.1905",
+                "version": "8.1.1911",
+                "release": None,
                 "ksurl": "git+https://git.centos.org/forks/davdunc/centos/kickstarts.git?#6f0660635fad0eb2e8d02219c56036d2035b24a3",
                 "kickstart": "CentOS-8-EC2.ks",
                 "ksversion": "F26",
@@ -100,9 +36,8 @@ image_build = {
                 "disk-size": "10",
                 "arches": ["x86_64"],
                 "repo": [
-		     'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', 
-		     'http://mirror.centos.org/centos/8.0.1905/AppStream/$arch/kickstart'],
-		"install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart',
+		     'BaseOS', 
+		     'AppStream'],
                 "failable": ["ppc64le","aarch64"],
             },
             "factory-parameters": {
@@ -114,7 +49,8 @@ image_build = {
                 "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')],
                 "name": "CentOS-8-Vagrant",
                 "target": "image-centos-8",
-                "version": "8.0.1905",
+                "version": "8.1.1911",
+                "release": None,
                 "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
                 "kickstart": "CentOS-8-x86_64-Vagrant.ks",
                 "ksversion": "F26",
@@ -122,9 +58,8 @@ image_build = {
                 "disk-size": "10",
                 "arches": ["x86_64"],
                 "repo": [
-		     'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart',
-		     'http://mirror.centos.org/centos/8.0.1905/AppStream/$arch/kickstart'],
-		"install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart',
+		     'BaseOS',
+		     'AppStream'],
                 "failable": ["ppc64le","aarch64"],
             },
             "factory-parameters": {
diff --git a/variants.xml b/variants.xml
index bb371a1..1f0304e 100644
--- a/variants.xml
+++ b/variants.xml
@@ -38,6 +38,7 @@
       <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>
@@ -170,12 +171,15 @@
       <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>
@@ -185,6 +189,7 @@
       <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>
@@ -198,8 +203,8 @@
 
   </variant>
 
-  <variant id="PowerTools" name="CentOS PowerTools" type="variant">
-    <!-- List of architectures for Devel compose variant -->
+  <variant id="PowerTools" name="PowerTools" type="variant">
+    <!-- List of architectures for Powertools compose variant -->
     <arches>
       <arch>aarch64</arch>
       <arch>ppc64le</arch>
@@ -215,13 +220,29 @@
       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>
-  <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
+
+
+  <!-- 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>
-  </variant>
+    <groups>
+      <group default="true">ha</group>
+      <group default="true">ha-devel</group>
+    </groups>
+  </variant> -->
+
+
+  <!-- Integrated Layered Products (Defined as variants in RHEL-8) -->
 </variants>