diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py
index 041549ad7..933f6299d 100644
--- a/build/fbcode_builder/getdeps/fetcher.py
+++ b/build/fbcode_builder/getdeps/fetcher.py
@@ -234,7 +234,7 @@ class GitFetcher(Fetcher):
                     rev = m.group(1)
                     print("Using pinned rev %s for %s" % (rev, repo_url))
 
-        self.rev = rev or "master"
+        self.rev = rev or "main"
         self.origin_repo = repo_url
         self.manifest = manifest
         self.depth = depth if depth else GitFetcher.DEFAULT_DEPTH
@@ -252,7 +252,7 @@ class GitFetcher(Fetcher):
         )
         if target_hash == current_hash:
             # It's up to date, so there are no changes.  This doesn't detect eg:
-            # if origin/master moved and rev='master', but that's ok for our purposes;
+            # if origin/main moved and rev='main', but that's ok for our purposes;
             # we should be using explicit hashes or eg: a stable branch for the cases
             # that we care about, and it isn't unreasonable to require that the user
             # explicitly perform a clean build if those have moved.  For the most
diff --git a/build/fbcode_builder/manifests/f4d b/build/fbcode_builder/manifests/f4d
index db30894c7..2f3db2595 100644
--- a/build/fbcode_builder/manifests/f4d
+++ b/build/fbcode_builder/manifests/f4d
@@ -6,6 +6,7 @@ shipit_fbcode_builder = true
 
 [git]
 repo_url = https://github.com/facebookexternal/f4d.git
+rev = master
 
 [build.os=windows]
 builder = nop
diff --git a/build/fbcode_builder/manifests/fb303 b/build/fbcode_builder/manifests/fb303
index 4d91af481..743aca01e 100644
--- a/build/fbcode_builder/manifests/fb303
+++ b/build/fbcode_builder/manifests/fb303
@@ -6,7 +6,6 @@ shipit_fbcode_builder = true
 
 [git]
 repo_url = https://github.com/facebookincubator/fb303.git
-rev = main
 
 [build]
 builder = cmake
diff --git a/build/fbcode_builder/manifests/fb303-source b/build/fbcode_builder/manifests/fb303-source
index 4efe1eedb..ea160c500 100644
--- a/build/fbcode_builder/manifests/fb303-source
+++ b/build/fbcode_builder/manifests/fb303-source
@@ -6,7 +6,6 @@ shipit_fbcode_builder = false
 
 [git]
 repo_url = https://github.com/facebook/fb303.git
-rev = main
 
 [build]
 builder = nop
diff --git a/build/fbcode_builder/manifests/fboss b/build/fbcode_builder/manifests/fboss
index 4a1cf8ea0..f29873e72 100644
--- a/build/fbcode_builder/manifests/fboss
+++ b/build/fbcode_builder/manifests/fboss
@@ -6,7 +6,6 @@ shipit_fbcode_builder = true
 
 [git]
 repo_url = https://github.com/facebook/fboss.git
-rev = main
 
 [build.os=linux]
 builder = cmake
diff --git a/build/fbcode_builder/manifests/fizz b/build/fbcode_builder/manifests/fizz
index 58ab28503..72f29973f 100644
--- a/build/fbcode_builder/manifests/fizz
+++ b/build/fbcode_builder/manifests/fizz
@@ -6,7 +6,6 @@ shipit_fbcode_builder = true
 
 [git]
 repo_url = https://github.com/facebookincubator/fizz.git
-rev = main
 
 [build]
 builder = cmake
diff --git a/build/fbcode_builder/manifests/openr b/build/fbcode_builder/manifests/openr
index 96f7ce924..c5be2d9bc 100644
--- a/build/fbcode_builder/manifests/openr
+++ b/build/fbcode_builder/manifests/openr
@@ -6,7 +6,6 @@ shipit_fbcode_builder = true
 
 [git]
 repo_url = https://github.com/facebook/openr.git
-rev = main
 
 [build.os=linux]
 builder = cmake
diff --git a/build/fbcode_builder/manifests/protobuf b/build/fbcode_builder/manifests/protobuf
index 7f21e4821..311775b98 100644
--- a/build/fbcode_builder/manifests/protobuf
+++ b/build/fbcode_builder/manifests/protobuf
@@ -9,6 +9,7 @@ libprotobuf-dev
 
 [git]
 repo_url = https://github.com/protocolbuffers/protobuf.git
+rev = master
 
 [build.not(os=windows)]
 builder = autoconf
diff --git a/build/fbcode_builder/manifests/wangle b/build/fbcode_builder/manifests/wangle
index 9f40d83ea..6b330d620 100644
--- a/build/fbcode_builder/manifests/wangle
+++ b/build/fbcode_builder/manifests/wangle
@@ -6,7 +6,6 @@ shipit_fbcode_builder = true
 
 [git]
 repo_url = https://github.com/facebook/wangle.git
-rev = main
 
 [build]
 builder = cmake