diff --git a/templates/buildbot/master.cfg.j2 b/templates/buildbot/master.cfg.j2
index 5beaafc..e786d90 100644
--- a/templates/buildbot/master.cfg.j2
+++ b/templates/buildbot/master.cfg.j2
@@ -43,14 +43,6 @@ c['change_source'] = []
 # case, just kick off a 'runtests' build
 
 c['schedulers'] = []
-c['schedulers'].append(schedulers.SingleBranchScheduler(
-                            name="all",
-                            change_filter=util.ChangeFilter(branch='master'),
-                            treeStableTimer=None,
-                            builderNames={{buildbot_builders.keys()}}))
-c['schedulers'].append(schedulers.ForceScheduler(
-                            name="force",
-                            builderNames={{buildbot_builders.keys()}}))
 
 ####### BUILDERS
 
@@ -90,6 +82,12 @@ c['builders'].append(
   )
 )
 
+c['schedulers'].append(schedulers.SingleBranchScheduler(
+                            name="{{builder_name}}",
+                            change_filter=util.ChangeFilter(branch='master'),
+                            treeStableTimer=None,
+                            builderNames=['{{builder_name}}']))
+
 {% endfor %}
 
 ####### BUILDBOT SERVICES