diff --git a/rida/scheduler/handlers/components.py b/rida/scheduler/handlers/components.py
index d391e584..bec41007 100644
--- a/rida/scheduler/handlers/components.py
+++ b/rida/scheduler/handlers/components.py
@@ -70,7 +70,8 @@ def _finalize(config, session, msg, state):
         # And install the macros.
         module_name = parent.name
         tag = parent.koji_tag
-        builder = rida.builder.KojiModuleBuilder(module_name, config, tag_name=tag)
+        builder = rida.builder.Builder(module_name, 'koji', config,
+                                       tag_name=tag)
         builder.buildroot_connect()
         # tag && add to srpm-build group
         nvr = "{}-{}-{}".format(msg.build_name, msg.build_version,
diff --git a/rida/scheduler/handlers/modules.py b/rida/scheduler/handlers/modules.py
index d23f56ab..497ff13d 100644
--- a/rida/scheduler/handlers/modules.py
+++ b/rida/scheduler/handlers/modules.py
@@ -118,7 +118,7 @@ def wait(config, session, msg):
     log.debug("Assigning koji tag=%s to module build" % tag)
     build.koji_tag = tag
 
-    builder = rida.builder.KojiModuleBuilder(build.name, config, tag_name=tag)
+    builder = rida.builder.Builder(build.name, 'koji', config, tag_name=tag)
     build.buildroot_task_id = builder.buildroot_connect()
     log.debug("Adding dependencies %s into buildroot for module %s" % (dependencies, module_info))
     builder.buildroot_add_repos(dependencies)
diff --git a/rida/scheduler/handlers/repos.py b/rida/scheduler/handlers/repos.py
index da6f8e45..eaeec56a 100644
--- a/rida/scheduler/handlers/repos.py
+++ b/rida/scheduler/handlers/repos.py
@@ -75,7 +75,8 @@ def done(config, session, msg):
         log.warn("Odd!  All components in batch failed for %r." % module_build)
         return
 
-    builder = rida.builder.KojiModuleBuilder(module_build.name, config, tag_name=tag)
+    builder = rida.builder.Builder(module_build.name, 'koji', config,
+                                   tag_name=tag)
     builder.buildroot_connect()
 
     # Ok, for the subset of builds that did complete successfully, check to