diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index bcae79ad69..9c72c966fa 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -3,7 +3,7 @@ name: Checks
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 69569170c8..a8cba7ce6b 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -3,7 +3,7 @@ name: Clang Tidy
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/compile_linux.yml b/.github/workflows/compile_linux.yml
index 54ed88d913..d14b533475 100644
--- a/.github/workflows/compile_linux.yml
+++ b/.github/workflows/compile_linux.yml
@@ -3,7 +3,7 @@ name: Linux Targets
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/compile_linux_arm64.yml b/.github/workflows/compile_linux_arm64.yml
index 5aef9adf27..81ecc12569 100644
--- a/.github/workflows/compile_linux_arm64.yml
+++ b/.github/workflows/compile_linux_arm64.yml
@@ -3,7 +3,7 @@ name: Linux ARM64 Targets
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/compile_macos.yml b/.github/workflows/compile_macos.yml
index 9be5fc8977..45f6f5a615 100644
--- a/.github/workflows/compile_macos.yml
+++ b/.github/workflows/compile_macos.yml
@@ -3,7 +3,7 @@ name: MacOS build
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml
index f871cd60a6..16351fb82c 100644
--- a/.github/workflows/compile_nuttx.yml
+++ b/.github/workflows/compile_nuttx.yml
@@ -3,7 +3,7 @@ name: Nuttx Targets
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/deploy_all.yml b/.github/workflows/deploy_all.yml
index 18480ac036..8b0925e688 100644
--- a/.github/workflows/deploy_all.yml
+++ b/.github/workflows/deploy_all.yml
@@ -3,7 +3,7 @@ name: Deploy metadata for all targets
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
     - 'release/*'
     - 'pr-metadata-test'
 
diff --git a/.github/workflows/mavros_mission_tests.yml b/.github/workflows/mavros_mission_tests.yml
index 8401f61b11..f90cf09690 100644
--- a/.github/workflows/mavros_mission_tests.yml
+++ b/.github/workflows/mavros_mission_tests.yml
@@ -3,7 +3,7 @@ name: MAVROS Mission Tests
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/mavros_offboard_tests.yml b/.github/workflows/mavros_offboard_tests.yml
index 0979c5a175..8cd707f0e0 100644
--- a/.github/workflows/mavros_offboard_tests.yml
+++ b/.github/workflows/mavros_offboard_tests.yml
@@ -3,7 +3,7 @@ name: MAVROS Offboard Tests
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/metadata.yml b/.github/workflows/metadata.yml
index 3adb3e565e..4372a34da1 100644
--- a/.github/workflows/metadata.yml
+++ b/.github/workflows/metadata.yml
@@ -3,7 +3,7 @@ name: Metadata
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
     - 'release/*'
     - 'pr-metadata-test'
 
diff --git a/.github/workflows/python_checks.yml b/.github/workflows/python_checks.yml
index ddad50475c..1d9cda083e 100644
--- a/.github/workflows/python_checks.yml
+++ b/.github/workflows/python_checks.yml
@@ -3,7 +3,7 @@ name: Python CI Checks
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml
index 1f6b023531..c257faaff5 100644
--- a/.github/workflows/sitl_tests.yml
+++ b/.github/workflows/sitl_tests.yml
@@ -3,7 +3,7 @@ name: SITL Tests
 on:
   push:
     branches:
-    - 'master'
+    - 'main'
   pull_request:
     branches:
     - '*'
diff --git a/.travis.yml b/.travis.yml
index 92b7e9fa36..347ccc884c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
       dist: xenial
       # In order to stay under the coverity rate limit, we only run this weekly
       # and not on push which is configured in travis-ci settings.
-      if: branch = master
+      if: branch = main
 
 before_install:
     - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
diff --git a/Jenkinsfile b/Jenkinsfile
index 1dfbe33093..a9110d4227 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -297,10 +297,10 @@ pipeline {
             sh('make distclean; git clean -ff -x -d .')
             withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
               sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git")
-              // 'master' branch
+              // 'main' branch
               sh('./msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
               sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
-              sh('cd px4_msgs; git push origin master || true')
+              sh('cd px4_msgs; git push origin main || true')
               // 'ros1' branch
               sh('cd px4_msgs; git checkout ros1')
               sh('./msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')