diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 2956bdba5c0b..c02e0e0c6e0e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -16,7 +16,7 @@ contact_links:
     url: https://community.signalusers.org/c/support/
     about: Feel free to ask anything
   - name: 📖 Contribution instructions
-    url: https://github.com/signalapp/Signal-Desktop/blob/development/CONTRIBUTING.md
+    url: https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md
     about: Want to contribute to Signal Desktop? Start here.
   - name: ❓ Other issue?
     url: https://community.signalusers.org/
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b5f6e6b3e779..6dc3fd66dc22 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,7 @@ Remember, you can preview this before saving it.
 
 - [ ] My contribution is **not** related to translations. _Please submit translation changes via our [Signal Desktop Transifex project](https://www.transifex.com/signalapp/signal-desktop/)._
 - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/)
-- [ ] My changes are [rebased](https://medium.com/free-code-camp/git-rebase-and-the-golden-rule-explained-70715eccc372) on the latest [`development`](https://github.com/signalapp/Signal-Desktop/tree/development) branch
+- [ ] My changes are [rebased](https://medium.com/free-code-camp/git-rebase-and-the-golden-rule-explained-70715eccc372) on the latest [`main`](https://github.com/signalapp/Signal-Desktop/tree/main) branch
 - [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/signalapp/Signal-Desktop/blob/master/CONTRIBUTING.md#tests))
 - [ ] My changes are ready to be shipped to users
 
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 09b3b7ed074e..f38af114f779 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - development
+      - main
       - '[0-9]+.[0-9]+.x'
   pull_request:
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 286d2f0ce24e..e26ed271b0d8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - development
+      - main
       - '[0-9]+.[0-9]+.x'
   pull_request:
 
@@ -42,7 +43,7 @@ jobs:
   macos:
     needs: lint
     runs-on: macos-11.0
-    if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     timeout-minutes: 30
 
     steps:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 431af7f8c72e..170caed334bc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ ounce of prevention, as they say!](https://www.goodreads.com/quotes/247269-an-ou
 ## Developer Setup
 
 First, you'll need [Node.js](https://nodejs.org/) which matches our current version.
-You can check [`.nvmrc` in the `development` branch](https://github.com/signalapp/Signal-Desktop/blob/development/.nvmrc)
+You can check [`.nvmrc` in the `main` branch](https://github.com/signalapp/Signal-Desktop/blob/main/.nvmrc)
 to see what the current version is. If you have [nvm](https://github.com/creationix/nvm)
 you can just run `nvm use` in the project directory and it will switch to the project's
 desired Node.js version. [nvm for windows](https://github.com/coreybutler/nvm-windows) is
@@ -199,7 +199,7 @@ So you wanna make a pull request? Please observe the following guidelines.
   automatically based on that file and then periodically uploaded to Transifex for
   translation.
 - [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your
-  changes on the latest `development` branch, resolving any conflicts.
+  changes on the latest `main` branch, resolving any conflicts.
   This ensures that your changes will merge cleanly when you open your PR.
 - Be sure to add and run tests!
 - Make sure the diff between the development branch and your branch contains only the
diff --git a/README.md b/README.md
index f7cdc5b286d1..3f387db2c42a 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ https://www.transifex.com/projects/p/signal-desktop
 
 ## Contributing Code
 
-Please see [CONTRIBUTING.md](https://github.com/signalapp/Signal-Desktop/blob/development/CONTRIBUTING.md)
+Please see [CONTRIBUTING.md](https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md)
 for setup instructions and guidelines for new contributors. Don't forget to sign the [CLA](https://signal.org/cla/).
 
 ## Contributing Funds
diff --git a/ts/components/About.tsx b/ts/components/About.tsx
index bbe30a5ce0a6..4a4b2a2a89a2 100644
--- a/ts/components/About.tsx
+++ b/ts/components/About.tsx
@@ -34,7 +34,7 @@ export const About = ({
         <div>
           <a
             className="acknowledgments"
-            href="https://github.com/signalapp/Signal-Desktop/blob/development/ACKNOWLEDGMENTS.md"
+            href="https://github.com/signalapp/Signal-Desktop/blob/main/ACKNOWLEDGMENTS.md"
           >
             {i18n('softwareAcknowledgments')}
           </a>