diff --git a/.github/workflows/android-dockerimage.yml b/.github/workflows/android-dockerimage.yml
index e34a3a4b2..3528eabbf 100644
--- a/.github/workflows/android-dockerimage.yml
+++ b/.github/workflows/android-dockerimage.yml
@@ -33,10 +33,10 @@ jobs:
     - name: set env
       run: |
         v=${{ env.VERSION }}
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
-        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=NAME::subsurface/android-build-container${b}:${v}"
 
     - name: Build and Publish Linux Docker image to Dockerhub
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 39fd9c17b..0c4e9056f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -2,10 +2,10 @@ name: Android
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildInContainer:
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 412ac815b..24b8e7ae2 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -2,10 +2,10 @@ name: iOS
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   mobileBuild:
diff --git a/.github/workflows/linux-bionic-5.9.yml b/.github/workflows/linux-bionic-5.9.yml
index 85241b3a2..c7d6d7fe7 100644
--- a/.github/workflows/linux-bionic-5.9.yml
+++ b/.github/workflows/linux-bionic-5.9.yml
@@ -2,10 +2,10 @@ name: Ubuntu 18.04 / Qt 5.9
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildOnBionic:
diff --git a/.github/workflows/linux-dockerimage.yml b/.github/workflows/linux-dockerimage.yml
index 4e7a0b530..a134ef9f7 100644
--- a/.github/workflows/linux-dockerimage.yml
+++ b/.github/workflows/linux-dockerimage.yml
@@ -23,10 +23,10 @@ jobs:
     - name: set env
       run: |
         v=${{ env.VERSION }}
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
-        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=NAME::subsurface/trusty-qt512${b}:${v}"
 
     - name: Build and Publish Linux Docker image to Dockerhub
diff --git a/.github/workflows/linux-eoan-5.12.yml b/.github/workflows/linux-eoan-5.12.yml
index 50c446f91..15c319eaa 100644
--- a/.github/workflows/linux-eoan-5.12.yml
+++ b/.github/workflows/linux-eoan-5.12.yml
@@ -2,10 +2,10 @@ name: Ubuntu 19.10 / Qt 5.12
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildInContainer:
diff --git a/.github/workflows/linux-trusty-5.12.yml b/.github/workflows/linux-trusty-5.12.yml
index 4e97989ec..bc95c99d4 100644
--- a/.github/workflows/linux-trusty-5.12.yml
+++ b/.github/workflows/linux-trusty-5.12.yml
@@ -2,10 +2,10 @@ name: Ubuntu 14.04 / Qt 5.12 for AppImage
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildInContainer:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index af1a5d539..369c880d6 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -2,10 +2,10 @@ name: Mac
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   desktopBuild:
diff --git a/.github/workflows/mxe-dockerimage-stage1.yml b/.github/workflows/mxe-dockerimage-stage1.yml
index 1d4859364..5bb15d022 100644
--- a/.github/workflows/mxe-dockerimage-stage1.yml
+++ b/.github/workflows/mxe-dockerimage-stage1.yml
@@ -26,10 +26,10 @@ jobs:
       run: |
         v=${{ env.VERSION }}
         s=".stage1"
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
-        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}${s}"
 
     - name: Build and Publish stage 1 Docker image to Dockerhub
diff --git a/.github/workflows/mxe-dockerimage-stage2.yml b/.github/workflows/mxe-dockerimage-stage2.yml
index de286703c..5a3300b93 100644
--- a/.github/workflows/mxe-dockerimage-stage2.yml
+++ b/.github/workflows/mxe-dockerimage-stage2.yml
@@ -16,15 +16,15 @@ jobs:
         ref: ${{ github.event.client_payload.target_branch }}
 
       # Grab the version from the event name that we were triggered by and add ".stage1" to find the docker image to start FROM
-      # And create the NAME of the final docker image (including the branch if not master)
+      # And create the NAME of the final docker image (including the branch if not main)
     - name: set env
       run: |
         v=${{ github.event.action }}
         s=".stage1"
-        b=${{ github.event.client_payload.target_branch }} # -BRANCH suffix, unless the branch is master
+        b=${{ github.event.client_payload.target_branch }} # -BRANCH suffix, unless the branch is main
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
-        if [ "$b" = "master" ] || [ "$b" = "" ] ; then b="" ; else b="-$b" ; fi
+        if [ "$b" = "main" ] || [ "$b" = "" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=VERSION::${v}${s}"
         echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}"
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index d83b8735a..1748d2c43 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -2,10 +2,10 @@ name: Windows
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildInContainer: