diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ab7ddf8b8..9152475574 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ orbs:
     GARDEN_LOGGER_TYPE: basic
 
   shared-machine-config: &shared-machine-config
-    image: 'ubuntu-2004:202010-01'
+    image: "ubuntu-2004:202010-01"
     docker_layer_caching: true
 
   remote-docker: &remote-docker
@@ -43,11 +43,11 @@ orbs:
     attach_workspace:
       at: ./
 
-  # Only run jobs on master
-  only-master: &only-master
+  # Only run jobs on main
+  only-main: &only-main
     filters:
       branches:
-        only: master
+        only: main
       tags:
         ignore: /.*/
 
@@ -81,8 +81,8 @@ commands:
     steps:
       - restore_cache:
           keys:
-          - yarn-v4-<<parameters.context>>-{{ checksum "yarn.lock" }}
-          - yarn-v4-<<parameters.context>>
+            - yarn-v4-<<parameters.context>>-{{ checksum "yarn.lock" }}
+            - yarn-v4-<<parameters.context>>
 
       - run: yarn
 
@@ -100,7 +100,6 @@ commands:
             git config --global user.name "Garden CI"
             git config --global user.email "admin@garden.io"
 
-
   install_kubectl:
     description: Install kubectl
     steps:
@@ -489,8 +488,8 @@ jobs:
       - deploy:
           name: Release docker images
           command: |
-            # Switches between git tag and master for releases
-            TAG=${CIRCLE_TAG:-master}
+            # Switches between git tag and main for releases
+            TAG=${CIRCLE_TAG:-main}
             # Push the container
             ./scripts/push-containers.sh $TAG
             # Push again with latest tag for non-pre-release tags
@@ -588,7 +587,7 @@ jobs:
       # Restore Maven cache
       - restore_cache:
           keys:
-          - m2-v1
+            - m2-v1
       # Run tests
       - run:
           name: Plugin tests
@@ -1024,18 +1023,18 @@ workflows:
           requires: [build]
           kindNodeImage: kindest/node:v1.21.2
 
-      ### MASTER ONLY ###
+      ### MAIN ONLY ###
 
       # TODO: Re-enable this if we can figure out a way to not spam users who have starred the repo.
       # - build-dist-edge:
-      #     <<: *only-master
+      #     <<: *only-main
       #     requires: [build]
       # - release-service-docker:
-      #     <<: *only-master
+      #     <<: *only-main
       #     context: docker
       #     requires: [build-dist-edge]
       # - release-service-dist-edge:
-      #     <<: *only-master
+      #     <<: *only-main
       #     requires: [build-dist-edge]
 
   tags:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 654d369c08..a5be697cff 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!--  Thanks for sending a pull request!  Here are some tips for you:
 
-1. If this is your first pull request, please read our contributor guidelines in the https://github.com/garden-io/garden/blob/master/CONTRIBUTING.md file.
+1. If this is your first pull request, please read our contributor guidelines in the https://github.com/garden-io/garden/blob/main/CONTRIBUTING.md file.
 2. Please label this pull request according to what type of issue you are addressing (see "What type of PR is this?" below)
 3. Ensure you have added or run the appropriate tests for your PR.
 4. If the PR is unfinished, add `WIP:` at the beginning of the title or use the Github Draft PR feature.
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 090470b586..04b28ddb36 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -3,9 +3,9 @@ on:
   # Only the default branch is supported.
   branch_protection_rule:
   schedule:
-    - cron: '31 20 * * 0'
+    - cron: "31 20 * * 0"
   push:
-    branches: [ "master" ]
+    branches: ["main"]
 
 # Declare default permissions as read only.
 permissions: read-all
@@ -22,7 +22,7 @@ jobs:
       # Needs for private repositories.
       contents: read
       actions: read
-    
+
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
@@ -53,8 +53,8 @@ jobs:
           # repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
 
           # Publish the results for public repositories to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results. 
-          # For private repositories, `publish_results` will automatically be set to `false`, regardless 
+          # https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories, `publish_results` will automatically be set to `false`, regardless
           # of the value entered here.
           publish_results: true
 
@@ -66,7 +66,7 @@ jobs:
           name: SARIF file
           path: results.sarif
           retention-days: 5
-      
+
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
         uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
diff --git a/.github/workflows/update-homebrew-action.yml b/.github/workflows/update-homebrew-action.yml
index 45aee368fd..4dfbfcb7ca 100644
--- a/.github/workflows/update-homebrew-action.yml
+++ b/.github/workflows/update-homebrew-action.yml
@@ -4,41 +4,40 @@ on:
   release:
     types: [published]
 
-permissions:  # added using https://github.com/step-security/secure-workflows
+permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
 
 jobs:
   homebrew-release:
-
-    runs-on: macOS-latest
+    runs-on: macos-latest
 
     steps:
-    - name: Checks if pre-release
-      if: github.event.release.prerelease == true
-      run: |
-        echo This is running against a pre-release.
-        echo Skipping all the next steps.
-    - name: Release Homebrew Formula
-      if: github.event.release.prerelease != true
-      uses: mislav/bump-homebrew-formula-action@21991dc8f899341b552c9842957677139a340980
-      with:
-        formula-name: garden-cli
-        formula-path: Formula/garden-cli.rb
-        homebrew-tap: garden-io/homebrew-garden
-        base-branch: master
-        create-pullrequest: true
-        download-url: https://download.garden.io/core/${{ github.event.release.tag_name }}/garden-${{ github.event.release.tag_name }}-macos-amd64.tar.gz
-        commit-message: |
-          Bump {{formulaName}} to {{version}}.
+      - name: Checks if pre-release
+        if: github.event.release.prerelease == true
+        run: |
+          echo This is running against a pre-release.
+          echo Skipping all the next steps.
+      - name: Release Homebrew Formula
+        if: github.event.release.prerelease != true
+        uses: mislav/bump-homebrew-formula-action@21991dc8f899341b552c9842957677139a340980
+        with:
+          formula-name: garden-cli
+          formula-path: Formula/garden-cli.rb
+          homebrew-tap: garden-io/homebrew-garden
+          base-branch: main
+          create-pullrequest: true
+          download-url: https://download.garden.io/core/${{ github.event.release.tag_name }}/garden-${{ github.event.release.tag_name }}-macos-amd64.tar.gz
+          commit-message: |
+            Bump {{formulaName}} to {{version}}.
 
-          For more info: https://github.com/garden-io/garden
-      env:
-        COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
-    - name: Test Homebrew package
-      if: github.event.release.prerelease != true
-      run: |
-        echo 'Testing brew install'
-        brew tap garden-io/garden
-        brew install garden-cli
-        echo 'Running garden --version'
-        garden --version
+            For more info: https://github.com/garden-io/garden
+        env:
+          COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
+      - name: Test Homebrew package
+        if: github.event.release.prerelease != true
+        run: |
+          echo 'Testing brew install'
+          brew tap garden-io/garden
+          brew install garden-cli
+          echo 'Running garden --version'
+          garden --version
diff --git a/README.md b/README.md
index f8e5f88c3d..14ef67c8c1 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
   <a href="https://docs.garden.io/?utm_source=github">Docs</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
-  <a href="https://github.com/garden-io/garden/tree/master/examples">Examples</a>
+  <a href="https://github.com/garden-io/garden/tree/main/examples">Examples</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
   <a href="https://garden.io/blog/?utm_source=github">Blog</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
