diff --git a/roles/buildbot/files/packages.py b/roles/buildbot/files/packages.py
index a9760c0..5680d92 100644
--- a/roles/buildbot/files/packages.py
+++ b/roles/buildbot/files/packages.py
@@ -32,7 +32,7 @@ def packagesConfig(c, config):
                         name="branch",
                         label="git branch",
                         choices=config["packages_branches"],
-                        default="master",
+                        default=config["packages_branches"][0],
                         strict=True,
                     ),
                     revision=util.FixedParameter(name="revision", default=""),
@@ -101,7 +101,7 @@ def archTriggerStep(arch):
 @util.renderer
 def branchToFalterBranch(props):
     o2f = {
-        "master": "snapshot",
+        "main": "snapshot",
         "openwrt-23.05": "1.4.0-snapshot",
         "openwrt-22.03": "1.3.0-snapshot",
         "openwrt-21.02": "1.2.3-snapshot",
diff --git a/roles/buildbot/templates/config.py.j2 b/roles/buildbot/templates/config.py.j2
index 312f432..c394fb5 100644
--- a/roles/buildbot/templates/config.py.j2
+++ b/roles/buildbot/templates/config.py.j2
@@ -34,13 +34,13 @@ config = {
 
     # Repository-URL for the builter script.
     'builter_repo': 'https://github.com/freifunk-berlin/falter-builter.git',
-    'builter_branches': ['master', 'testbuildbot'],
+    'builter_branches': ['main', 'testbuildbot'],
     'builter_releaseBranches': ['snapshot', '1.4.0-snapshot', '1.3.0-snapshot', '1.2.3-snapshot', 'testbuildbot'],
 
     # URL for the packages repo. The branches map to the branches selectable
     # in the force scheduler
     'packages_repo': 'https://github.com/freifunk-berlin/falter-packages.git',
-    'packages_branches': ['master','openwrt-23.05','openwrt-22.03','openwrt-21.02','testbuildbot'],
+    'packages_branches': ['main','openwrt-23.05','openwrt-22.03','openwrt-21.02','testbuildbot'],
 
     # Version of the Alpine Linux container: edge, 3.17, 3.16, ...
     'alpineVersion': '3.18',