diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index af774a8c..43b55d25 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -41,8 +41,8 @@ added after the original pull request but before a merge.
   than cosmetic changes).
 * Add some Javadocs and, if you change the namespace, some XSD doc elements.
 * A few unit tests would help a lot as well -- someone has to do it.
-* If no-one else is using your branch, please rebase it against the current master (or
-  other target branch in the main project).
+* If no-one else is using your branch, please rebase it against the current `main` (or
+  other target branch in the original project).
 * When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
   if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
   message (where XXXX is the issue number).
diff --git a/README.adoc b/README.adoc
index a3a90df0..72fd382a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,7 +1,7 @@
 = Spring Initializr image:https://ci.spring.io/api/v1/teams/initializr/pipelines/initializr/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/initializr/pipelines/initializr?groups=Build"] image:https://badges.gitter.im/spring-io/initializr.svg[link="https://gitter.im/spring-io/initializr?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 
 :boot-doc: https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle
-:code: https://github.com/spring-io/initializr/blob/master
+:code: https://github.com/spring-io/initializr/blob/main
 :docs: https://docs.spring.io/initializr/docs/current-SNAPSHOT/reference
 :service: https://github.com/spring-io/start.spring.io
 
diff --git a/ci/parameters.yml b/ci/parameters.yml
index 2279e6bd..71f5b1fc 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -2,7 +2,7 @@ github-repo: "https://github.com/spring-io/initializr.git"
 github-repo-name: "spring-io/initializr"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "master"
+branch: "main"
 milestone: "0.11.x"
 build-name: "initializr"
 concourse-url: "https://ci.spring.io"
diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge
index 4dd24d53..50826cc7 100755
--- a/git/hooks/prepare-forward-merge
+++ b/git/hooks/prepare-forward-merge
@@ -4,7 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'
 
-$master_branch = "0.11.x"
+$main_branch = "0.11.x"
 
 $log = Logger.new(STDOUT)
 $log.level = Logger::WARN
@@ -26,8 +26,8 @@ end
 
 def rewrite_message(message_file, fixed)
   current_branch = `git rev-parse --abbrev-ref HEAD`.strip
-  if current_branch == "master"
-    current_branch = $master_branch
+  if current_branch == "main"
+    current_branch = $main_branch
   end
   rewritten_message = ""
   message = File.read(message_file)
diff --git a/initializr-docs/pom.xml b/initializr-docs/pom.xml
index 56acfb9a..ed584212 100644
--- a/initializr-docs/pom.xml
+++ b/initializr-docs/pom.xml
@@ -319,7 +319,7 @@
 											<lowercase />
 										</stringutil>
 										<var name="github-tag" value="v${project.version}" />
-										<propertyregex property="github-tag" override="true" input="${github-tag}" regexp=".*SNAPSHOT" replace="master" />
+										<propertyregex property="github-tag" override="true" input="${github-tag}" regexp=".*SNAPSHOT" replace="main" />
 									</target>
 								</configuration>
 							</execution>
diff --git a/initializr-docs/src/main/asciidoc/index.adoc b/initializr-docs/src/main/asciidoc/index.adoc
index 8e92ed51..ef34da9d 100644
--- a/initializr-docs/src/main/asciidoc/index.adoc
+++ b/initializr-docs/src/main/asciidoc/index.adoc
@@ -16,12 +16,12 @@ Stéphane Nicoll; Dave Syer; Madhura Bhave
 :code-examples: {sources-root}/main/java/io/spring/initializr
 :test-examples: {sources-root}/test/java/io/spring/initializr
 :initializr-repo: snapshot
-:github-tag: master
+:github-tag: main
 :github-repo: spring-io/initializr
 :github-raw: https://raw.github.com/{github-repo}/{github-tag}
 :github-code: https://github.com/{github-repo}/tree/{github-tag}
 :github-wiki: https://github.com/{github-repo}/wiki
-:github-master-code: https://github.com/{github-repo}/tree/master
+:github-main-code: https://github.com/{github-repo}/tree/main
 :sc-initializr-generator: {github-code}/initializr-generator/src/main/java/io/spring/initializr
 :spring-initializr-docs-version: current
 :spring-initializr-docs: https://docs.spring.io/initializr/docs/{spring-initializr-docs-version}/reference