diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index dc0794ae8..e2327ae41 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -11,18 +11,18 @@ Resolves #ISSUE_NUMBER
 ### Before the change?
 <!-- Please describe the current behavior that you are modifying. -->
 
-* 
+*
 
 ### After the change?
 <!-- Please describe the behavior or changes that are being added by this PR. -->
 
-* 
+*
 
 
 ### Other information
 <!-- Any other information that is important to this PR  -->
 
-* 
+*
 
 ----
 
@@ -36,20 +36,20 @@ Resolves #ISSUE_NUMBER
 ### Does this introduce a breaking change?
 <!-- If this introduces a breaking change make sure to note it here any what the impact might be -->
 
-Please see our docs on [breaking changes](https://github.com/octokit/.github/blob/master/community/breaking_changes.md) to help!
+Please see our docs on [breaking changes](https://github.com/octokit/.github/blob/main/community/breaking_changes.md) to help!
 
 - [ ] Yes (Please add the `Type: Breaking change` label)
 - [ ] No
 
-If `Yes`, what's the impact:  
+If `Yes`, what's the impact:
 
 * N/A
 
 
 ### Pull request type
 
-<!-- Please do not submit updates to dependencies unless it fixes an issue. --> 
-<!-- Please try to limit your pull request to one type, submit multiple pull requests if needed. --> 
+<!-- Please do not submit updates to dependencies unless it fixes an issue. -->
+<!-- Please try to limit your pull request to one type, submit multiple pull requests if needed. -->
 
 Please add the corresponding label for change this PR introduces:
 - Bugfix: `Type: Bug`
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5adc2c6ca..863c6d897 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "main" ]
   schedule:
     - cron: '30 23 * * 2'
 
@@ -48,11 +48,11 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-        
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -61,7 +61,7 @@ jobs:
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2e284b451..2baeb85c3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 "on":
   push:
     branches:
-      - master
+      - main
       - next
       - beta
       - "*.x"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6bd60b939..315be2db8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: Test
 "on":
   push:
     branches:
-      - master
+      - main
   pull_request:
     types:
       - opened
diff --git a/README.md b/README.md
index b03db1031..3cc51419b 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 > Extendable client for GitHub's REST & GraphQL APIs
 
 [![@latest](https://img.shields.io/npm/v/@octokit/core.svg)](https://www.npmjs.com/package/@octokit/core)
-[![Build Status](https://github.com/octokit/core.js/workflows/Test/badge.svg)](https://github.com/octokit/core.js/actions?query=workflow%3ATest+branch%3Amaster)
+[![Build Status](https://github.com/octokit/core.js/workflows/Test/badge.svg)](https://github.com/octokit/core.js/actions?query=workflow%3ATest+branch%3Amain)
 
 <!-- toc -->
 
@@ -33,10 +33,10 @@ If you don't need the Plugin API then using [`@octokit/request`](https://github.
 Browsers
 </th><td width=100%>
 Load <code>@octokit/core</code> directly from <a href="https://cdn.skypack.dev">cdn.skypack.dev</a>
-        
+
 ```html
 <script type="module">
-import { Octokit } from "https://cdn.skypack.dev/@octokit/core";
+  import { Octokit } from "https://cdn.skypack.dev/@octokit/core";
 </script>
 ```
 
@@ -166,7 +166,7 @@ octokit.request("POST /repos/{owner}/{repo}/pulls", {
   owner,
   repo,
   title: "My pull request",
-  base: "master",
+  base: "main",
   head: "my-feature",
   draft: true,
 });
diff --git a/package.json b/package.json
index f68b586ec..9445cdaf9 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,15 @@
     ]
   },
   "release": {
+    "branches": [
+      "+([0-9]).x",
+      "main",
+      "next",
+      {
+        "name": "beta",
+        "prerelease": true
+      }
+    ],
     "plugins": [
       "@semantic-release/commit-analyzer",
       "@semantic-release/release-notes-generator",