diff --git a/templates/buildbot/master.cfg.j2 b/templates/buildbot/master.cfg.j2
index cab102f..5beaafc 100644
--- a/templates/buildbot/master.cfg.j2
+++ b/templates/buildbot/master.cfg.j2
@@ -15,7 +15,9 @@ c = BuildmasterConfig = {}
 # The 'workers' list defines the set of recognized workers. Each element is
 # a Worker object, specifying a unique worker name and password.  The same
 # worker name and password must be configured on the worker.
-c['workers'] = [worker.LocalWorker("local-worker")]
+c['workers'] = [
+  worker.LocalWorker("local-worker",max_builds=1)
+]
 
 # 'protocols' contains information about protocols which master will use for
 # communicating with workers. You must define at least 'port' option that workers
@@ -45,10 +47,10 @@ c['schedulers'].append(schedulers.SingleBranchScheduler(
                             name="all",
                             change_filter=util.ChangeFilter(branch='master'),
                             treeStableTimer=None,
-                            builderNames=["covid-videoplattform"]))
+                            builderNames={{buildbot_builders.keys()}}))
 c['schedulers'].append(schedulers.ForceScheduler(
                             name="force",
-                            builderNames=["covid-videoplattform"]))
+                            builderNames={{buildbot_builders.keys()}}))
 
 ####### BUILDERS
 
@@ -56,18 +58,39 @@ c['schedulers'].append(schedulers.ForceScheduler(
 # what steps, and which workers can execute them.  Note that any particular build will
 # only take place on one worker.
 
+c['builders'] = []
+
+{% for builder_name in buildbot_builders.keys() %}
+{% set builder = buildbot_builders[builder_name] %}
 factory = util.BuildFactory()
-{% for repo in buildbot_github_repos %}
-factory.addStep(steps.GitHub(name='{{repo.name}}',repourl='{{repo.repourl}}', mode='incremental',workdir='{{repo.workdir}}', alwaysUseLatest=True))
+
+{% for repo in builder.repos %}
+factory.addStep(steps.GitHub(
+  name='{{repo.name}}',
+  repourl='{{repo.repourl}}',
+  mode='incremental',
+  workdir='{{repo.workdir}}',
+  alwaysUseLatest=True,
+))
+{% endfor %}
+
+{% for cmd in builder.shell_commands %}
+factory.addStep(steps.ShellCommand(
+  name='{{cmd.name}}',
+  command='{{cmd.command}}',
+  workdir='{{cmd.workdir}}',
+))
 {% endfor %}
-#factory.addStep(steps.ShellCommand(command=["trial", "hello"],
-#                                   env={"PYTHONPATH": "."}))
 
-c['builders'] = []
 c['builders'].append(
-    util.BuilderConfig(name="covid-videoplattform",
-      workernames=["local-worker"],
-      factory=factory))
+  util.BuilderConfig(
+    name="{{builder_name}}",
+    workernames=["local-worker"],
+    factory=factory
+  )
+)
+
+{% endfor %}
 
 ####### BUILDBOT SERVICES
 
@@ -100,7 +123,9 @@ c['www'] = dict(
     console_view={},
     grid_view={}
   ),
-  change_hook_dialects={'github': {}},
+  change_hook_dialects={
+    'github': {}
+  },
 )
 
 ####### DB URL