diff --git a/.cirrus.yml b/.cirrus.yml
index 4a0c6df..92aabeb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 container:
   # official cockpit CI container, with cockpit related build and test dependencies
   # if you want to use your own, see the documentation about required packages:
-  # https://github.com/cockpit-project/cockpit/blob/master/HACKING.md#getting-the-development-dependencies
+  # https://github.com/cockpit-project/cockpit/blob/main/HACKING.md#getting-the-development-dependencies
   image: quay.io/cockpit/tasks
   kvm: true
   # increase this if you have many tests that benefit from parallelism
diff --git a/Makefile b/Makefile
index 2bb5dfb..fc61ece 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ check: $(NODE_MODULES_TEST) $(VM_IMAGE) test/common
 	TEST_AUDIT_NO_SELINUX=1 test/common/run-tests
 
 # checkout Cockpit's bots for standard test VM images and API to launch them
-# must be from master, as only that has current and existing images; but testvm.py API is stable
+# must be from main, as only that has current and existing images; but testvm.py API is stable
 # support CI testing against a bots change
 bots:
 	git clone --quiet --reference-if-able $${XDG_CACHE_HOME:-$$HOME/.cache}/cockpit-project/bots https://github.com/cockpit-project/bots.git
diff --git a/README.md b/README.md
index 52aec3f..7b9e3c2 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ Run `make check` to build an RPM, install it into a standard Cockpit test VM
 it. This uses Cockpit's Chrome DevTools Protocol based browser tests, through a
 Python API abstraction. Note that this API is not guaranteed to be stable, so
 if you run into failures and don't want to adjust tests, consider checking out
-Cockpit's test/common from a tag instead of master (see the `test/common`
+Cockpit's test/common from a tag instead of main (see the `test/common`
 target in `Makefile`).
 
 After the test VM is prepared, you can manually run the test without rebuilding
@@ -101,7 +101,7 @@ To run the tests in the exact same way for upstream pull requests and for
 tests are wrapped in the [FMF metadata format](https://github.com/psss/fmf)
 for using with the [tmt test management tool](https://docs.fedoraproject.org/en-US/ci/tmt/).
 Note that Packit tests can *not* run their own virtual machine images, thus
-they only run [@nondestructive tests](https://github.com/martinpitt/cockpit/blob/master/test/common/testlib.py).
+they only run [@nondestructive tests](https://github.com/martinpitt/cockpit/blob/main/test/common/testlib.py).
 
 # Customizing
 
@@ -115,7 +115,7 @@ change:
 # Automated release
 
 Once your cloned project is ready for a release, you should consider automating
-that.  [Cockpituous release](https://github.com/cockpit-project/cockpituous/tree/master/release)
+that.  [Cockpituous release](https://github.com/cockpit-project/cockpituous/tree/main/release)
 aims to fully automate project releases to GitHub, Fedora, Ubuntu, COPR, Docker
 Hub, and other places. The intention is that the only manual step for releasing
 a project is to create a signed tag for the version number; pushing the tag
@@ -130,7 +130,7 @@ up secrets and run cockpituous.
 
 It is important to keep your [NPM modules](./package.json) up to date, to keep
 up with security updates and bug fixes. This is done with the
-[npm-update bot script](https://github.com/cockpit-project/bots/blob/master/npm-update)
+[npm-update bot script](https://github.com/cockpit-project/bots/blob/main/npm-update)
 which is run weekly or upon [manual request](https://github.com/cockpit-project/starter-kit/actions) through the
 [npm-update.yml](.github/workflows/npm-update.yml) [GitHub action](https://github.com/features/actions).
 
diff --git a/cockpituous-release b/cockpituous-release
index f53ec27..7aebbf1 100644
--- a/cockpituous-release
+++ b/cockpituous-release
@@ -1,5 +1,5 @@
 # This is a script run to release this project through Cockpituous:
-# https://github.com/cockpit-project/cockpituous/tree/master/release
+# https://github.com/cockpit-project/cockpituous/tree/main/release
 
 # Anything that start with 'job' may run in a way that it SIGSTOP's
 # itself when preliminary preparition and then gets a SIGCONT in
@@ -23,7 +23,7 @@ job release-srpm -V
 ## Authenticate for pushing into Fedora dist-git
 # cat ~/.fedora-password | kinit yourfedorauser@FEDORAPROJECT.ORG
 ## Do fedora builds for the tag, using tarball
-# job release-koji -k master
+# job release-koji -k main
 # job release-koji f33
 # job release-bodhi F33
 
diff --git a/test/browser/browser.sh b/test/browser/browser.sh
index 7457dc9..4a48f9e 100755
--- a/test/browser/browser.sh
+++ b/test/browser/browser.sh
@@ -39,7 +39,7 @@ if ! id runtest 2>/dev/null; then
     useradd -c 'Test runner' runtest
     # allow test to set up things on the machine
     mkdir -p /root/.ssh
-    curl https://raw.githubusercontent.com/cockpit-project/bots/master/machine/identity.pub  >> /root/.ssh/authorized_keys
+    curl https://raw.githubusercontent.com/cockpit-project/bots/main/machine/identity.pub  >> /root/.ssh/authorized_keys
     chmod 600 /root/.ssh/authorized_keys
 fi
 chown -R runtest "$SOURCE"
diff --git a/test/check-application b/test/check-application
index 4227c2d..b149d16 100755
--- a/test/check-application
+++ b/test/check-application
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # Run this with --help to see available options for tracing and debugging
-# See https://github.com/cockpit-project/cockpit/blob/master/test/common/testlib.py
+# See https://github.com/cockpit-project/cockpit/blob/main/test/common/testlib.py
 # "class Browser" and "class MachineCase" for the available API.
 
 import os