diff --git a/groups b/groups
index 2c3cb1d..7ba8f8d 100644
--- a/groups
+++ b/groups
@@ -1,6 +1,9 @@
-# UUID                 	Group Name
+# UUID                                  	Group Name
 #
-global:Anonymous-Users 	Anonymous Users
-global:Project-Owners  	Project Owners
-global:Registered-Users	Registered Users
-mdb:cerebrahw-leads    	mdb/cerebrahw-leads
+fc16cdd071c21660395862c7c23667cc38638aae	Core Team
+global:Anonymous-Users                  	Anonymous Users
+global:Change-Owner                     	Change Owner
+global:Project-Owners                   	Project Owners
+global:Registered-Users                 	Registered Users
+mdb:cerebra-hw                          	mdb/cerebra-hw
+mdb:cerebrahw-leads                     	mdb/cerebrahw-leads
diff --git a/project.config b/project.config
index 0a5a05a..29e3da2 100644
--- a/project.config
+++ b/project.config
@@ -11,6 +11,7 @@
 	administrateServer = group mdb/cerebrahw-leads
 [access "refs/*"]
 	read = group mdb/cerebrahw-leads
+	label-Code-Review = block -2..+2 group Change Owner
 [access "refs/for/*"]
 	addPatchSet = group Registered Users
 [access "refs/for/refs/*"]
@@ -24,15 +25,19 @@
 	forgeAuthor = group Registered Users
 	forgeCommitter = group Project Owners
 	forgeCommitter = group mdb/cerebrahw-leads
+	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
 	push = group Project Owners
+	push = group mdb/cerebra-hw
 	push = group mdb/cerebrahw-leads
 	read = group Anonymous Users
 	revert = group Registered Users
+	submit = group Core Team
 	submit = group Project Owners
 	submit = group mdb/cerebrahw-leads
+	pushMerge = group mdb/cerebrahw-leads
 [access "refs/meta/config"]
 	exclusiveGroupPermissions = read
 	create = group Project Owners
@@ -62,4 +67,7 @@
 	value = 0 No score
 	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
+	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)))
+[notify "team"]
+	header = cc
+	email = cerebra-hw-auto@google.com