diff --git a/Makefile b/Makefile
index 5a72d1c9..1fc8e7eb 100644
--- a/Makefile
+++ b/Makefile
@@ -350,9 +350,9 @@ release:
 	@echo
 	@echo "        git tag -s -m 'osbuild $(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 db9d74e0..10655109 100644
--- a/schutzbot/Jenkinsfile
+++ b/schutzbot/Jenkinsfile
@@ -142,8 +142,8 @@ pipeline {
         success {
             node('schutzbot') {
                 script {
-                    if (env.BRANCH_NAME == 'master') {
-                        telegramSend "💚 CI passed for osbuild master branch ${env.BUILD_URL}"
+                    if (env.BRANCH_NAME == 'main') {
+                        telegramSend "💚 CI passed for osbuild main branch ${env.BUILD_URL}"
                     }
                 }
             }
@@ -151,8 +151,8 @@ pipeline {
         unsuccessful {
             node('schutzbot') {
                 script {
-                    if (env.BRANCH_NAME == 'master') {
-                        telegramSend "💣 CI failed for osbuild master branch ${env.BUILD_URL}"
+                    if (env.BRANCH_NAME == 'main') {
+                        telegramSend "💣 CI failed for osbuild main branch ${env.BUILD_URL}"
                     }
                 }
             }
diff --git a/schutzbot/run_image_tests.sh b/schutzbot/run_image_tests.sh
index cac03020..851dfe5e 100755
--- a/schutzbot/run_image_tests.sh
+++ b/schutzbot/run_image_tests.sh
@@ -58,7 +58,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 "$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 "$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.