diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index eebc9bc2e..2496b0d55 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ on:
       - "*"
   push:
     branches:
-      - master
+      - main
 
 jobs:
   lint:
diff --git a/Makefile b/Makefile
index a5ce7ccce..b398cdba5 100644
--- a/Makefile
+++ b/Makefile
@@ -278,9 +278,9 @@ release:
 	@echo
 	@echo "        git tag -s -m 'osbuild-composer $(NEXT_VERSION)' v$(NEXT_VERSION) HEAD"
 	@echo
-	@echo " * Push master as well as the tag:"
+	@echo " * Push main as well as the tag:"
 	@echo
-	@echo "        git push origin master"
+	@echo "        git push origin main"
 	@echo "        git push origin v$(NEXT_VERSION)"
 	@echo
 	@echo " * Create a release on github. Use 'NEWS.md' verbatim from the"
diff --git a/schutzbot/Jenkinsfile b/schutzbot/Jenkinsfile
index a0a97b4f1..272a65dec 100644
--- a/schutzbot/Jenkinsfile
+++ b/schutzbot/Jenkinsfile
@@ -284,8 +284,8 @@ pipeline {
         success {
             node('schutzbot') {
                 script {
-                    if (env.BRANCH_NAME == 'master') {
-                        telegramSend "💚 CI passed for osbuild-composer master branch ${env.BUILD_URL}"
+                    if (env.BRANCH_NAME == 'main') {
+                        telegramSend "💚 CI passed for osbuild-composer main branch ${env.BUILD_URL}"
                     }
                 }
             }
@@ -293,8 +293,8 @@ pipeline {
         unsuccessful {
             node('schutzbot') {
                 script {
-                    if (env.BRANCH_NAME == 'master') {
-                        telegramSend "💣 CI failed for osbuild-composer master branch ${env.BUILD_URL}"
+                    if (env.BRANCH_NAME == 'main') {
+                        telegramSend "💣 CI failed for osbuild-composer main branch ${env.BUILD_URL}"
                     }
                 }
             }
diff --git a/test/cases/image_tests.sh b/test/cases/image_tests.sh
index 2f2dafc64..2a0d92c7c 100755
--- a/test/cases/image_tests.sh
+++ b/test/cases/image_tests.sh
@@ -59,7 +59,7 @@ run_test_case () {
     AZURE_CREDS=${AZURE_CREDS-/dev/null}
     OPENSTACK_CREDS=${OPENSTACK_CREDS-/dev/null}
     VCENTER_CREDS=${VCENTER_CREDS-/dev/null}
-    TEST_CMD="env $(cat "$AWS_CREDS" "$AZURE_CREDS" "$OPENSTACK_CREDS" "$VCENTER_CREDS") BRANCH_NAME=${BRANCH_NAME-master} BUILD_ID=$BUILD_ID DISTRO_CODE=$DISTRO_CODE $TEST_RUNNER -test.v ${IMAGE_TEST_CASES_PATH}/${TEST_CASE_FILENAME}"
+    TEST_CMD="env $(cat "$AWS_CREDS" "$AZURE_CREDS" "$OPENSTACK_CREDS" "$VCENTER_CREDS") BRANCH_NAME=${BRANCH_NAME-main} BUILD_ID=$BUILD_ID DISTRO_CODE=$DISTRO_CODE $TEST_RUNNER -test.v ${IMAGE_TEST_CASES_PATH}/${TEST_CASE_FILENAME}"
 
     # Run the test and add the test name to the list of passed or failed
     # tests depending on the result.