diff --git a/groups b/groups
index 1d62219..3cbf84b 100644
--- a/groups
+++ b/groups
@@ -1,11 +1,12 @@
-# UUID                                                  	Group Name
+# UUID                                                        	Group Name
 #
-fc16cdd071c21660395862c7c23667cc38638aaea               	Core Team
-global:Anonymous-Users                                  	Anonymous Users
-global:Change-Owner                                     	Change Owner
-global:Project-Owners                                   	Project Owners
-global:Registered-Users                                 	Registered Users
+fc16cdd071c21660395862c7c23667cc38638aae                      	Core Team
+fc16cdd071c21660395862c7c23667cc38638aaea                     	Core Team
+global:Anonymous-Users                                        	Anonymous Users
+global:Change-Owner                                           	Change Owner
+global:Project-Owners                                         	Project Owners
+global:Registered-Users                                       	Registered Users
 google:AI2Pq9r_ksT_hfUOny8swsG8krQwPL5eOM0hGHf4QWGOPdy9igqsdhs	google/google-union:signcla
-mdb:cerebra-hw                                          	mdb/cerebra-hw
-mdb:cerebrahw-leads                                     	mdb/cerebrahw-leads
-mdb:google-cla-gerrit-robot-accounts                    	mdb/google-cla-gerrit-robot-accounts
+mdb:cerebra-hw                                                	mdb/cerebra-hw
+mdb:cerebrahw-leads                                           	mdb/cerebrahw-leads
+mdb:google-cla-gerrit-robot-accounts                          	mdb/google-cla-gerrit-robot-accounts
diff --git a/project.config b/project.config
index 03e9fc4..b58faea 100644
--- a/project.config
+++ b/project.config
@@ -5,17 +5,8 @@
 	requireSignedOffBy = false
 	requireChangeId = true
 	enableSignedPush = false
-[accounts]
-	sameGroupVisibility = deny group google/google-union:signcla
-[contributor-agreement "Google CLA"]
-	description = Google Contributor License Agreement
-	agreementUrl = static/cla.html
-	accepted = group google/google-union:signcla
-	accepted = group mdb/google-cla-gerrit-robot-accounts
 [submit]
 	mergeContent = true
-[capability]
-	administrateServer = group mdb/cerebrahw-leads
 [access "refs/*"]
 	read = group mdb/cerebrahw-leads
 	label-Code-Review = block -2..+2 group Change Owner
@@ -33,6 +24,7 @@
 	forgeCommitter = group Project Owners
 	forgeCommitter = group mdb/cerebrahw-leads
 	label-Code-Review = -2..+2 group Core Team
+	label-Code-Review = -2..+2 group Core Team
 	label-Code-Review = -2..+2 group Project Owners
 	label-Code-Review = -2..+2 group mdb/cerebrahw-leads
 	label-Code-Review = -1..+1 group Registered Users
@@ -75,6 +67,15 @@
 	value = +1 Looks good to me, but someone else must approve
 	value = +2 Looks good to me, approved
 	copyCondition = changekind:NO_CHANGE OR changekind:TRIVIAL_REBASE OR is:MIN OR (is:MAX AND ((changekind:NO_CODE_CHANGE OR has:unchanged-files) AND (uploaderin:mdb:cerebra-hw OR uploaderin:mdb:cerebra-hw-extended OR uploaderin:mdb:cerebrahw-leads)))
+[accounts]
+	sameGroupVisibility = deny group google/google-union:signcla
+[contributor-agreement "Google CLA"]
+	description = Google Contributor License Agreement
+	agreementUrl = static/cla.html
+	accepted = group google/google-union:signcla
+	accepted = group mdb/google-cla-gerrit-robot-accounts
+[capability]
+	administrateServer = group mdb/cerebrahw-leads
 [notify "team"]
 	header = cc
 	email = cerebra-hw-auto@google.com