diff --git a/.asf.yaml b/.asf.yaml
index 0e0ec9b..05ff8b8 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -22,8 +22,8 @@
     rebase:  true
 
   protected_branches:
-    # rules for the 'master' branch
-    master:
+    # rules for the 'main' branch
+    main:
       # disallows pushing merge commits to the branch
       required_linear_history: true
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca433df..a234d10 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,12 +1,12 @@
 # Builds JDO and runs the TCK
 #
-# This workflow is run for every submitted pull request and every push on master
+# This workflow is run for every submitted pull request and every push on the main branch
 name: Build JDO & Run TCK
 
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
   pull_request:
 
 jobs: