diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index a6a17fa89f5c21247c593116db16c0dd193cf452..35bf4dc7efab6a0ef4d505a3c3188f25fce6bc1d 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -14,7 +14,7 @@ on:
       - checks_requested
   pull_request:
     branches:
-      - master
+      - trunk
 
 concurrency:
   group: ${{ github.ref }}
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index 5279ae35401f42a3eab15108644ec789ea4fb704..98d44d480cef381aba847ca3227043e0b7d2cbc1 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -3,9 +3,11 @@ name: scan
 
 on:
   push:
-    branches: [master]
+    branches:
+      - trunk
   pull_request:
-    branches: [master]
+    branches:
+      - trunk
   schedule:
     - cron: '0 12 * * 6'
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5dd21f194c0258e08373dabd194e173c161426db..2665fa7e326834f479c2ce55205ccf38d9c5797a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -348,8 +348,8 @@ ______________________________________________________________________
 [doc/design/model]: ./doc/design/data-model.md
 [envrc]: ./.envrc
 [example-entity]: ./entity/dag/example_test.go
-[install/direnv]: https://github.com/direnv/direnv/blob/master/docs/installation.md
-[install/direnv/shell]: https://github.com/direnv/direnv/blob/master/docs/hook.md
+[install/direnv]: https://github.com/direnv/direnv/blob/trunk/docs/installation.md
+[install/direnv/shell]: https://github.com/direnv/direnv/blob/trunk/docs/hook.md
 [install/nix]: https://nix.dev/install-nix
 [issue/1364]: https://github.com/git-bug/git-bug/issues/1364
 [treefmt]: ./treefmt.nix
diff --git a/README.md b/README.md
index 4c01c488915d14d7ed8e7688789b6734009aa511..c8a6b2ab363534ca0126960a1c0c2ed666bc5091 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <div align="center">
 
-<img width="64px" src="https://cdn.rawgit.com/git-bug/git-bug/master/misc/logo/logo-alpha-flat-bg.svg">
+<img width="64px" src="https://cdn.rawgit.com/git-bug/git-bug/trunk/misc/logo/logo-alpha-flat-bg.svg">
 
 # git-bug: a decentralized issue tracker
 
diff --git a/bridge/jira/config.go b/bridge/jira/config.go
index 22ce1dcaddefe4615b9ae7e0457b80a114510f2a..ea90352559f7f30696b0c8db5dcce1d04d14cbe8 100644
--- a/bridge/jira/config.go
+++ b/bridge/jira/config.go
@@ -15,7 +15,7 @@ const moreConfigText = `
 NOTE: There are a few optional configuration values that you can additionally
 set in your git configuration to influence the behavior of the bridge. Please
 see the notes at:
-https://github.com/git-bug/git-bug/blob/master/doc/jira_bridge.md
+https://github.com/git-bug/git-bug/blob/trunk/doc/jira_bridge.md
 `
 
 const credTypeText = `
diff --git a/entity/dag/example_test.go b/entity/dag/example_test.go
index 3ffdb4fcfa9bcddc8706c6dd9a2c3237b8009d96..cb2a53835ff7c587ee24fd67acef2a33721a047e 100644
--- a/entity/dag/example_test.go
+++ b/entity/dag/example_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 // Note: you can find explanations about the underlying data model here:
-// https://github.com/git-bug/git-bug/blob/master/doc/design/data-model.md
+// https://github.com/git-bug/git-bug/blob/trunk/doc/design/data-model.md
 
 // This file explains how to define a replicated data structure, stored in and using git as a medium for
 // synchronisation. To do this, we'll use the entity/dag package, which will do all the complex handling.