diff --git a/groups b/groups
index e1436bb..c8624f5 100644
--- a/groups
+++ b/groups
@@ -1,6 +1,8 @@
 # UUID                                  	Group Name
 #
 5802a405be8962e10bccb6df6c4e612bf9cfd049	Administrators
+59ea8dc6cb025e5e0ab33b5ec76d410d5c3917fc	Administrators
+a58e9b017b95dbc285e2b35d850e2782c3d905df	Non-Interactive Users
 d7e31985f7d710d31843f29a3c06480be832a7ab	Non-Interactive Users
 global:Anonymous-Users                  	Anonymous Users
 global:Project-Owners                   	Project Owners
diff --git a/project.config b/project.config
index 3829977..7d06595 100644
--- a/project.config
+++ b/project.config
@@ -8,43 +8,76 @@
 	mergeContent = true
 [capability]
 	administrateServer = group Administrators
+	administrateServer = group Administrators
 	priority = batch group Non-Interactive Users
+	priority = batch group Non-Interactive Users
+	streamEvents = group Non-Interactive Users
 	streamEvents = group Non-Interactive Users
 [access "refs/*"]
 	read = group Administrators
+	read = group Administrators
+	read = group Anonymous Users
 	read = group Anonymous Users
 [access "refs/for/refs/*"]
 	push = group Registered Users
+	push = group Registered Users
+	pushMerge = group Registered Users
 	pushMerge = group Registered Users
 [access "refs/heads/*"]
 	create = group Administrators
+	create = group Administrators
+	create = group Project Owners
 	create = group Project Owners
 	forgeAuthor = group Registered Users
+	forgeAuthor = group Registered Users
+	forgeCommitter = group Administrators
 	forgeCommitter = group Administrators
 	forgeCommitter = group Project Owners
+	forgeCommitter = group Project Owners
+	push = group Administrators
 	push = group Administrators
 	push = group Project Owners
+	push = group Project Owners
+	label-Code-Review = -2..+2 group Administrators
 	label-Code-Review = -2..+2 group Administrators
 	label-Code-Review = -2..+2 group Project Owners
+	label-Code-Review = -2..+2 group Project Owners
+	label-Code-Review = -1..+1 group Registered Users
 	label-Code-Review = -1..+1 group Registered Users
 	submit = group Administrators
+	submit = group Administrators
+	submit = group Project Owners
 	submit = group Project Owners
 	editTopicName = +force group Administrators
+	editTopicName = +force group Administrators
+	editTopicName = +force group Project Owners
 	editTopicName = +force group Project Owners
 [access "refs/meta/config"]
 	exclusiveGroupPermissions = read
 	read = group Administrators
+	read = group Administrators
+	read = group Project Owners
 	read = group Project Owners
 	push = group Administrators
+	push = group Administrators
+	push = group Project Owners
 	push = group Project Owners
 	label-Code-Review = -2..+2 group Administrators
+	label-Code-Review = -2..+2 group Administrators
+	label-Code-Review = -2..+2 group Project Owners
 	label-Code-Review = -2..+2 group Project Owners
 	submit = group Administrators
+	submit = group Administrators
+	submit = group Project Owners
 	submit = group Project Owners
 [access "refs/tags/*"]
 	pushTag = group Administrators
+	pushTag = group Administrators
+	pushTag = group Project Owners
 	pushTag = group Project Owners
 	pushSignedTag = group Administrators
+	pushSignedTag = group Administrators
+	pushSignedTag = group Project Owners
 	pushSignedTag = group Project Owners
 [label "Code-Review"]
 	function = MaxWithBlock