diff --git a/src/cmd-artifact-disk b/src/cmd-artifact-disk
index dbde1453c6..a10b2f0252 100755
--- a/src/cmd-artifact-disk
+++ b/src/cmd-artifact-disk
@@ -14,8 +14,9 @@ import cosalib.vmware as VmwareOVA
 
 
 def get_builder(imgtype, build_root, build="latest", force=False, schema=None):
-    args = [build_root, build]
     kargs = {
+        "build": build,
+        "buildroot": build_root,
         "force": force,
         "schema": schema,
         "variant": imgtype
@@ -23,10 +24,10 @@ def get_builder(imgtype, build_root, build="latest", force=False, schema=None):
 
     if imgtype in QVariants.VARIANTS:
         log.info(f"Target '{imgtype.upper()}' is a Qemu Variant image")
-        return QVariants.QemuVariantImage(*args, **kargs)
+        return QVariants.QemuVariantImage(**kargs)
 
     if imgtype in VmwareOVA.VARIANTS:
-        return VmwareOVA.VmwareOVA(*args, **kargs)
+        return VmwareOVA.VmwareOVA(**kargs)
 
     raise Exception(f"{imgtype} is not supported by this command")
 
diff --git a/src/cosalib/build.py b/src/cosalib/build.py
index 429457708e..c5e47b161c 100644
--- a/src/cosalib/build.py
+++ b/src/cosalib/build.py
@@ -57,13 +57,11 @@ class _Build:
       - _build_artifacts(*args, **kwargs)
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         """
         init loads the builds.json which lists the builds, loads the relevant
         meta-data from JSON and finally, locates the build artifacts.
 
-        :param args: All non-keyword arguments
-        :type args: list
         :param kwargs: All keyword arguments
         :type kwargs: dict
         :raises: BuildError
diff --git a/src/cosalib/qemuvariants.py b/src/cosalib/qemuvariants.py
index 58302df450..352a9fb5da 100644
--- a/src/cosalib/qemuvariants.py
+++ b/src/cosalib/qemuvariants.py
@@ -125,8 +125,8 @@ def get_qemu_variant(variant, parser, kwargs={}):
     """
     log.debug(f"returning QemuVariantImage for {variant}")
     return QemuVariantImage(
-        parser.buildroot,
-        parser.build,
+        buildroot=parser.buildroot,
+        build=parser.build,
         schema=parser.schema,
         variant=variant,
         force=parser.force,
@@ -134,7 +134,7 @@ def get_qemu_variant(variant, parser, kwargs={}):
 
 
 class QemuVariantImage(_Build):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         """
         This takes all the regular _BuildClass arguments. In kwargs, the
         additional arguments are used:
@@ -164,7 +164,7 @@ def __init__(self, *args, **kwargs):
         self.platform_image_name = kwargs.get(
             "platform_image_name", self.platform)
 
-        _Build.__init__(self, *args, **kwargs)
+        _Build.__init__(self, **kwargs)
 
     @property
     def image_qemu(self):
diff --git a/src/cosalib/vmware.py b/src/cosalib/vmware.py
index e9df1f4dfa..1b3b638c7d 100644
--- a/src/cosalib/vmware.py
+++ b/src/cosalib/vmware.py
@@ -52,10 +52,10 @@ class VmwareOVA(QemuVariantImage):
     https://www.dmtf.org/sites/default/files/standards/documents/DSP0243_1.1.0.pdf
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         variant = kwargs.pop("variant", "vmware")
         kwargs.update(VARIANTS.get(variant, {}))
-        QemuVariantImage.__init__(self, *args, **kwargs)
+        QemuVariantImage.__init__(self, **kwargs)
         # Set the QemuVariant mutate_callback so that OVA is called.
         self.mutate_callback = self.write_ova
         # Ensure that coreos.ovf is included in the tar