diff --git a/.gitreview b/.gitreview
index 21f9efff85..a57dca79d9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-defaultbranch=master
+defaultbranch=16
 #
 # Intentional padding to ensure it is possible to point a commit
 # to an alternative gerrit server/repository without breaking
diff --git a/build_tools/make_version b/build_tools/make_version
index ce3bf6e130..edffb8a294 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -3,7 +3,7 @@
 AWK=${AWK:-awk}
 GIT=${GIT:-git}
 GREP=${GREP:-grep}
-MAINLINE_BRANCH=master
+MAINLINE_BRANCH=16
 
 if [ -f ${1}/.version ]; then
     cat ${1}/.version