diff --git a/project.config b/project.config
index e49e4c5..d3ac935 100644
--- a/project.config
+++ b/project.config
@@ -7,8 +7,7 @@
 	enableSignedPush = false
 [submit]
 	mergeContent = true
-[capability]
-	administrateServer = group mdb/pigweed-gob-admin-acl
+	action = rebase always
 [access "refs/*"]
 	read = group mdb/pigweed-gob-admin-acl
 [access "refs/for/*"]
@@ -64,3 +63,5 @@
 	value = 0 No score
 	value = +1 Looks good to me, but someone else must approve
 	value = +2 Looks good to me, approved
+[capability]
+	administrateServer = group mdb/pigweed-gob-admin-acl