diff --git a/templates/buildbot/master.cfg.j2 b/templates/buildbot/master.cfg.j2
index f6ae44b..bfcb678 100644
--- a/templates/buildbot/master.cfg.j2
+++ b/templates/buildbot/master.cfg.j2
@@ -5,15 +5,38 @@ from buildbot.plugins import *
 c = BuildmasterConfig = {}
 
 c['workers'] = []
-c['workers'].append(worker.LocalWorker("local-worker"))
+c['change_source'] = []
+c['schedulers'] = []
+c['builders'] = []
+c['services'] = []
 
 c['protocols'] = {'pb': {'port': 9989}}
 
-c['change_source'] = []
+c['title'] = "buildbot title"
+c['titleURL'] = "https://github.com/covid-videoplattform"
 
-c['schedulers'] = []
+c['buildbotURL'] = "https://{{buildbot_server_name}}/"
 
-c['builders'] = []
+c['www'] = dict(
+  port=8010,
+  plugins = dict(
+    waterfall_view={},
+    console_view={},
+    grid_view={},
+    badges={"left_pad": 0, "right_pad": 0, "border_radius": 3, "style": "badgeio"},
+  ),
+  change_hook_dialects={
+    'github': {}
+  },
+)
+
+c['db'] = {
+  'db_url' : "{{buildbot_database_url}}",
+}
+
+
+# Local Worker
+c['workers'].append(worker.LocalWorker("local-worker"))
 
 # Hello World Example
 {% if buildbot_hello_world_example %}
@@ -84,27 +107,3 @@ c['schedulers'].append(schedulers.SingleBranchScheduler(
                             builderNames=['{{builder_name}}']))
 
 {% endfor %}
-
-c['services'] = []
-
-c['title'] = "buildbot title"
-c['titleURL'] = "https://github.com/covid-videoplattform"
-
-c['buildbotURL'] = "https://{{buildbot_server_name}}/"
-
-c['www'] = dict(
-  port=8010,
-  plugins = dict(
-    waterfall_view={},
-    console_view={},
-    grid_view={},
-    badges={"left_pad": 0, "right_pad": 0, "border_radius": 3, "style": "badgeio"},
-  ),
-  change_hook_dialects={
-    'github': {}
-  },
-)
-
-c['db'] = {
-  'db_url' : "{{buildbot_database_url}}",
-}