diff --git a/c8.conf b/c8.conf
index f110335..0577e01 100644
--- a/c8.conf
+++ b/c8.conf
@@ -1,12 +1,13 @@
 from multilib import *
 from include-excludes import *
-from images import *
+from version import *
 
 # PRODUCT INFO 
 release_name = "CentOS Linux" 
 release_short = "CentOS"
 release_version = "8"
 release_is_layered = False
+version = "8"
 
 # GENERAL SETTINGS
 bootable = True
@@ -75,7 +76,9 @@ createrepo_database = True
 createrepo_c = True
 createrepo_checksum = "sha256"
 createrepo_use_xz = True
-createrepo_extra_args = ['--distro=cpeid,distrotag']
+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']
@@ -90,7 +93,8 @@ lorax_options = [
     ("^.*$", {
         "*": {
             "noupgrade": False,
-            "rootfs_size": 3
+            "rootfs_size": 3,
+            "version": "8.0.1905"
         }
     })
 ]
@@ -102,8 +106,8 @@ buildinstall_skip = [
 ]
 
 image_name_format = {
-    "^BaseOS$": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
-    ".*": "{compose_id}-{variant}-{arch}-{disc_type}{disc_num}{suffix}",
+    "^BaseOS$": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
+    ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
 }
 
 # CREATEISO
@@ -119,7 +123,7 @@ createiso_skip = [
 extra_isos = {
     "BaseOS": [{
         "include_variants": ["AppStream"],
-        "filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
+        "filename": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
         "skip_src": True,
     }]
 }