diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 31e7b17d..8f43882b 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -6,10 +6,10 @@ name: CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   build:
@@ -53,7 +53,7 @@ jobs:
         verbose: true
 
   snapshot:
-    if: github.repository == 'project-ncl/gradle-manipulator' && github.event_name == 'push' && github.ref == 'refs/heads/master'
+    if: github.repository == 'project-ncl/gradle-manipulator' && github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8b9c37ef..248ae24f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -204,7 +204,7 @@ See [this](https://docs.gradle.org/current/userguide/signing_plugin.html) for mo
 
 #### Release command
 
-The plugins can be released using the following command (from the master branch of the repository):
+The plugins can be released using the following command (from the main branch of the repository):
 
     # Optional command: ./gradlew clean
 
diff --git a/README.md b/README.md
index 29e1edf3..7ec0cdc6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status (Travis CI)](https://travis-ci.org/project-ncl/gradle-manipulator.svg?branch=master)](https://travis-ci.org/project-ncl/gradle-manipulator.svg?branch=master)
+[![Build Status (Travis CI)](https://travis-ci.org/project-ncl/gradle-manipulator.svg?branch=main)](https://travis-ci.org/project-ncl/gradle-manipulator.svg?branch=main)
 
 # Table of Contents
 
@@ -34,7 +34,7 @@ modifies the project to use those dependencies and project version.
 
 ## Contributions
 
-Contributions are more than welcome! Before contributing to the project, please read [this](https://github.com/project-ncl/gradle-manipulator/blob/master/CONTRIBUTING.md). To contribute sample Groovy scripts (for this project or the sibling PME project) please see the [Groovy Examples](https://github.com/project-ncl/manipulator-groovy-examples) project.
+Contributions are more than welcome! Before contributing to the project, please read [this](https://github.com/project-ncl/gradle-manipulator/blob/main/CONTRIBUTING.md). To contribute sample Groovy scripts (for this project or the sibling PME project) please see the [Groovy Examples](https://github.com/project-ncl/manipulator-groovy-examples) project.
 
 ## Documentation
 
diff --git a/analyzer/build.gradle.kts b/analyzer/build.gradle.kts
index 8c5d671f..23309781 100644
--- a/analyzer/build.gradle.kts
+++ b/analyzer/build.gradle.kts
@@ -2,7 +2,7 @@ group = "org.jboss.gm"
 
 pluginBundle {
     website = "https://project-ncl.github.io/gradle-manipulator/"
-    vcsUrl = "https://github.com/project-ncl/gradle-manipulator/tree/master/analyzer"
+    vcsUrl = "https://github.com/project-ncl/gradle-manipulator/tree/main/analyzer"
     tags = listOf("versions", "alignment")
 }
 
diff --git a/analyzer/src/functTest/resources/dynamic-project-with-locks/dotgit/config b/analyzer/src/functTest/resources/dynamic-project-with-locks/dotgit/config
index 43ef5dd3..c77f9b44 100644
--- a/analyzer/src/functTest/resources/dynamic-project-with-locks/dotgit/config
+++ b/analyzer/src/functTest/resources/dynamic-project-with-locks/dotgit/config
@@ -6,6 +6,3 @@
 [remote "origin"]
         url = http://some.repository.example.com/maybe-gerrit/undertow-io/undertow.git
         fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "master"]
-        remote = origin
-        merge = refs/heads/master
diff --git a/build.gradle.kts b/build.gradle.kts
index 73c4e9e5..09894f09 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -135,7 +135,7 @@ tasks.register("fixupReadme") {
     }
 }
 
-// In https://github.com/researchgate/gradle-release/blob/master/src/main/groovy/net/researchgate/release/ReleasePlugin.groovy#L116,
+// In https://github.com/researchgate/gradle-release/blob/main/src/main/groovy/net/researchgate/release/ReleasePlugin.groovy#L116,
 // the list of task interdependencies is specified. However, as per https://github.com/researchgate/gradle-release/issues/298,
 // we want to ensure the tag is done before the build so the manifest (etc.) points to the correct SHA. As the beforeReleaseBuild
 // then runs at the wrong point with this change, we manually inject a task (fixupReadme) below.
@@ -314,7 +314,7 @@ subprojects {
          * https://imperceptiblethoughts.com/shadow/plugins/
          *
          * Another great source of information is the configuration of the shadow plugin itself:
-         * https://github.com/johnrengelman/shadow/blob/master/build.gradle
+         * https://github.com/johnrengelman/shadow/blob/main/build.gradle
          */
         apply(plugin = "com.github.johnrengelman.shadow")
 
diff --git a/manipulation/build.gradle.kts b/manipulation/build.gradle.kts
index 873e70f9..476d0b06 100644
--- a/manipulation/build.gradle.kts
+++ b/manipulation/build.gradle.kts
@@ -2,7 +2,7 @@ group = "org.jboss.gm"
 
 pluginBundle {
     website = "https://project-ncl.github.io/gradle-manipulator/"
-    vcsUrl = "https://github.com/project-ncl/gradle-manipulator/tree/master/manipulation/tree/master/analyzer"
+    vcsUrl = "https://github.com/project-ncl/gradle-manipulator/tree/main/manipulation/tree/main/analyzer"
     tags = listOf("versions", "manipulation")
 }
 
diff --git a/manipulation/src/functTest/resources/elasticsearch/build.gradle b/manipulation/src/functTest/resources/elasticsearch/build.gradle
index 2742c0cb..4c1a732f 100644
--- a/manipulation/src/functTest/resources/elasticsearch/build.gradle
+++ b/manipulation/src/functTest/resources/elasticsearch/build.gradle
@@ -46,7 +46,7 @@ BuildPlugin.configureRepositories(project)
 
 String licenseCommit
 if (VersionProperties.elasticsearch.toString().endsWith('-SNAPSHOT')) {
-  licenseCommit = scminfo.change ?: "master" // leniency for non git builds
+  licenseCommit = scminfo.change ?: "main" // leniency for non git builds
 } else {
   licenseCommit = "v${version}"
 }