diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index afab1f42a9..bceac66505 100755
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -49,7 +49,7 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * Verification tasks, including tests and Checkstyle, can be executed by running `./gradlew check` from the project root.
   Note that `SPRING_PROFILES_ACTIVE` environment variable might affect the result of tests, so in that case, you can prevent it by running `unset SPRING_PROFILES_ACTIVE` before running the task.
-* 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 branch (or other target branch in the project).
 * When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions].
 
 
diff --git a/ci/parameters.yml b/ci/parameters.yml
index 997cfdfefe..827292f877 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -6,7 +6,7 @@ github-repo-name: "spring-projects/spring-boot"
 homebrew-tap-repo: "https://github.com/spring-io/homebrew-tap.git"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "master"
+branch: "main"
 milestone: "2.5.x"
 build-name: "spring-boot"
 concourse-url: "https://ci.spring.io"
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
index 5b365a9bc0..82665fb8c1 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
@@ -12,7 +12,7 @@
 :chomp: tags formatters headers packages
 
 :spring-boot-artifactory-repo: snapshot
-:github-tag: master
+:github-tag: main
 :spring-boot-version: current
 
 :github-repo: spring-projects/spring-boot
@@ -28,7 +28,7 @@
 :spring-boot-code: https://github.com/{github-repo}/tree/{github-tag}
 :spring-boot-api: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/api
 :spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference
-:spring-boot-master-code: https://github.com/{github-repo}/tree/master
+:spring-boot-latest-code: https://github.com/{github-repo}/tree/main
 :spring-boot-current-docs: https://docs.spring.io/spring-boot/docs/current/reference/
 :spring-boot-actuator-restapi-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/actuator-api/htmlsingle
 :spring-boot-actuator-restapi-pdfdocs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/actuator-api/pdf/spring-boot-actuator-web-api.pdf
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc
index 29dbaa383d..6c4a66e6b9 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc
@@ -155,7 +155,7 @@ include::starters/technical-starters.adoc[]
 
 To learn how to swap technical facets, please see the how-to documentation for <<howto.adoc#howto-use-another-web-server, swapping web server>> and <<howto.adoc#howto-configure-log4j-for-logging, logging system>>.
 
-TIP: For a list of additional community contributed starters, see the {spring-boot-master-code}/spring-boot-project/spring-boot-starters/README.adoc[README file] in the `spring-boot-starters` module on GitHub.
+TIP: For a list of additional community contributed starters, see the {spring-boot-latest-code}/spring-boot-project/spring-boot-starters/README.adoc[README file] in the `spring-boot-starters` module on GitHub.