diff --git a/.circleci/config.yml b/.circleci/config.yml
index f67587a52a..53471bf49d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -294,7 +294,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
                 - /^release-.*/
           requires:
             - integrationTests
@@ -307,7 +307,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
                 - /^release-.*/
           requires:
             - integrationTests
diff --git a/.github/issue_template.md b/.github/issue_template.md
index 076c591422..9ff777fac8 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,7 +1,7 @@
 <!-- Have you done the following? -->
 <!--   * read the Code of Conduct? By filing an Issue, you are expected to -->  
 <!--     comply with it, including treating everyone with respect: -->
-<!--     https://github.com/hyperledger/besu/blob/master/CODE_OF_CONDUCT.md -->
+<!--     https://github.com/hyperledger/besu/blob/main/CODE_OF_CONDUCT.md -->
 <!--   * Reproduced the issue in the latest version of the software -->
 <!--   * Read the debugging docs: https://besu.hyperledger.org/en/stable/HowTo/Monitor/Logging/ -->
 <!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Ahyperledger/Besu -->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6e5e1fa16b..9e49f48343 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +1,5 @@
 <!-- Thanks for sending a pull request! Please check out our contribution guidelines: -->
-<!-- https://github.com/hyperledger/besu/blob/master/CONTRIBUTING.md -->
+<!-- https://github.com/hyperledger/besu/blob/main/CONTRIBUTING.md -->
 
 ## PR description
 
diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml
index 10ee71a480..feca74edb8 100644
--- a/.github/workflows/repolinter.yml
+++ b/.github/workflows/repolinter.yml
@@ -21,4 +21,4 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v2
       - name: Lint Repo
-        run: bundle exec /app/bin/repolinter.js --rulesetUrl https://raw.githubusercontent.com/hyperledger-labs/hyperledger-community-management-tools/master/repo_structure/repolint.json --format markdown
+        run: bundle exec /app/bin/repolinter.js --rulesetUrl https://raw.githubusercontent.com/hyperledger-labs/hyperledger-community-management-tools/main/repo_structure/repolint.json --format markdown
diff --git a/build.gradle b/build.gradle
index 5ccb3af135..5a99f1eacb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -713,7 +713,7 @@ task dockerUpload {
   def image = "${imageName}:${dockerBuildVersion}"
   def additionalTags = []
 
-  if (project.hasProperty('branch') && project.property('branch') == 'master') {
+  if (project.hasProperty('branch') && project.property('branch') == 'main') {
     additionalTags.add('develop')
   }
 
diff --git a/ethereum/evmtool/build.gradle b/ethereum/evmtool/build.gradle
index 6b61343496..45209f95ec 100644
--- a/ethereum/evmtool/build.gradle
+++ b/ethereum/evmtool/build.gradle
@@ -120,7 +120,7 @@ task dockerUpload(type: Exec) {
   def cmd = "docker push '${image}'"
   def additionalTags = []
 
-  if (project.hasProperty('branch') && project.property('branch') == 'master') {
+  if (project.hasProperty('branch') && project.property('branch') == 'main') {
     additionalTags.add('develop')
   }