@@ -32,7 +32,7 @@ With Garden you can:
 
 This is the repo for the open source Garden Core. To learn more about Garden Cloud [click here](https://cloud.docs.garden.io/).
 
-*If you’re using Garden or if you like the project, please ★ star this repository to show your support 💖*
+_If you’re using Garden or if you like the project, please ★ star this repository to show your support 💖_
 
 ### **Getting started**
 
@@ -70,7 +70,7 @@ With the Stack Graph, each part of your stack describes itself using simple, int
 
 ![Stack Graph](docs/stack-graph-drawing.png)
 
-Garden then leverages your *existing tools and infrastructure* to execute this graph, allowing you to go **from zero to a running system in a single command**. And thanks to smart caching, it’s fast!
+Garden then leverages your _existing tools and infrastructure_ to execute this graph, allowing you to go **from zero to a running system in a single command**. And thanks to smart caching, it’s fast!
 
 For example, to create a preview environment on every pull request, simply add the following to your CI pipeline:
 
@@ -130,7 +130,7 @@ You can also head to our [community forum](https://community.garden.io/) for Qs
 
 If you find a security issue in Garden, please follow responsible disclosure practices and send information about security issues directly to security@garden.io.
 
-For more details [see here](https://github.com/garden-io/garden/blob/master/SECURITY.md).
+For more details [see here](https://github.com/garden-io/garden/blob/main/SECURITY.md).
 
 ### **Telemetry**
 
@@ -142,4 +142,4 @@ If you are curious to see an example of the data we collect or if you would like
 
 ### **License**
 
-Garden is licensed according to [Mozilla Public License 2.0 (MPL-2.0)](https://github.com/garden-io/garden/blob/master/LICENSE.md).
\ No newline at end of file
+Garden is licensed according to [Mozilla Public License 2.0 (MPL-2.0)](https://github.com/garden-io/garden/blob/main/LICENSE.md).
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 242c7138e2..bca209e2d8 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -1,23 +1,25 @@
 # Release process
 
-We have a dedicated release branch, `latest-release`, off of which we create our releases using our [release script](https://github.com/garden-io/garden/blob/master/scripts/release.ts). Once we're ready to release, we reset the `latest-release` branch to `master` and create a pre-release with the script. If there are issues with the pre-release, we merge the fixes to `master` and cherry-pick them to the `latest-release` branch. We repeat this process until all issues have been resolved and we can make a proper release.
+We have a dedicated release branch, `latest-release`, off of which we create our releases using our [release script](https://github.com/garden-io/garden/blob/main/scripts/release.ts). Once we're ready to release, we reset the `latest-release` branch to `main` and create a pre-release with the script. If there are issues with the pre-release, we merge the fixes to `main` and cherry-pick them to the `latest-release` branch. We repeat this process until all issues have been resolved and we can make a proper release.
 
-This procedure allows us to continue merging features into `master` without them being included in the release.
+This procedure allows us to continue merging features into `main` without them being included in the release.
 
-On every merge to `master` we also publish an **unstable** release with the version `edge` that is always flagged as a pre-release.
+On every merge to `main` we also publish an **unstable** release with the version `edge` that is always flagged as a pre-release.
 
 ## Release script
 
-The [release script](https://github.com/garden-io/garden/blob/master/scripts/release.ts) has the signature:
+The [release script](https://github.com/garden-io/garden/blob/main/scripts/release.ts) has the signature:
+
 ```sh
 ./scripts/release.ts <minor | patch | preminor | prepatch | prerelease> [--force] [--dry-run]
 ```
+
 and does the following:
 
-* Checks out a branch named `release-<version>`.
-* Updates `core/package.json`, `core/yarn.lock` and `CHANGELOG.md`.
-* Commits the changes, tags the commit, and pushes the tag and branch.
-* Pushing the tag triggers a CI process that creates the release artifacts and publishes them to GitHub. If the release is not a pre-release, we create a draft instead of actually publishing.
+- Checks out a branch named `release-<version>`.
+- Updates `core/package.json`, `core/yarn.lock` and `CHANGELOG.md`.
+- Commits the changes, tags the commit, and pushes the tag and branch.
+- Pushing the tag triggers a CI process that creates the release artifacts and publishes them to GitHub. If the release is not a pre-release, we create a draft instead of actually publishing.
 
 ## Steps
 
@@ -25,39 +27,39 @@ To make a new release, set your current working directory to the garden root dir
 
 1. **Checkout to the `latest-release` branch**.
 2. Make the first pre-release:
-  * Reset `latest-release` to `master` with `git reset --hard origin/master`.
-  * Run `git log` to make sure that the latest commit is the expected one and there are no unwanted changes from master included in the release.
-  * Run `./scripts/release.ts preminor|prepatch`.
-  * Wait for the CI build job to get the binaries from the [Github Releases page](https://github.com/garden-io/garden/releases).
+   - Reset `latest-release` to `main` with `git reset --hard origin/main`.
+   - Run `git log` to make sure that the latest commit is the expected one and there are no unwanted changes from `main` included in the release.
+   - Run `./scripts/release.ts preminor|prepatch`.
+   - Wait for the CI build job to get the binaries from the [Github Releases page](https://github.com/garden-io/garden/releases).
 3. Manual testing (using the pre-release/release binary)
-  * On **macOS** or **Linux**, run the `./scripts/test-release.sh <version>` script, where `<version>` should have the format `<major>.<minor>.<patch>-<preReleaseCounter>`, e.g. `0.12.38-0`. The script runs some simple tests to sanity check the release.
-  * On a **Windows** machine, run `garden deploy --dev vote --env remote` in the `vote` example project.
-    * If there are any issues with syncing, consider changing the `services[].devMode.sync[].mode` value(s) to `one-way-replica` and restarting Garden.
-    * Change a file in the `vote` service and verify that the code synchronization was successful.
-    * Open the dashboard, verify that the initial page loads without errors.
-4. You might need to include some additional commits here. For example, if any other fix(es) should be included from master, or if there are any test failures. In that case ypou need a new pre-release:
-    * Checkout to the most recent pre-release branch, e.g. `1.2.3-0`, and cherry-pick the appropriate commits from `master`.
-    * Run `./scripts/release.ts prerelease` - it will generate a new pre-release `1.2.3-1`.
-    * Repeat the manual testing.
+   - On **macOS** or **Linux**, run the `./scripts/test-release.sh <version>` script, where `<version>` should have the format `<major>.<minor>.<patch>-<preReleaseCounter>`, e.g. `0.12.38-0`. The script runs some simple tests to sanity check the release.
+   - On a **Windows** machine, run `garden deploy --dev vote --env remote` in the `vote` example project.
+   - If there are any issues with syncing, consider changing the `services[].devMode.sync[].mode` value(s) to `one-way-replica` and restarting Garden.
+   - Change a file in the `vote` service and verify that the code synchronization was successful.
+   - Open the dashboard, verify that the initial page loads without errors.
+4. You might need to include some additional commits here. For example, if any other fix(es) should be included from `main`, or if there are any test failures. In that case ypou need a new pre-release:
+   - Checkout to the most recent pre-release branch, e.g. `1.2.3-0`, and cherry-pick the appropriate commits from `main`.
+   - Run `./scripts/release.ts prerelease` - it will generate a new pre-release `1.2.3-1`.
+   - Repeat the manual testing.
 5. If you’re ready to make a proper release, do the following:
-    * Checkout to the most recent pre-release branch, e.g. `1.2.3-1`.
-    * Remove all the `bump version...` commits. E.g. by using `git rebase -i <hash-before-first-version-bump>` and `drop`-ing the commits. In this case we drop `chore(release): bump version to 1.2.3-0` and `chore(release): bump version to v.1.2.3-1`.
-    * Run `./scripts/release.ts minor | patch`. This way, the version bump commits and changelog entries created by the pre-releases are omitted from the final history.
-7. Go to our GitHub [Releases page](https://github.com/garden-io/garden/releases) and click the **Edit** button for the draft just created from CI. Note that for drafts, a new one is always created instead of replacing a previous one.
-8. Write release notes. The notes should give an overview of the release and mention all relevant features. They should also **acknowledge all external contributors** and contain the changelog for that release.
-    * Automated release notes generation:
-      * Run `./scripts/draft-release-notes.ts <previous-tag> <current-tag>`, the filename with the draft notes will be printed in the console
-      * Open the draft file (it's named `release-notes-${version}-draft.txt`, e.g. `release-notes-0.12.38-draft.txt`) and resolve all suggested TODO items
-    * Old way of release notes generation (if the automated way fails for some reason):
-      * To generate a changelog for just that tag, run `git-chglog <previous-release-tag-name>..<tag-name>`
-      * To get a list of all contributors between releases, ordered by count, run: `./scripts/show-contributors.sh <previous-tag> <current-tag>`. Note that authors of squashed commits won't show up, so it might be good to do a quick sanity check on Github as well.
-      * Take the previous release notes for GitHub as a template and apply the necessary updates.
-      * Remember to put the list of features on top of the list of bug fixes in the changelog.
-9. Click the **Publish release** button.
-10. Make a pull request for the branch that was pushed by the script and make sure it's merged as soon as possible.
-11. Make sure the `latest-release` branch contains the released version, and push it to the remote. **This branch is used for our documentation, so this step is important.**
-12. Check the `update-homebrew` GitHub Action run successfully and merge the relevant PR in the [homebrew repo](https://github.com/garden-io/homebrew-garden/pulls).
-13. Install the Homebrew package and make sure it works okay:
-    * `brew tap garden-io/garden && brew install garden-cli || true && brew update && brew upgrade garden-cli`
-    * Run `$(brew --prefix garden-cli)/bin/garden dev` (to make sure you're using the packaged release) in an example project and see if all looks well.
-14. Prepare the release announcement and publish it in our channels (Slack and Twitter). If not possible, delegate the task to an available contributor.
+   - Checkout to the most recent pre-release branch, e.g. `1.2.3-1`.
+   - Remove all the `bump version...` commits. E.g. by using `git rebase -i <hash-before-first-version-bump>` and `drop`-ing the commits. In this case we drop `chore(release): bump version to 1.2.3-0` and `chore(release): bump version to v.1.2.3-1`.
+   - Run `./scripts/release.ts minor | patch`. This way, the version bump commits and changelog entries created by the pre-releases are omitted from the final history.
+6. Go to our GitHub [Releases page](https://github.com/garden-io/garden/releases) and click the **Edit** button for the draft just created from CI. Note that for drafts, a new one is always created instead of replacing a previous one.
+7. Write release notes. The notes should give an overview of the release and mention all relevant features. They should also **acknowledge all external contributors** and contain the changelog for that release.
+   - Automated release notes generation:
+     - Run `./scripts/draft-release-notes.ts <previous-tag> <current-tag>`, the filename with the draft notes will be printed in the console
+     - Open the draft file (it's named `release-notes-${version}-draft.txt`, e.g. `release-notes-0.12.38-draft.txt`) and resolve all suggested TODO items
+   - Old way of release notes generation (if the automated way fails for some reason):
+     - To generate a changelog for just that tag, run `git-chglog <previous-release-tag-name>..<tag-name>`
+     - To get a list of all contributors between releases, ordered by count, run: `./scripts/show-contributors.sh <previous-tag> <current-tag>`. Note that authors of squashed commits won't show up, so it might be good to do a quick sanity check on Github as well.
+     - Take the previous release notes for GitHub as a template and apply the necessary updates.
+     - Remember to put the list of features on top of the list of bug fixes in the changelog.
+8. Click the **Publish release** button.
+9. Make a pull request for the branch that was pushed by the script and make sure it's merged as soon as possible.
+10. Make sure the `latest-release` branch contains the released version, and push it to the remote. **This branch is used for our documentation, so this step is important.**
+11. Check the `update-homebrew` GitHub Action run successfully and merge the relevant PR in the [homebrew repo](https://github.com/garden-io/homebrew-garden/pulls).
+12. Install the Homebrew package and make sure it works okay:
+    - `brew tap garden-io/garden && brew install garden-cli || true && brew update && brew upgrade garden-cli`
+    - Run `$(brew --prefix garden-cli)/bin/garden dev` (to make sure you're using the packaged release) in an example project and see if all looks well.
+13. Prepare the release announcement and publish it in our channels (Slack and Twitter). If not possible, delegate the task to an available contributor.
diff --git a/core/src/docs/joi-schema.ts b/core/src/docs/joi-schema.ts
index c4e45d158c..fea950c6cd 100644
--- a/core/src/docs/joi-schema.ts
+++ b/core/src/docs/joi-schema.ts
@@ -170,8 +170,8 @@ function formatType(joiDescription: JoiDescription) {
     const arrayType = items[0].type
     return `array[${arrayType}]`
   } else if (type === "alternatives") {
-    // returns e.g. "string|number"
-    return uniq(joiDescription.matches.map(({ schema }) => formatType(schema))).join(" | ")
+    // returns e.g. "string \| number". pipe escaped for semantically-correct markdown tables
+    return uniq(joiDescription.matches.map(({ schema }) => formatType(schema))).join(" \\| ")
   } else {
     return type || ""
   }
diff --git a/core/src/plugins/kubernetes/local-mode.ts b/core/src/plugins/kubernetes/local-mode.ts
index d65517d0eb..7ae808f758 100644
--- a/core/src/plugins/kubernetes/local-mode.ts
+++ b/core/src/plugins/kubernetes/local-mode.ts
@@ -39,7 +39,7 @@ import touch = require("touch")
 
 // export const localModeGuideLink = "https://docs.garden.io/guides/running-service-in-local-mode.md"
 export const localModeGuideLink =
-  "https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md"
+  "https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md"
 
 const localhost = "127.0.0.1"
 
diff --git a/core/src/util/fs.ts b/core/src/util/fs.ts
index b42cfbd7a7..8ce52008f3 100644
--- a/core/src/util/fs.ts
+++ b/core/src/util/fs.ts
@@ -314,7 +314,7 @@ export async function makeTempDir({ git = false }: { git?: boolean } = {}): Prom
   tmpDir.path = await realpath(tmpDir.path)
 
   if (git) {
-    await exec("git", ["init"], { cwd: tmpDir.path })
+    await exec("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
     await writeFile(join(tmpDir.path, "foo"), "bar")
     await exec("git", ["add", "."], { cwd: tmpDir.path })
     await exec("git", ["commit", "-m", "first commit"], { cwd: tmpDir.path })
diff --git a/core/src/vcs/git.ts b/core/src/vcs/git.ts
index 4cded94f0b..5696468af2 100644
--- a/core/src/vcs/git.ts
+++ b/core/src/vcs/git.ts
@@ -53,7 +53,7 @@ export function parseGitUrl(url: string) {
     throw new ConfigurationError(
       deline`
         Repository URLs must contain a hash part pointing to a specific branch or tag
-        (e.g. https://github.com/org/repo.git#master)`,
+        (e.g. https://github.com/org/repo.git#main)`,
       { repositoryUrl: url }
     )
   }
diff --git a/core/test/data/test-project-ext-module-sources/module-a/garden.yml b/core/test/data/test-project-ext-module-sources/module-a/garden.yml
index 0a282aac9f..5899d543f2 100644
--- a/core/test/data/test-project-ext-module-sources/module-a/garden.yml
+++ b/core/test/data/test-project-ext-module-sources/module-a/garden.yml
@@ -1,6 +1,6 @@
 kind: Module
 name: module-a
-repositoryUrl: https://my-git-server.com/my-repo.git#master
+repositoryUrl: https://my-git-server.com/my-repo.git#main
 type: test
 services:
   - name: service-a
diff --git a/core/test/data/test-project-ext-module-sources/module-b/garden.yml b/core/test/data/test-project-ext-module-sources/module-b/garden.yml
index a5d90728bc..629e6656ac 100644
--- a/core/test/data/test-project-ext-module-sources/module-b/garden.yml
+++ b/core/test/data/test-project-ext-module-sources/module-b/garden.yml
@@ -1,6 +1,6 @@
 kind: Module
 name: module-b
-repositoryUrl: https://my-git-server.com/my-repo.git#master
+repositoryUrl: https://my-git-server.com/my-repo.git#main
 type: test
 services:
   - name: service-b
diff --git a/core/test/data/test-project-ext-module-sources/module-c/garden.yml b/core/test/data/test-project-ext-module-sources/module-c/garden.yml
index 318d3e1c3e..19b0ed1075 100644
--- a/core/test/data/test-project-ext-module-sources/module-c/garden.yml
+++ b/core/test/data/test-project-ext-module-sources/module-c/garden.yml
@@ -1,6 +1,6 @@
 kind: Module
 name: module-c
-repositoryUrl: https://my-git-server.com/my-repo.git#master
+repositoryUrl: https://my-git-server.com/my-repo.git#main
 type: test
 services:
   - name: service-c
@@ -8,4 +8,4 @@ build:
   command: [echo, A]
 tests:
   - name: unit
-    command: [echo, OK]
\ No newline at end of file
+    command: [echo, OK]
diff --git a/core/test/data/test-project-ext-project-sources/garden.yml b/core/test/data/test-project-ext-project-sources/garden.yml
index d2cc9e6a6a..d8a41279ed 100644
--- a/core/test/data/test-project-ext-project-sources/garden.yml
+++ b/core/test/data/test-project-ext-project-sources/garden.yml
@@ -2,11 +2,11 @@ kind: Project
 name: test-project-ext-project-sources
 sources:
   - name: source-a
-    repositoryUrl: https://my-git-server.com/my-repo.git#master
+    repositoryUrl: https://my-git-server.com/my-repo.git#main
   - name: source-b
-    repositoryUrl: https://my-git-server.com/my-repo.git#master
+    repositoryUrl: https://my-git-server.com/my-repo.git#main
   - name: source-c
-    repositoryUrl: https://my-git-server.com/my-repo.git#master
+    repositoryUrl: https://my-git-server.com/my-repo.git#main
 environments:
   - name: local
   - name: other
diff --git a/core/test/helpers.ts b/core/test/helpers.ts
index 7fd22fad0c..fd76cfceb7 100644
--- a/core/test/helpers.ts
+++ b/core/test/helpers.ts
@@ -62,7 +62,7 @@ export const testModuleVersion: ModuleVersion = {
 }
 
 // All test projects use this git URL
-export const testGitUrl = "https://my-git-server.com/my-repo.git#master"
+export const testGitUrl = "https://my-git-server.com/my-repo.git#main"
 export const testGitUrlHash = hashRepoUrl(testGitUrl)
 
 export function getDataDir(...names: string[]) {
@@ -528,7 +528,7 @@ async function prepareRemoteGarden({
     const remoteSourceRelPath = getRemoteSourceRelPath({ name, url: testGitUrl, sourceType: type })
     const targetPath = join(garden.projectRoot, ".garden", remoteSourceRelPath)
     await copy(join(extSourcesRoot, name), targetPath)
-    await execa("git", ["init"], { cwd: targetPath })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: targetPath })
   })
 
   return garden
diff --git a/core/test/integ/src/plugins/hadolint/hadolint.ts b/core/test/integ/src/plugins/hadolint/hadolint.ts
index 138d0926dd..63a413deba 100644
--- a/core/test/integ/src/plugins/hadolint/hadolint.ts
+++ b/core/test/integ/src/plugins/hadolint/hadolint.ts
@@ -31,7 +31,7 @@ describe("hadolint provider", () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
     tmpPath = tmpDir.path
 
-    await execa("git", ["init"], { cwd: tmpPath })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpPath })
 
     projectConfigFoo = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/integ/src/plugins/kubernetes/kubernetes-module/handlers.ts b/core/test/integ/src/plugins/kubernetes/kubernetes-module/handlers.ts
index 1e5617e99c..7f55e941a5 100644
--- a/core/test/integ/src/plugins/kubernetes/kubernetes-module/handlers.ts
+++ b/core/test/integ/src/plugins/kubernetes/kubernetes-module/handlers.ts
@@ -76,7 +76,7 @@ describe("kubernetes-module handlers", () => {
     ctx = <KubernetesPluginContext>await garden.getPluginContext(provider)
     api = await KubeApi.factory(log, ctx, ctx.provider)
     tmpDir = await tmp.dir({ unsafeCleanup: true })
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
     nsModuleConfig = {
       apiVersion: "garden.io/v0",
       kind: "Module",
diff --git a/core/test/integ/src/plugins/kubernetes/volume/configmap.ts b/core/test/integ/src/plugins/kubernetes/volume/configmap.ts
index 5db246293a..96fb2f1eeb 100644
--- a/core/test/integ/src/plugins/kubernetes/volume/configmap.ts
+++ b/core/test/integ/src/plugins/kubernetes/volume/configmap.ts
@@ -23,7 +23,7 @@ describe("configmap module", () => {
   before(async () => {
     tmpDir = await makeTempDir()
 
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     projectConfigFoo = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/integ/src/plugins/kubernetes/volume/persistentvolumeclaim.ts b/core/test/integ/src/plugins/kubernetes/volume/persistentvolumeclaim.ts
index 3ec8508f22..ad342e20a5 100644
--- a/core/test/integ/src/plugins/kubernetes/volume/persistentvolumeclaim.ts
+++ b/core/test/integ/src/plugins/kubernetes/volume/persistentvolumeclaim.ts
@@ -23,7 +23,7 @@ describe("persistentvolumeclaim", () => {
   before(async () => {
     tmpDir = await makeTempDir()
 
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     projectConfigFoo = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/unit/src/commands/create/create-module.ts b/core/test/unit/src/commands/create/create-module.ts
index dfa1b82290..761cc7a1bf 100644
--- a/core/test/unit/src/commands/create/create-module.ts
+++ b/core/test/unit/src/commands/create/create-module.ts
@@ -28,7 +28,7 @@ describe("CreateModuleCommand", () => {
 
   beforeEach(async () => {
     tmp = await makeTempDir()
-    await exec("git", ["init"], { cwd: tmp.path })
+    await exec("git", ["init", "--initial-branch=main"], { cwd: tmp.path })
     garden = await makeDummyGarden(tmp.path, { commandInfo: { name: "create module", args: {}, opts: {} } })
   })
 
diff --git a/core/test/unit/src/commands/create/create-project.ts b/core/test/unit/src/commands/create/create-project.ts
index fcd649dbe1..3a960c148c 100644
--- a/core/test/unit/src/commands/create/create-project.ts
+++ b/core/test/unit/src/commands/create/create-project.ts
@@ -23,7 +23,7 @@ describe("CreateProjectCommand", () => {
 
   beforeEach(async () => {
     tmp = await makeTempDir()
-    await exec("git", ["init"], { cwd: tmp.path })
+    await exec("git", ["init", "--initial-branch=main"], { cwd: tmp.path })
     garden = await makeDummyGarden(tmp.path, { commandInfo: { name: "create project", args: {}, opts: {} } })
   })
 
diff --git a/core/test/unit/src/commands/get/get-outputs.ts b/core/test/unit/src/commands/get/get-outputs.ts
index 8737b4e242..e93cb3b9f6 100644
--- a/core/test/unit/src/commands/get/get-outputs.ts
+++ b/core/test/unit/src/commands/get/get-outputs.ts
@@ -22,7 +22,7 @@ describe("GetOutputsCommand", () => {
   before(async () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
 
-    await exec("git", ["init"], { cwd: tmpDir.path })
+    await exec("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     projectConfig = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/unit/src/commands/get/get-status.ts b/core/test/unit/src/commands/get/get-status.ts
index b8d7312279..102343996e 100644
--- a/core/test/unit/src/commands/get/get-status.ts
+++ b/core/test/unit/src/commands/get/get-status.ts
@@ -29,7 +29,7 @@ describe("GetStatusCommand", () => {
   before(async () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
 
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     config = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/unit/src/commands/logs.ts b/core/test/unit/src/commands/logs.ts
index 9664d3813a..fcf414809c 100644
--- a/core/test/unit/src/commands/logs.ts
+++ b/core/test/unit/src/commands/logs.ts
@@ -132,7 +132,7 @@ describe("LogsCommand", () => {
   before(async () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
 
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
   })
 
   after(async () => {
diff --git a/core/test/unit/src/commands/migrate.ts b/core/test/unit/src/commands/migrate.ts
index f700b952b6..99edf66eb4 100644
--- a/core/test/unit/src/commands/migrate.ts
+++ b/core/test/unit/src/commands/migrate.ts
@@ -307,7 +307,7 @@ describe("commands", () => {
       )
     })
     it("should abort write if config file is dirty", async () => {
-      await execa("git", ["init"], { cwd: tmpDir.path })
+      await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
       await writeFile(
         join(tmpDir.path, "garden.yml"),
         dedent`
diff --git a/core/test/unit/src/commands/run/workflow.ts b/core/test/unit/src/commands/run/workflow.ts
index b3fe42ce9c..a38b0bb369 100644
--- a/core/test/unit/src/commands/run/workflow.ts
+++ b/core/test/unit/src/commands/run/workflow.ts
@@ -254,7 +254,7 @@ describe("RunWorkflowCommand", () => {
     })
 
     const tmpDir = await tmp.dir({ unsafeCleanup: true })
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     const projectConfig: ProjectConfig = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/unit/src/commands/tools.ts b/core/test/unit/src/commands/tools.ts
index 7ecbeb51b2..e71a6c7eb8 100644
--- a/core/test/unit/src/commands/tools.ts
+++ b/core/test/unit/src/commands/tools.ts
@@ -85,7 +85,7 @@ describe("ToolsCommand", () => {
 
   before(async () => {
     tmpDir = await makeTempDir()
-    await exec("git", ["init"], { cwd: tmpDir.path })
+    await exec("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     garden = await TestGarden.factory(tmpDir.path, {
       plugins: [pluginA, pluginB],
diff --git a/core/test/unit/src/commands/util/fetch-tools.ts b/core/test/unit/src/commands/util/fetch-tools.ts
index 992af12d4a..f1aa11fb4b 100644
--- a/core/test/unit/src/commands/util/fetch-tools.ts
+++ b/core/test/unit/src/commands/util/fetch-tools.ts
@@ -58,7 +58,7 @@ describe("FetchToolsCommand", () => {
 
   before(async () => {
     tmpDir = await makeTempDir()
-    await exec("git", ["init"], { cwd: tmpDir.path })
+    await exec("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
   })
 
   it("should fetch tools for configured providers", async () => {
diff --git a/core/test/unit/src/garden.ts b/core/test/unit/src/garden.ts
index 85cb39ed4d..5dc00f6624 100644
--- a/core/test/unit/src/garden.ts
+++ b/core/test/unit/src/garden.ts
@@ -63,7 +63,7 @@ describe("Garden", () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
     pathFoo = tmpDir.path
 
-    await execa("git", ["init"], { cwd: pathFoo })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: pathFoo })
 
     projectConfigFoo = {
       apiVersion: DEFAULT_API_VERSION,
@@ -2347,11 +2347,11 @@ describe("Garden", () => {
         // Create a temporary git repo to clone
         const repoPath = resolve(_tmpDir.path, garden.projectName)
         await copy(localSourcePath, repoPath)
-        await exec("git", ["init"], { cwd: repoPath })
+        await exec("git", ["init", "--initial-branch=main"], { cwd: repoPath })
         await exec("git", ["add", "."], { cwd: repoPath })
         await exec("git", ["commit", "-m", "foo"], { cwd: repoPath })
 
-        garden.variables.sourceBranch = "master"
+        garden.variables.sourceBranch = "main"
 
         const _garden = garden as any
         _garden["projectSources"] = [
@@ -3289,7 +3289,7 @@ describe("Garden", () => {
             taskConfigs: [],
             testConfigs: [],
             spec: {},
-            repositoryUrl: "file://" + tmpRepo.path + "#master",
+            repositoryUrl: "file://" + tmpRepo.path + "#main",
             generateFiles: [
               {
                 sourcePath,
@@ -3354,7 +3354,7 @@ describe("Garden", () => {
             taskConfigs: [],
             testConfigs: [],
             spec: {},
-            repositoryUrl: "file://" + tmpRepo.path + "#master",
+            repositoryUrl: "file://" + tmpRepo.path + "#main",
             generateFiles: [
               {
                 sourcePath,
@@ -3421,7 +3421,7 @@ describe("Garden", () => {
             dotIgnoreFiles: [],
             environments: [{ name: "default", defaultNamespace, variables: {} }],
             providers: [{ name: "test-plugin" }],
-            sources: [{ name: "remote-module", repositoryUrl: "file://" + tmpRepo.path + "#master" }],
+            sources: [{ name: "remote-module", repositoryUrl: "file://" + tmpRepo.path + "#main" }],
             variables: {},
           },
         })
@@ -3478,7 +3478,7 @@ describe("Garden", () => {
             dotIgnoreFiles: [],
             environments: [{ name: "default", defaultNamespace, variables: {} }],
             providers: [{ name: "test-plugin" }],
-            sources: [{ name: "remote-module", repositoryUrl: "file://" + tmpRepo.path + "#master" }],
+            sources: [{ name: "remote-module", repositoryUrl: "file://" + tmpRepo.path + "#main" }],
             variables: {},
           },
         })
diff --git a/core/test/unit/src/outputs.ts b/core/test/unit/src/outputs.ts
index f5757131c6..37e9b3508e 100644
--- a/core/test/unit/src/outputs.ts
+++ b/core/test/unit/src/outputs.ts
@@ -26,7 +26,7 @@ describe("resolveProjectOutputs", () => {
   beforeEach(async () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
     tmpPath = await realpath(tmpDir.path)
-    await exec("git", ["init"], { cwd: tmpPath })
+    await exec("git", ["init", "--initial-branch=main"], { cwd: tmpPath })
     projectConfig = {
       apiVersion: DEFAULT_API_VERSION,
       kind: "Project",
diff --git a/core/test/unit/src/tasks/deploy.ts b/core/test/unit/src/tasks/deploy.ts
index 7ea035f00a..adda289c54 100644
--- a/core/test/unit/src/tasks/deploy.ts
+++ b/core/test/unit/src/tasks/deploy.ts
@@ -32,7 +32,7 @@ describe("DeployTask", () => {
   before(async () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
 
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     config = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/unit/src/tasks/get-service-status.ts b/core/test/unit/src/tasks/get-service-status.ts
index 6cb9a5d2a7..c36dabc99c 100644
--- a/core/test/unit/src/tasks/get-service-status.ts
+++ b/core/test/unit/src/tasks/get-service-status.ts
@@ -27,7 +27,7 @@ describe("GetServiceStatusTask", () => {
   before(async () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
 
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     config = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/unit/src/tasks/resolve-provider.ts b/core/test/unit/src/tasks/resolve-provider.ts
index 818b30acee..1b726893dd 100644
--- a/core/test/unit/src/tasks/resolve-provider.ts
+++ b/core/test/unit/src/tasks/resolve-provider.ts
@@ -29,7 +29,7 @@ describe("ResolveProviderTask", () => {
     tmpDir = await makeTempDir()
     const path = tmpDir.path
 
-    await execa("git", ["init"], { cwd: path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: path })
   })
 
   after(async () => {
diff --git a/core/test/unit/src/tasks/task.ts b/core/test/unit/src/tasks/task.ts
index cc1093dd70..8fb607d40c 100644
--- a/core/test/unit/src/tasks/task.ts
+++ b/core/test/unit/src/tasks/task.ts
@@ -26,7 +26,7 @@ describe("TaskTask", () => {
   before(async () => {
     tmpDir = await tmp.dir({ unsafeCleanup: true })
 
-    await execa("git", ["init"], { cwd: tmpDir.path })
+    await execa("git", ["init", "--initial-branch=main"], { cwd: tmpDir.path })
 
     config = {
       apiVersion: DEFAULT_API_VERSION,
diff --git a/core/test/unit/src/vcs/git.ts b/core/test/unit/src/vcs/git.ts
index b865bbf0ae..6ad6070c14 100644
--- a/core/test/unit/src/vcs/git.ts
+++ b/core/test/unit/src/vcs/git.ts
@@ -28,7 +28,7 @@ async function getCommitMsg(repoPath: string) {
 }
 
 async function commit(msg: string, repoPath: string) {
-  // Ensure master contains changes when committing
+  // Ensure main contains changes when committing
   const uniqueFilename = `${uuidv4()}.txt`
   const filePath = join(repoPath, uniqueFilename)
   await createFile(filePath)
@@ -40,7 +40,7 @@ async function commit(msg: string, repoPath: string) {
 async function makeTempGitRepo() {
   const tmpDir = await tmp.dir({ unsafeCleanup: true })
   const tmpPath = await realpath(tmpDir.path)
-  await execa("git", ["init"], { cwd: tmpPath })
+  await execa("git", ["init", "--initial-branch=main"], { cwd: tmpPath })
 
   return tmpDir
 }
@@ -132,7 +132,7 @@ describe("GitHandler", () => {
       const path = tmpPath
       await commit("init", tmpPath)
       const { branch } = await handler.getPathInfo(log, path)
-      expect(branch).to.equal("master")
+      expect(branch).to.equal("main")
     })
 
     it("should return empty strings when given a path outside of a repo", async () => {
@@ -764,7 +764,7 @@ describe("GitHandler", () => {
       tmpRepoPathA = await realpath(tmpRepoA.path)
       await commit("test commit A", tmpRepoPathA)
 
-      repositoryUrlA = `file://${tmpRepoPathA}#master`
+      repositoryUrlA = `file://${tmpRepoPathA}#main`
 
       tmpRepoB = await makeTempGitRepo()
       tmpRepoPathB = await realpath(tmpRepoB.path)
@@ -894,7 +894,7 @@ describe("GitHandler", () => {
 
       it("should exit on `failOnPrompt` when updating a remote source and prompting for user input", async () => {
         await mkdirp(clonePath)
-        await execa("git", ["init"], { cwd: clonePath })
+        await execa("git", ["init", "--initial-branch=main"], { cwd: clonePath })
         await execa("git", ["commit", "-m", "commit", "--allow-empty"], { cwd: clonePath })
         await execa("git", ["remote", "add", "origin", "https://fake@github.com/private/private.git"], {
           cwd: clonePath,
@@ -967,15 +967,15 @@ describe("GitHandler", () => {
 describe("git", () => {
   describe("getCommitIdFromRefList", () => {
     it("should get the commit id from a list of commit ids and refs", () => {
-      const refList = ["abcde	ref/heads/master", "1234	ref/heads/master", "foobar	ref/heads/master"]
+      const refList = ["abcde	ref/heads/main", "1234	ref/heads/main", "foobar	ref/heads/main"]
       expect(getCommitIdFromRefList(refList)).to.equal("abcde")
     })
     it("should get the commit id from a list of commit ids without refs", () => {
-      const refList = ["abcde", "1234	ref/heads/master", "foobar	ref/heads/master"]
+      const refList = ["abcde", "1234	ref/heads/main", "foobar	ref/heads/main"]
       expect(getCommitIdFromRefList(refList)).to.equal("abcde")
     })
     it("should get the commit id from a single commit id / ref pair", () => {
-      const refList = ["abcde	ref/heads/master"]
+      const refList = ["abcde	ref/heads/main"]
       expect(getCommitIdFromRefList(refList)).to.equal("abcde")
     })
     it("should get the commit id from single commit id without a ref", () => {
diff --git a/docs/advanced/using-remote-sources.md b/docs/advanced/using-remote-sources.md
index 89fd1a06e5..84ce65700b 100644
--- a/docs/advanced/using-remote-sources.md
+++ b/docs/advanced/using-remote-sources.md
@@ -27,8 +27,8 @@ sources:
   - name: web-services
     repositoryUrl: https://github.com/garden-io/garden-example-remote-sources-web-services.git
   - name: db-services
-  # use #your-branch to specify a branch or #v0.3.0 to configure git version
-    repositoryUrl: https://github.com/garden-io/garden-example-remote-sources-db-services.git#master
+    # use #your-branch to specify a branch or #v0.3.0 to configure git version
+    repositoryUrl: https://github.com/garden-io/garden-example-remote-sources-db-services.git#main
 ```
 
 Note that the URL must point to a specific branch or tag.
@@ -108,7 +108,7 @@ Notice that it only contains the `garden.yml` file, all the source code is in th
 You can also import sources and modules from your local file system by setting the `repositoryUrl` to a local file path:
 
 ```yaml
-repositoryUrl: file:///my/local/project/path#master
+repositoryUrl: file:///my/local/project/path#main
 ```
 
 As usual, the URL must point to a specific branch or tag.
@@ -137,7 +137,7 @@ garden unlink source web-services
 
 Garden will only update a remote source if explicitly asked to do so via the `update-remote sources|modules` command.
 
-For example, if we had pointed the repository URL of the `web-services` source from above to something like a `master` branch, and we now wanted to pull the latest code from the remote, we would run:
+For example, if we had pointed the repository URL of the `web-services` source from above to something like a `main` branch, and we now wanted to pull the latest code from the remote, we would run:
 
 ```console
 garden update-remote source web-services
diff --git a/docs/getting-started/1-installation.md b/docs/getting-started/1-installation.md
index eca8c7fc18..044a690149 100644
--- a/docs/getting-started/1-installation.md
+++ b/docs/getting-started/1-installation.md
@@ -4,21 +4,21 @@ This guide will walk you through setting up the Garden framework.
 
 Please follow the guide for your operating system:
 
-* [macOS](#macos)
-* [Windows](#windows)
-* [Linux](#linux)
+- [macOS](#macos)
+- [Windows](#windows)
+- [Linux](#linux)
 
 If you'd like to run Kubernetes locally, please see our [local Kubernetes guide](../guides/local-kubernetes.md)
 for installation and usage information.
 
-If you want to install Garden from source, see the instructions in our [contributor guide](https://github.com/garden-io/garden/tree/master/CONTRIBUTING.md).
+If you want to install Garden from source, see the instructions in our [contributor guide](https://github.com/garden-io/garden/tree/main/CONTRIBUTING.md).
 
 ## Requirements
 
 You need the following dependencies on your local machine to use Garden:
 
-* Git (v2.14 or newer)
-* rsync (v3.1.0 or newer)
+- Git (v2.14 or newer)
+- rsync (v3.1.0 or newer)
 
 And if you'd like to build and run services locally, you need [a local installation of Kubernetes](https://kubernetes.io/docs/tutorials/hello-minikube/). Garden is committed to supporting [the _latest six_ stable versions (i.e. if the latest stable version is v1.23.x, Garden supports v1.18.x and newer)](https://kubernetes.io/releases/).
 
@@ -82,20 +82,22 @@ _Note: The Home edition doesn't support virtualization, but you can still use Ga
 To install the Garden CLI and its dependencies, please use our installation script. To run the script, open PowerShell as an administrator and run:
 
 ```PowerShell
-Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/garden-io/garden/master/support/install.ps1'))
+Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/garden-io/garden/main/support/install.ps1'))
 ```
 
 The things the script will check for are the following:
 
-* The [Chocolatey](https://chocolatey.org) package manager. The script installs it automatically if necessary.
-* _git_ and _rsync_ . The script will install or upgrade those via Chocolatey.
+- The [Chocolatey](https://chocolatey.org) package manager. The script installs it automatically if necessary.
+- _git_ and _rsync_ . The script will install or upgrade those via Chocolatey.
 
 To later upgrade to the newest version, simply re-run the above script.
 
 We also recommend adding an exclusion folder for the `.garden` directory in your repository root to Windows Defender:
+
 ```powershell
 Add-MpPreference -ExclusionPath "C:\Path\To\Your\Repo\.garden"
 ```
+
 This will significantly speed up the first Garden build of large projects on Windows machines.
 
 Note that you must run Powershell with elevated permissions when you execute this command.
@@ -138,7 +140,7 @@ for installation and usage information.
 If you're running Garden behind a firewall, you may need to use a proxy to route external requests. To do this,
 you need to set the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables. For example:
 
- ```sh
+```sh
 export HTTP_PROXY=http://localhost:9999               # <- Replace with your proxy address.
 export HTTPS_PROXY=$HTTP_PROXY                        # <- Replace if you use a separate proxy for HTTPS.
 export NO_PROXY=local.app.garden,localhost,127.0.0.1  # <- This is important! See below.
diff --git a/docs/guides/using-garden-in-ci.md b/docs/guides/using-garden-in-ci.md
index 7053a87387..4554adf825 100644
--- a/docs/guides/using-garden-in-ci.md
+++ b/docs/guides/using-garden-in-ci.md
@@ -2,10 +2,10 @@
 
 In this guide we'll demonstrate how Garden can fit into your continuous integration (CI) pipeline. Simply by adding extra environments to the project configuration, you can use Garden for local development _and_ for testing and deploying your project in CI. This approach has several benefits:
 
-* Use the same tool and the same set of commands for the entire development cycle, from source to finish.
-* No need to change your CI configuration when you change your stack since Garden holds the entire stack graph.
-* The only thing you need to install in CI is the Garden CLI and its dependencies (or use a ready-made Garden container image).
-* When using [in-cluster building](../guides/in-cluster-building.md) your CI also uses the same build and test result cache as you and your team, which makes for a much faster pipeline.
+- Use the same tool and the same set of commands for the entire development cycle, from source to finish.
+- No need to change your CI configuration when you change your stack since Garden holds the entire stack graph.
+- The only thing you need to install in CI is the Garden CLI and its dependencies (or use a ready-made Garden container image).
+- When using [in-cluster building](../guides/in-cluster-building.md) your CI also uses the same build and test result cache as you and your team, which makes for a much faster pipeline.
 
 To use Garden in your CI pipeline you need the following:
 
@@ -18,14 +18,14 @@ The guide is based on the [Remote Kubernetes](https://docs.garden.io/guides/remo
 
 ## Prerequisites
 
-* A [CircleCI account](https://circleci.com/)
-* A running Kubernetes cluster that you have API access to
+- A [CircleCI account](https://circleci.com/)
+- A running Kubernetes cluster that you have API access to
 
 ## Project overview
 
 The project is based on our basic [demo-project](https://github.com/garden-io/garden/tree/0.12.44/examples/demo-project) example, but configured for multiple environments. Additionally it contains a CircleCI config file. You'll find the entire source code [here](https://github.com/garden-io/ci-demo-project).
 
-The CI pipeline is configured so that Garden tests the project and deploys it to a **preview** environment on every pull request. Additionally, it tests the project and deploys it to a separate **staging** environment on every merge to the `master` branch.
+The CI pipeline is configured so that Garden tests the project and deploys it to a **preview** environment on every pull request. Additionally, it tests the project and deploys it to a separate **staging** environment on every merge to the `main` branch.
 
 To see it in action, you can fork the repository and follow the set-up steps below. Once you've set everything up, you can submit a pull request to the fork to trigger a CircleCI job which in turns deploys the project to your remote Kubernetes cluster.
 
@@ -55,9 +55,9 @@ providers:
 
 Notice that we're using the `CIRCLE_BRANCH` environment variable to label the project namespace. This ensures that each pull request gets deployed into its own namespace.
 
-The `staging` environment is configured in a similar manner. The relevant CI job is triggered on merges to the `master` branch.
+The `staging` environment is configured in a similar manner. The relevant CI job is triggered on merges to the `main` branch.
 
-You'll find the rest of the config [here](https://github.com/garden-io/ci-demo-project/blob/master/garden.yml).
+You'll find the rest of the config [here](https://github.com/garden-io/ci-demo-project/blob/main/garden.yml).
 
 ## Configure the kubectl context
 
@@ -88,13 +88,13 @@ commands:
 
 The commands use the following environment variables that you can set on the **Project Environment Variables** page (see [here](https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-project)) in the CircleCI dashboard:
 
-* `GCLOUD_SERVICE_KEY`: Follow [these instructions](https://cloud.google.com/sdk/docs/authorizing#authorizing_with_a_service_account) to get a service account key.
-* `GCLOUD_PROJECT_ID`, `GCLOUD_COMPUTE_ZONE`,  and `GCLOUD_CLUSTER_ID`: These you'll find under the relevant project in your Google Cloud Platform console.
+- `GCLOUD_SERVICE_KEY`: Follow [these instructions](https://cloud.google.com/sdk/docs/authorizing#authorizing_with_a_service_account) to get a service account key.
+- `GCLOUD_PROJECT_ID`, `GCLOUD_COMPUTE_ZONE`, and `GCLOUD_CLUSTER_ID`: These you'll find under the relevant project in your Google Cloud Platform console.
 
 Please refer to this [doc](https://circleci.com/docs/2.0/google-auth/) for more information on using the Google Cloud SDK in CircleCI.
 
 You'll find the entire CircleCI config for this project
-[here](https://github.com/garden-io/ci-demo-project/blob/master/.circleci/config.yml).
+[here](https://github.com/garden-io/ci-demo-project/blob/main/.circleci/config.yml).
 
 ## Running Garden commands in CircleCI
 
@@ -109,8 +109,8 @@ jobs:
     docker:
       - image: gardendev/garden-gcloud:v0.10.0-1
     environment:
-      GARDEN_LOG_LEVEL: debug     # set the log level to your preference here
-      GARDEN_LOGGER_TYPE: basic   # this is important, since the default logger doesn't play nice with CI :)
+      GARDEN_LOG_LEVEL: debug # set the log level to your preference here
+      GARDEN_LOGGER_TYPE: basic # this is important, since the default logger doesn't play nice with CI :)
     steps:
       - checkout
       - configure_kubectl_context
diff --git a/docs/misc/faq.md b/docs/misc/faq.md
index 5f7875d2d0..3af909d849 100644
--- a/docs/misc/faq.md
+++ b/docs/misc/faq.md
@@ -33,7 +33,7 @@ Both, actually.
 
 We aim to change to this behavior and make it more user-friendly with our next major release.
 
-### When should I use the module-level `include`/`exclude` fields? How are they different from the project-level  `module.include/module.exclude` fields? What about ignore files?
+### When should I use the module-level `include`/`exclude` fields? How are they different from the project-level `module.include/module.exclude` fields? What about ignore files?
 
 Read all about it in [this section](https://docs.garden.io/using-garden/configuration-overview#including-excluding-files-and-directories) of our docs.
 
@@ -69,7 +69,7 @@ See [this example project](https://github.com/garden-io/garden/tree/0.12.44/exam
 
 ### Can I use runtime variables in container builds (e.g. from tasks)?
 
-No, only *modules* can be build dependencies and runtime outputs come from *tasks*, *tests*, and *services*.
+No, only _modules_ can be build dependencies and runtime outputs come from _tasks_, _tests_, and _services_.
 
 ### How do I view container build logs?
 
@@ -103,7 +103,6 @@ dockerfile: dockerfiles/api.Dockerfile
 include: [api/**/*]
 
 ---
-
 kind: Module
 name: frontend
 dockerfile: dockerfiles/frontend.Dockerfile
@@ -120,7 +119,7 @@ See [this example project](https://github.com/garden-io/garden/tree/0.12.44/exam
 
 ### How do I add Docker specific flags to the build command?
 
-Use the module-level  [`extraFlags` field](https://docs.garden.io/module-types/container#extraflags).
+Use the module-level [`extraFlags` field](https://docs.garden.io/module-types/container#extraflags).
 
 ### How do I use different Dockerfiles for different environments?
 
@@ -298,7 +297,7 @@ Garden also optionally installs Nginx. The `local-kubernetes` provider defaults
 
 Furthermore, the `openfaas` provider installs some components necessary for OpenFaas to work.
 
-Of course, we use Garden to install these components, and you’ll find the Garden modules for them in [in our source code](https://github.com/garden-io/garden/tree/master/static) under `kubernetes/system` and `openfaas/system`.
+Of course, we use Garden to install these components, and you’ll find the Garden modules for them in [in our source code](https://github.com/garden-io/garden/tree/main/static) under `kubernetes/system` and `openfaas/system`.
 
 ### How does Garden resolve the `*.local.app.garden` domain?
 
@@ -316,4 +315,4 @@ We have a team of people working on it full-time, and we make it a priority to a
 
 ### Does Garden work offline?
 
-Garden is not currently designed to work in air-gapped environments This would require a fair amount of workarounds, unfortunately.
\ No newline at end of file
+Garden is not currently designed to work in air-gapped environments This would require a fair amount of workarounds, unfortunately.
diff --git a/docs/reference/module-template-config.md b/docs/reference/module-template-config.md
index 272908e232..d2b500538e 100644
--- a/docs/reference/module-template-config.md
+++ b/docs/reference/module-template-config.md
@@ -438,9 +438,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
diff --git a/docs/reference/module-types/configmap.md b/docs/reference/module-types/configmap.md
index 3fa8ee4f87..dde8aaf944 100644
--- a/docs/reference/module-types/configmap.md
+++ b/docs/reference/module-types/configmap.md
@@ -352,9 +352,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -534,9 +534,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/conftest.md b/docs/reference/module-types/conftest.md
index 5b08681d24..a09bf87e0f 100644
--- a/docs/reference/module-types/conftest.md
+++ b/docs/reference/module-types/conftest.md
@@ -363,9 +363,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -564,9 +564,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/container.md b/docs/reference/module-types/container.md
index 2b140fbc46..c90a3a3e5d 100644
--- a/docs/reference/module-types/container.md
+++ b/docs/reference/module-types/container.md
@@ -311,7 +311,7 @@ services:
     # Health checks are disabled for services running in local mode.
     #
     # See the [Local Mode
-    # guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more
+    # guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more
     # information.
     localMode:
       # The working port of the local application.
@@ -914,9 +914,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -1381,9 +1381,9 @@ The default permission bits, specified as an octal, to set on directories at the
 
 Set the default owner of files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `services[].devMode.sync[].defaultGroup`
 
@@ -1391,9 +1391,9 @@ Set the default owner of files and directories at the target. Specify either an
 
 Set the default group on files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `services[].localMode`
 
@@ -1409,7 +1409,7 @@ Local mode always takes the precedence over dev mode if there are any conflictin
 
 Health checks are disabled for services running in local mode.
 
-See the [Local Mode guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more information.
+See the [Local Mode guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more information.
 
 | Type     | Required |
 | -------- | -------- |
@@ -2766,9 +2766,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/exec.md b/docs/reference/module-types/exec.md
index 11a1f413c4..9732508d47 100644
--- a/docs/reference/module-types/exec.md
+++ b/docs/reference/module-types/exec.md
@@ -550,9 +550,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -1106,9 +1106,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/hadolint.md b/docs/reference/module-types/hadolint.md
index 6f529f8c59..6fe7a70b60 100644
--- a/docs/reference/module-types/hadolint.md
+++ b/docs/reference/module-types/hadolint.md
@@ -351,9 +351,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -517,9 +517,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/helm.md b/docs/reference/module-types/helm.md
index 1e9a4f8adc..e856835c0e 100644
--- a/docs/reference/module-types/helm.md
+++ b/docs/reference/module-types/helm.md
@@ -261,7 +261,7 @@ devMode:
 # Health checks are disabled for services running in local mode.
 #
 # See the [Local Mode
-# guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more
+# guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more
 # information.
 localMode:
   # The working port of the local application.
@@ -805,9 +805,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -1104,9 +1104,9 @@ The default permission bits, specified as an octal, to set on directories at the
 
 Set the default owner of files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `devMode.sync[].defaultGroup`
 
@@ -1114,9 +1114,9 @@ Set the default owner of files and directories at the target. Specify either an
 
 Set the default group on files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `devMode.containerName`
 
@@ -1145,7 +1145,7 @@ Local mode always takes the precedence over dev mode if there are any conflictin
 
 Health checks are disabled for services running in local mode.
 
-See the [Local Mode guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more information.
+See the [Local Mode guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more information.
 
 | Type     | Required |
 | -------- | -------- |
@@ -2092,9 +2092,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/jib-container.md b/docs/reference/module-types/jib-container.md
index e73eaa537a..3448fa6959 100644
--- a/docs/reference/module-types/jib-container.md
+++ b/docs/reference/module-types/jib-container.md
@@ -352,7 +352,7 @@ services:
     # Health checks are disabled for services running in local mode.
     #
     # See the [Local Mode
-    # guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more
+    # guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more
     # information.
     localMode:
       # The working port of the local application.
@@ -1052,9 +1052,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -1519,9 +1519,9 @@ The default permission bits, specified as an octal, to set on directories at the
 
 Set the default owner of files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `services[].devMode.sync[].defaultGroup`
 
@@ -1529,9 +1529,9 @@ Set the default owner of files and directories at the target. Specify either an
 
 Set the default group on files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `services[].localMode`
 
@@ -1547,7 +1547,7 @@ Local mode always takes the precedence over dev mode if there are any conflictin
 
 Health checks are disabled for services running in local mode.
 
-See the [Local Mode guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more information.
+See the [Local Mode guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more information.
 
 | Type     | Required |
 | -------- | -------- |
@@ -2904,9 +2904,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/kubernetes.md b/docs/reference/module-types/kubernetes.md
index 99f18f7bad..015d5451cd 100644
--- a/docs/reference/module-types/kubernetes.md
+++ b/docs/reference/module-types/kubernetes.md
@@ -247,7 +247,7 @@ devMode:
 # Health checks are disabled for services running in local mode.
 #
 # See the [Local Mode
-# guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more
+# guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more
 # information.
 localMode:
   # The working port of the local application.
@@ -746,9 +746,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -999,9 +999,9 @@ The default permission bits, specified as an octal, to set on directories at the
 
 Set the default owner of files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `devMode.sync[].defaultGroup`
 
@@ -1009,9 +1009,9 @@ Set the default owner of files and directories at the target. Specify either an
 
 Set the default group on files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `devMode.containerName`
 
@@ -1040,7 +1040,7 @@ Local mode always takes the precedence over dev mode if there are any conflictin
 
 Health checks are disabled for services running in local mode.
 
-See the [Local Mode guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more information.
+See the [Local Mode guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more information.
 
 | Type     | Required |
 | -------- | -------- |
@@ -1128,9 +1128,9 @@ Resolve the specified kustomization and include the resulting resources. Note th
 
 The directory path where the desired kustomization.yaml is, or a git repository URL. This could be the path to an overlay directory, for example. If it's a path, must be a relative POSIX-style path and must be within the module root. Defaults to the module root. If you set this to null, kustomize will not be run.
 
-| Type                 | Default | Required |
-| -------------------- | ------- | -------- |
-| `posixPath | string` | `"."`   | No       |
+| Type                  | Default | Required |
+| --------------------- | ------- | -------- |
+| `posixPath \| string` | `"."`   | No       |
 
 ### `kustomize.extraArgs[]`
 
@@ -1903,9 +1903,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/maven-container.md b/docs/reference/module-types/maven-container.md
index 899ed3f926..a416c31f0d 100644
--- a/docs/reference/module-types/maven-container.md
+++ b/docs/reference/module-types/maven-container.md
@@ -311,7 +311,7 @@ services:
     # Health checks are disabled for services running in local mode.
     #
     # See the [Local Mode
-    # guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more
+    # guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more
     # information.
     localMode:
       # The working port of the local application.
@@ -924,9 +924,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -1391,9 +1391,9 @@ The default permission bits, specified as an octal, to set on directories at the
 
 Set the default owner of files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `services[].devMode.sync[].defaultGroup`
 
@@ -1401,9 +1401,9 @@ Set the default owner of files and directories at the target. Specify either an
 
 Set the default group on files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `services[].localMode`
 
@@ -1419,7 +1419,7 @@ Local mode always takes the precedence over dev mode if there are any conflictin
 
 Health checks are disabled for services running in local mode.
 
-See the [Local Mode guide](https://github.com/garden-io/garden/blob/master/docs/guides/running-service-in-local-mode.md) for more information.
+See the [Local Mode guide](https://github.com/garden-io/garden/blob/main/docs/guides/running-service-in-local-mode.md) for more information.
 
 | Type     | Required |
 | -------- | -------- |
@@ -2829,9 +2829,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/openfaas.md b/docs/reference/module-types/openfaas.md
index 1e446ee011..d721485048 100644
--- a/docs/reference/module-types/openfaas.md
+++ b/docs/reference/module-types/openfaas.md
@@ -382,9 +382,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -651,9 +651,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/persistentvolumeclaim.md b/docs/reference/module-types/persistentvolumeclaim.md
index 17b667b3ee..4a53a14109 100644
--- a/docs/reference/module-types/persistentvolumeclaim.md
+++ b/docs/reference/module-types/persistentvolumeclaim.md
@@ -404,9 +404,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -726,9 +726,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/pulumi.md b/docs/reference/module-types/pulumi.md
index 854593e5a4..6a3f7b3c69 100644
--- a/docs/reference/module-types/pulumi.md
+++ b/docs/reference/module-types/pulumi.md
@@ -429,9 +429,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -733,9 +733,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
@@ -781,9 +781,9 @@ A map of all the outputs returned by the Pulumi stack.
 
 ### `${runtime.services.<service-name>.outputs.<name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 
 ### Task Outputs
diff --git a/docs/reference/module-types/templated.md b/docs/reference/module-types/templated.md
index 460e00ebbd..4c66d18c5c 100644
--- a/docs/reference/module-types/templated.md
+++ b/docs/reference/module-types/templated.md
@@ -357,9 +357,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -533,9 +533,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
diff --git a/docs/reference/module-types/terraform.md b/docs/reference/module-types/terraform.md
index b676f693b2..0be8fafc6d 100644
--- a/docs/reference/module-types/terraform.md
+++ b/docs/reference/module-types/terraform.md
@@ -377,9 +377,9 @@ A remote repository URL. Currently only supports git servers. Must contain a has
 
 Garden will import the repository source code into this module, but read the module's config from the local garden.yml file.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | No       |
 
 Example:
 
@@ -594,9 +594,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
@@ -642,9 +642,9 @@ A map of all the outputs defined in the Terraform stack.
 
 ### `${runtime.services.<service-name>.outputs.<name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 
 ### Task Outputs
diff --git a/docs/reference/project-config.md b/docs/reference/project-config.md
index f3c2bef33b..f343a19a74 100644
--- a/docs/reference/project-config.md
+++ b/docs/reference/project-config.md
@@ -591,9 +591,9 @@ outputs:
 The value for the output. Must be a primitive (string, number, boolean or null). May also be any valid template
 string.
 
-| Type                        | Required |
-| --------------------------- | -------- |
-| `string | number | boolean` | Yes      |
+| Type                          | Required |
+| ----------------------------- | -------- |
+| `string \| number \| boolean` | Yes      |
 
 Example:
 
@@ -633,9 +633,9 @@ sources:
 
 A remote repository URL. Currently only supports git servers. Must contain a hash suffix pointing to a specific branch or tag, with the format: <git remote url>#<branch|tag>
 
-| Type              | Required |
-| ----------------- | -------- |
-| `gitUrl | string` | Yes      |
+| Type               | Required |
+| ------------------ | -------- |
+| `gitUrl \| string` | Yes      |
 
 Example:
 
diff --git a/docs/reference/providers/kubernetes.md b/docs/reference/providers/kubernetes.md
index a8e510c706..4c58fecc93 100644
--- a/docs/reference/providers/kubernetes.md
+++ b/docs/reference/providers/kubernetes.md
@@ -1132,9 +1132,9 @@ The default permission bits, specified as an octal, to set on directories at the
 
 Set the default owner of files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `providers[].devMode.defaults.group`
 
@@ -1142,9 +1142,9 @@ Set the default owner of files and directories at the target. Specify either an
 
 Set the default group on files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `providers[].forceSsl`
 
@@ -2434,9 +2434,9 @@ You can specify a string as a shorthand for `name: <name>`. Defaults to `<projec
 
 Note that the framework may generate other namespaces as well with this name as a prefix. Also note that if the namespace previously exists, Garden will attempt to add the specified labels and annotations. If the user does not have permissions to do so, a warning is shown.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `object | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `object \| string` | No       |
 
 ### `providers[].namespace.name`
 
diff --git a/docs/reference/providers/local-kubernetes.md b/docs/reference/providers/local-kubernetes.md
index 506c1eb309..654e471ea2 100644
--- a/docs/reference/providers/local-kubernetes.md
+++ b/docs/reference/providers/local-kubernetes.md
@@ -1081,9 +1081,9 @@ The default permission bits, specified as an octal, to set on directories at the
 
 Set the default owner of files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `providers[].devMode.defaults.group`
 
@@ -1091,9 +1091,9 @@ Set the default owner of files and directories at the target. Specify either an
 
 Set the default group on files and directories at the target. Specify either an integer ID or a string name. See the [Mutagen docs](https://mutagen.io/documentation/synchronization/permissions#owners-and-groups) for more information.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `number | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `number \| string` | No       |
 
 ### `providers[].forceSsl`
 
@@ -2254,9 +2254,9 @@ providers:
 
 Specify which namespace to deploy services to (defaults to the project name). Note that the framework generates other namespaces as well with this name as a prefix.
 
-| Type              | Required |
-| ----------------- | -------- |
-| `object | string` | No       |
+| Type               | Required |
+| ------------------ | -------- |
+| `object \| string` | No       |
 
 ### `providers[].namespace.name`
 
diff --git a/docs/reference/template-strings/custom-commands.md b/docs/reference/template-strings/custom-commands.md
index 49cde48468..985b52f185 100644
--- a/docs/reference/template-strings/custom-commands.md
+++ b/docs/reference/template-strings/custom-commands.md
@@ -301,9 +301,9 @@ A map of all variables defined in the command configuration.
 
 ### `${variables.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${var.*}`
 
@@ -317,9 +317,9 @@ Alias for the variables field.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${args.*}`
 
@@ -357,9 +357,9 @@ Every argument following -- on the command line.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${opts.*}`
 
@@ -373,7 +373,7 @@ Map of all options, as defined in the Command spec.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
diff --git a/docs/reference/template-strings/environments.md b/docs/reference/template-strings/environments.md
index 4189936d63..015f42a852 100644
--- a/docs/reference/template-strings/environments.md
+++ b/docs/reference/template-strings/environments.md
@@ -309,9 +309,9 @@ A map of all variables defined in the project configuration.
 
 ### `${variables.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${var.*}`
 
@@ -325,7 +325,7 @@ Alias for the variables field.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
diff --git a/docs/reference/template-strings/modules.md b/docs/reference/template-strings/modules.md
index d91d3e5ba9..1ab05f1888 100644
--- a/docs/reference/template-strings/modules.md
+++ b/docs/reference/template-strings/modules.md
@@ -315,9 +315,9 @@ A map of all variables defined in the project configuration, including environme
 
 ### `${variables.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${var.*}`
 
@@ -331,9 +331,9 @@ Alias for the variables field.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${environment.*}`
 
@@ -405,9 +405,9 @@ The resolved configuration for the provider.
 
 The provider config key value. Refer to individual [provider references](https://docs.garden.io/reference/providers) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${providers.<provider-name>.outputs.*}`
 
@@ -421,9 +421,9 @@ The outputs defined by the provider (see individual plugin docs for details).
 
 The provider output value. Refer to individual [provider references](https://docs.garden.io/reference/providers) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${modules.*}`
 
@@ -481,9 +481,9 @@ The outputs defined by the module (see individual module type [references](https
 
 The module output value. Refer to individual [module type references](https://docs.garden.io/reference/module-types) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${modules.<module-name>.var.*}`
 
@@ -495,9 +495,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
@@ -541,9 +541,9 @@ The runtime outputs defined by the service (see individual module type [referenc
 
 The service output value. Refer to individual [module type references](https://docs.garden.io/reference/module-types) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${runtime.services.<service-name>.version}`
 
@@ -579,9 +579,9 @@ The runtime outputs defined by the task (see individual module type [references]
 
 The task output value. Refer to individual [module type references](https://docs.garden.io/reference/module-types) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${runtime.tasks.<task-name>.version}`
 
@@ -607,9 +607,9 @@ The inputs provided to the module through a undefined, if applicable.
 
 ### `${inputs.<input-key>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${parent.*}`
 
diff --git a/docs/reference/template-strings/project-outputs.md b/docs/reference/template-strings/project-outputs.md
index 6cfd789054..b3f5f80960 100644
--- a/docs/reference/template-strings/project-outputs.md
+++ b/docs/reference/template-strings/project-outputs.md
@@ -315,9 +315,9 @@ A map of all variables defined in the project configuration, including environme
 
 ### `${variables.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${var.*}`
 
@@ -331,9 +331,9 @@ Alias for the variables field.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${environment.*}`
 
@@ -405,9 +405,9 @@ The resolved configuration for the provider.
 
 The provider config key value. Refer to individual [provider references](https://docs.garden.io/reference/providers) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${providers.<provider-name>.outputs.*}`
 
@@ -421,9 +421,9 @@ The outputs defined by the provider (see individual plugin docs for details).
 
 The provider output value. Refer to individual [provider references](https://docs.garden.io/reference/providers) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${modules.*}`
 
@@ -481,9 +481,9 @@ The outputs defined by the module (see individual module type [references](https
 
 The module output value. Refer to individual [module type references](https://docs.garden.io/reference/module-types) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${modules.<module-name>.var.*}`
 
@@ -495,9 +495,9 @@ A map of all variables defined in the module.
 
 ### `${modules.<module-name>.var.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${modules.<module-name>.version}`
 
@@ -541,9 +541,9 @@ The runtime outputs defined by the service (see individual module type [referenc
 
 The service output value. Refer to individual [module type references](https://docs.garden.io/reference/module-types) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${runtime.services.<service-name>.version}`
 
@@ -579,9 +579,9 @@ The runtime outputs defined by the task (see individual module type [references]
 
 The task output value. Refer to individual [module type references](https://docs.garden.io/reference/module-types) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${runtime.tasks.<task-name>.version}`
 
diff --git a/docs/reference/template-strings/providers.md b/docs/reference/template-strings/providers.md
index e4113ab69b..78a6a4138b 100644
--- a/docs/reference/template-strings/providers.md
+++ b/docs/reference/template-strings/providers.md
@@ -311,9 +311,9 @@ A map of all variables defined in the project configuration, including environme
 
 ### `${variables.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${var.*}`
 
@@ -327,9 +327,9 @@ Alias for the variables field.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${environment.*}`
 
@@ -401,9 +401,9 @@ The resolved configuration for the provider.
 
 The provider config key value. Refer to individual [provider references](https://docs.garden.io/reference/providers) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${providers.<provider-name>.outputs.*}`
 
@@ -417,7 +417,7 @@ The outputs defined by the provider (see individual plugin docs for details).
 
 The provider output value. Refer to individual [provider references](https://docs.garden.io/reference/providers) for details.
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
diff --git a/docs/reference/template-strings/remote-sources.md b/docs/reference/template-strings/remote-sources.md
index 51a1274970..f0bb2ba4eb 100644
--- a/docs/reference/template-strings/remote-sources.md
+++ b/docs/reference/template-strings/remote-sources.md
@@ -309,9 +309,9 @@ A map of all variables defined in the project configuration, including environme
 
 ### `${variables.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${var.*}`
 
@@ -325,9 +325,9 @@ Alias for the variables field.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${environment.*}`
 
diff --git a/docs/reference/template-strings/workflows.md b/docs/reference/template-strings/workflows.md
index 8ed66fb9c7..4556320506 100644
--- a/docs/reference/template-strings/workflows.md
+++ b/docs/reference/template-strings/workflows.md
@@ -311,9 +311,9 @@ A map of all variables defined in the project configuration, including environme
 
 ### `${variables.<variable-name>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
 ### `${var.*}`
 
@@ -327,9 +327,9 @@ Alias for the variables field.
 
 Number, string or boolean
 
-| Type                        |
-| --------------------------- |
-| `string | number | boolean` |
+| Type                          |
+| ----------------------------- |
+| `string \| number \| boolean` |
 
 ### `${environment.*}`
 
@@ -411,7 +411,7 @@ for its output schema.
 
 ### `${steps.<step-name>.outputs.<output-key>}`
 
-| Type                                             |
-| ------------------------------------------------ |
-| `string | number | boolean | link | array[link]` |
+| Type                                                 |
+| ---------------------------------------------------- |
+| `string \| number \| boolean \| link \| array[link]` |
 
diff --git a/examples/disabled-configs/README.md b/examples/disabled-configs/README.md
index 165ebb207f..90409b7117 100644
--- a/examples/disabled-configs/README.md
+++ b/examples/disabled-configs/README.md
@@ -1,6 +1,6 @@
 # Disabled configs example project
 
-A simple variation on the [demo-project](https://github.com/garden-io/garden/blob/master/examples/demo-project/README.md) where the `backend` module, and the `integ` test in the `frontend` module, are disabled for the `local` environment.
+A simple variation on the [demo-project](https://github.com/garden-io/garden/blob/main/examples/demo-project/README.md) where the `backend` module, and the `integ` test in the `frontend` module, are disabled for the `local` environment.
 
 The `backend` config then looks like this:
 
diff --git a/examples/local-exec/backend/go.mod b/examples/local-exec/backend/go.mod
index 6f704dfa79..a67ca184f4 100644
--- a/examples/local-exec/backend/go.mod
+++ b/examples/local-exec/backend/go.mod
@@ -1,3 +1,3 @@
-module github.com/garden-io/garden/tree/master/examples/local-exec/backend
+module github.com/garden-io/garden/tree/main/examples/local-exec/backend
 
 go 1.18
diff --git a/examples/local-service/README.md b/examples/local-service/README.md
index 3519f0a200..1753b8ef56 100644
--- a/examples/local-service/README.md
+++ b/examples/local-service/README.md
@@ -5,7 +5,7 @@ remotely but frontend services locally.
 
 ## Project Structure
 
-This project is based on the [demo-project](https://github.com/garden-io/garden/tree/master/examples/demo-project) and contains a `backend` module, a
+This project is based on the [demo-project](https://github.com/garden-io/garden/tree/main/examples/demo-project) and contains a `backend` module, a
 `frontend` module and a `frontend-local` module.
 
 Here's an excerpt from the `frontend` config:
@@ -23,7 +23,6 @@ variables:
 # ...
 
 ---
-
 kind: Module
 name: frontend-local
 type: exec # <--- This is a "local exec module"
@@ -65,4 +64,3 @@ You can now stream logs from both the local and remote services with the logs co
 ```console
 garden logs --follow
 ```
-
diff --git a/examples/remote-sources/garden.yml b/examples/remote-sources/garden.yml
index b357ad6f3a..9fcba4e9e6 100644
--- a/examples/remote-sources/garden.yml
+++ b/examples/remote-sources/garden.yml
@@ -5,7 +5,7 @@ sources:
     # use #your-branch to specify a branch or #v0.3.0 to specify a tag
     repositoryUrl: https://github.com/garden-io/garden-example-remote-sources-web-services.git#v0.4.0
   - name: db-services
-    repositoryUrl: https://github.com/garden-io/garden-example-remote-sources-db-services.git#master
+    repositoryUrl: https://github.com/garden-io/garden-example-remote-sources-db-services.git#main
 environments:
   - name: local
     variables:
@@ -24,8 +24,8 @@ providers:
     defaultHostname: ${var.baseHostname}
     buildMode: kaniko
     deploymentRegistry:
-      hostname: eu.gcr.io    # <- set this according to the region your cluster runs in
-      namespace: garden-ci   # <- set this to the project ID of the target cluster
+      hostname: eu.gcr.io # <- set this according to the region your cluster runs in
+      namespace: garden-ci # <- set this to the project ID of the target cluster
     imagePullSecrets:
       # Make sure this matches the name and namespace of the imagePullSecret you've created
       # to authenticate with your registry (if needed)
diff --git a/examples/spring-boot-hot-reload/README.md b/examples/spring-boot-hot-reload/README.md
index 903c83a698..ada45a26f7 100644
--- a/examples/spring-boot-hot-reload/README.md
+++ b/examples/spring-boot-hot-reload/README.md
@@ -8,7 +8,7 @@ You'll need to have Java and [Maven](https://maven.apache.org/install.html) inst
 
 ## Overview
 
-This project consists of a single module (in the `devtools` directory), which is a minimally modified version of the [Spring Boot devtools sample project found here](https://github.com/spring-projects/spring-boot/tree/master/spring-boot-project/spring-boot-devtools).
+This project consists of a single module (in the `devtools` directory), which is a minimally modified version of the [Spring Boot devtools sample project found here](https://github.com/spring-projects/spring-boot/tree/main/spring-boot-project/spring-boot-devtools).
 
 We've changed the parent pom from `spring-boot-samples` to `spring-boot-starter-parent`, and added a dependency on `spring-boot-starter-actuator` (to enable the health check endpoint for k8s readiness and liveness probes). We've also removed the artificial 5 second delay that was added by the `slowRestart` method in `MyController`.
 
@@ -38,8 +38,9 @@ took 67 sec)
 
 🕑  Waiting for code changes
 ```
+
 Open the ingress URL (http://spring-boot-hot-reload.local.app.garden above) in a web browser.
 
 Now, change the value of the `MESSAGE` constant in `devtools/src/main/java/sample/devtools/Message.java` to something else than `"Message"`, and run `mvn compile` (again in the `devtools` directory).
 
-This should trigger a hot reload. Refresh the the browser tab opened earlier, and you should see the change you made reflected in the header text.
\ No newline at end of file
+This should trigger a hot reload. Refresh the the browser tab opened earlier, and you should see the change you made reflected in the header text.
diff --git a/scripts/check-docs.sh b/scripts/check-docs.sh
index 3c1782b169..0094b70669 100755
--- a/scripts/check-docs.sh
+++ b/scripts/check-docs.sh
@@ -6,8 +6,8 @@ yarn run generate-docs
 git diff --quiet HEAD -- docs/ || (echo 'generated docs are not up-to-date! run \"yarn generate-docs\" and commit the changes\n' && exit 1)
 
 # Use "|| true" so we don't exit on empty
-modified_docs=$(git diff --name-status master docs README.md) || true
-modified_examples=$(git diff --name-status master examples | grep "examples.*\README.md$") || true
+modified_docs=$(git diff --name-status main docs README.md) || true
+modified_examples=$(git diff --name-status main examples | grep "examples.*\README.md$") || true
 
 found_dead_links=false
 check_links() {
diff --git a/scripts/release.ts b/scripts/release.ts
index 1ce2672de8..43e0f4cd94 100755
--- a/scripts/release.ts
+++ b/scripts/release.ts
@@ -221,7 +221,7 @@ async function release() {
       https://github.com/garden-io/garden/pull/new/${branchName}\n
 
     Please refer to our contributing docs for the next steps:
-    https://github.com/garden-io/garden/blob/master/CONTRIBUTING.md
+    https://github.com/garden-io/garden/blob/main/CONTRIBUTING.md
   `);
   }
 }
diff --git a/support/install.ps1 b/support/install.ps1
index 8cf927de1e..9baf714766 100644
--- a/support/install.ps1
+++ b/support/install.ps1
@@ -7,7 +7,7 @@
 # 3. Installs or updates the garden binary.
 #
 # To execute it run the following command in PowerShell:
-# Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/garden-io/garden/master/support/install.ps1'))
+# Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/garden-io/garden/main/support/install.ps1'))
 #
 # For more information visit https://docs.garden.io/