diff --git a/.github/actions/cmake_config/Dockerfile b/.github/actions/cmake_config/Dockerfile
index 89d28c6e..6d86a112 100644
--- a/.github/actions/cmake_config/Dockerfile
+++ b/.github/actions/cmake_config/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update \
         libidn11=1.33-2.1ubuntu1.2 \
         ca-certificates=20180409 \
         make=4.1-9.1ubuntu1 \
-        git=1:2.17.1-1ubuntu0.8 \
+        git=1:2.17.1-1ubuntu0.9 \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
@@ -17,6 +17,6 @@ LABEL name="units.cmake"
 LABEL description="Units cmake tests"
 LABEL vcs-ref=$GIT_COMMIT
 LABEL vcs-url="https://github.com/LLNL/units"
-LABEL version="0.4.2"
+LABEL version="0.5.1"
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/workflows/static-analyzers.yml b/.github/workflows/static-analyzers.yml
index d82e5d82..89fbd4bc 100644
--- a/.github/workflows/static-analyzers.yml
+++ b/.github/workflows/static-analyzers.yml
@@ -3,10 +3,10 @@ name: Static Analyzers
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   cpplint:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f53db082..82c81e89 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,11 +2,11 @@ name: Tests
 on:
   push:
     branches:
-      - master
+      - main
       - v*
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   pre-commit:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9163d367..45c4b816 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,10 +5,10 @@
 # copied from https://github.com/CLIUtils/CLI11
 
 trigger:
-  - master
+  - main
 
 pr:
-  - master
+  - main
 
 variables:
   units.header: OFF