diff --git a/src/pylorax/api/compose.py b/src/pylorax/api/compose.py
index 3df6f36b..ff35e6a3 100644
--- a/src/pylorax/api/compose.py
+++ b/src/pylorax/api/compose.py
@@ -217,9 +217,8 @@ def start_build(cfg, dnflock, gitlock, branch, recipe_name, compose_type, test_m
         "compression":      "xz",
         "compress_args":    [],
         "ks":               [ks_path],
-        "project":          "Red Hat Enterprise Linux",
-        "releasever":       "7",
-        "logfile":          log_dir
+        "logfile":          log_dir,
+        "timeout":          60,                     # 60 minute timeout
     })
     with open(joinpaths(results_dir, "config.toml"), "w") as f:
         f.write(toml.dumps(cfg_args))
@@ -262,11 +261,12 @@ def compose_args(compose_type):
                                  "make_tar":                True,
                                  "make_pxe_live":           False,
                                  "make_ostree_live":        False,
+                                 "make_oci":                False,
                                  "ostree":                  False,
                                  "live_rootfs_keep_size":   False,
                                  "live_rootfs_size":        0,
-                                 "qcow2":                   False,
-                                 "qcow2_args":              [],
+                                 "image_type":              False,          # False instead of None because of TOML
+                                 "qemu_args":               [],
                                  "image_name":              default_image_name("xz", "root.tar"),
                                  "image_only":              True,
                                  "app_name":                None,
@@ -281,11 +281,12 @@ def compose_args(compose_type):
                                  "make_tar":                False,
                                  "make_pxe_live":           False,
                                  "make_ostree_live":        False,
+                                 "make_oci":                False,
                                  "ostree":                  False,
                                  "live_rootfs_keep_size":   False,
                                  "live_rootfs_size":        0,
-                                 "qcow2":                   False,
-                                 "qcow2_args":              [],
+                                 "image_type":              False,          # False instead of None because of TOML
+                                 "qemu_args":               [],
                                  "image_name":              "live.iso",
                                  "fs_label":                "Anaconda",     # Live booting may expect this to be 'Anaconda'
                                  "image_only":              False,
@@ -301,11 +302,12 @@ def compose_args(compose_type):
                                  "make_tar":                False,
                                  "make_pxe_live":           False,
                                  "make_ostree_live":        False,
-                                  "ostree":                  False,
+                                 "make_oci":                False,
+                                 "ostree":                  False,
                                  "live_rootfs_keep_size":   False,
                                  "live_rootfs_size":        0,
-                                 "qcow2":                   False,
-                                 "qcow2_args":              [],
+                                 "image_type":              False,          # False instead of None because of TOML
+                                 "qemu_args":               [],
                                  "image_name":              "disk.img",
                                  "fs_label":                "",
                                  "image_only":              True,
@@ -321,11 +323,12 @@ def compose_args(compose_type):
                                  "make_tar":                False,
                                  "make_pxe_live":           False,
                                  "make_ostree_live":        False,
-                                  "ostree":                  False,
+                                 "make_oci":                False,
+                                 "ostree":                  False,
                                  "live_rootfs_keep_size":   False,
                                  "live_rootfs_size":        0,
-                                 "qcow2":                   True,
-                                 "qcow2_args":              [],
+                                 "image_type":              "qcow2",
+                                 "qemu_args":               [],
                                  "image_name":              "disk.qcow2",
                                  "fs_label":                "",
                                  "image_only":              True,
@@ -341,11 +344,12 @@ def compose_args(compose_type):
                                  "make_tar":                False,
                                  "make_pxe_live":           False,
                                  "make_ostree_live":        False,
+                                 "make_oci":                False,
                                  "ostree":                  False,
                                  "live_rootfs_keep_size":   False,
                                  "live_rootfs_size":        0,
-                                 "qcow2":                   False,
-                                 "qcow2_args":              [],
+                                 "image_type":              False,          # False instead of None because of TOML
+                                 "qemu_args":               [],
                                  "image_name":              "filesystem.img",
                                  "fs_label":                "",
                                  "image_only":              True,