diff --git a/groups b/groups
index aa8425b54..3caeb320d 100644
--- a/groups
+++ b/groups
@@ -2,3 +2,4 @@
 #
 db95ce11b379445ac8c5806ea0b61195555b338d	flashrom developers
 user:dhendrix                           	user/David Hendricks (dhendrix)
+user:stefanct                           	user/Stefan Tauner (stefanct)
diff --git a/project.config b/project.config
index f8a63957d..88bd0b070 100644
--- a/project.config
+++ b/project.config
@@ -9,6 +9,7 @@
 	submit = group flashrom developers
 [access "refs/heads/staging"]
 	submit = group flashrom developers
+	exclusiveGroupPermissions = submit
 [access "refs/tags/*"]
 	push = +force group flashrom developers
 
@@ -31,4 +32,7 @@
 	filter = -is:draft
 [access "refs/heads/master"]
 	create = group user/David Hendricks (dhendrix)
+	create = group user/Stefan Tauner (stefanct)
 	delete = group user/David Hendricks (dhendrix)
+	delete = group user/Stefan Tauner (stefanct)
+	exclusiveGroupPermissions = create delete