diff --git a/conf/defaults.config b/conf/defaults.config
index 191abeb6f9..88ba64f2f9 100644
--- a/conf/defaults.config
+++ b/conf/defaults.config
@@ -145,9 +145,9 @@ $courseURLs{feedbackFormURL} = "";
 $enableGitUpgradeNotifier = 0;
 
 $gitWeBWorKRemoteName = "origin";
-$gitWeBWorKBranchName = "master";
+$gitWeBWorKBranchName = "main";
 $gitPGRemoteName = "origin";
-$gitPGBranchName = "master";
+$gitPGBranchName = "main";
 $gitLibraryRemoteName = "origin";
 $gitLibraryBranchName = "master";
 
diff --git a/conf/localOverrides.conf.dist b/conf/localOverrides.conf.dist
index 61c6e2f056..da1c93399b 100644
--- a/conf/localOverrides.conf.dist
+++ b/conf/localOverrides.conf.dist
@@ -70,9 +70,9 @@ $mail{feedbackRecipients}    = [
 #$enableGitUpgradeNotifier = 1;
 
 #$gitWeBWorKRemoteName = "origin";
-#$gitWeBWorKBranchName = "master";
+#$gitWeBWorKBranchName = "main";
 #$gitPGRemoteName = "origin";
-#$gitPGBranchName = "master";
+#$gitPGBranchName = "main";
 #$gitLibraryRemoteName = "origin";
 #$gitLibraryBranchName = "master";