diff --git a/groups b/groups
index 9fee20a..5194a09 100644
--- a/groups
+++ b/groups
@@ -3,7 +3,6 @@
 00be9a32fee39a950622104b18e8f2e496e59d98	Event Streaming Users
 2801fa2e0515dd3f9d2819e4f66d490af2c1b5d3	Administrators
 988788adbfd283215fb06f9674c424ad35917942	Service Users
-c29a3613218ad1e64b0f3acf16193621100a08a4	NDN folks
 global:Anonymous-Users                  	Anonymous Users
 global:Project-Owners                   	Project Owners
 global:Registered-Users                 	Registered Users
diff --git a/project.config b/project.config
index 83800f1..892892d 100644
--- a/project.config
+++ b/project.config
@@ -18,24 +18,24 @@
 [access "refs/heads/*"]
 	create = group Administrators
 	create = group Project Owners
-	forgeAuthor = group NDN folks
+	forgeAuthor = group Administrators
 	forgeCommitter = group Administrators
 	forgeCommitter = group Project Owners
 	push = +force group Administrators
 	label-Code-Review = -2..+2 group Administrators
-	label-Code-Review = -2..+2 group Service Users
 	label-Code-Review = -2..+2 group Project Owners
+	label-Code-Review = -2..+1 group Service Users
 	label-Code-Review = -1..+1 group Registered Users
 	submit = group Administrators
 	submit = group Project Owners
 	editTopicName = +force group Administrators
 	editTopicName = +force group Project Owners
 	label-Verified = -1..+1 group Administrators
-	label-Verified = -1..+1 group Service Users
 	label-Verified = -1..+1 group Project Owners
+	label-Verified = -1..+1 group Service Users
 	label-Code-Style = -1..+1 group Administrators
-	label-Code-Style = -1..+1 group Service Users
 	label-Code-Style = -1..+1 group Project Owners
+	label-Code-Style = -1..+1 group Service Users
 [access "refs/meta/config"]
 	exclusiveGroupPermissions = read
 	read = group Administrators