diff --git a/groups b/groups
index fa4cd2ae2..579c63ce1 100644
--- a/groups
+++ b/groups
@@ -2,8 +2,7 @@
 #
 db95ce11b379445ac8c5806ea0b61195555b338d	flashrom developers
 global:Project-Owners                   	Project Owners
-user:Nico                               	user/Nico Huber (Nico)
 user:Th3Fanbus                          	user/Angel Pons (Th3Fanbus)
+user:aklm                               	user/Anastasia Klimchuk (aklm)
 user:dhendrix                           	user/David Hendricks (dhendrix)
 user:jenkins                            	user/build bot (Jenkins) (jenkins)
-user:stefanct                           	user/Stefan T (stefanct)
diff --git a/project.config b/project.config
index 3971d25ef..57c54c818 100644
--- a/project.config
+++ b/project.config
@@ -32,33 +32,27 @@
 	defaultValue = 0
 
 [access "refs/*"]
+	label-Verified = -1..+1 group user/Anastasia Klimchuk (aklm)
 	label-Verified = -1..+1 group user/Angel Pons (Th3Fanbus)
 	label-Verified = -1..+1 group user/David Hendricks (dhendrix)
-	label-Verified = -1..+1 group user/Nico Huber (Nico)
-	label-Verified = -1..+1 group user/Stefan T (stefanct)
+	submit = group user/Anastasia Klimchuk (aklm)
 	submit = group user/Angel Pons (Th3Fanbus)
 	submit = group user/David Hendricks (dhendrix)
-	submit = group user/Nico Huber (Nico)
-	submit = group user/Stefan T (stefanct)
+	label-Code-Review = -2..+2 group user/Anastasia Klimchuk (aklm)
 	label-Code-Review = -2..+2 group user/Angel Pons (Th3Fanbus)
 	label-Code-Review = -2..+2 group user/David Hendricks (dhendrix)
-	label-Code-Review = -2..+2 group user/Nico Huber (Nico)
-	label-Code-Review = -2..+2 group user/Stefan T (stefanct)
+	owner = group user/Anastasia Klimchuk (aklm)
 	owner = group user/Angel Pons (Th3Fanbus)
 	owner = group user/David Hendricks (dhendrix)
-	owner = group user/Nico Huber (Nico)
-	owner = group user/Stefan T (stefanct)
 	owner = group user/build bot (Jenkins) (jenkins)
 [access "refs/heads/*"]
 	exclusiveGroupPermissions = create delete submit
+	create = group user/Anastasia Klimchuk (aklm)
 	create = group user/Angel Pons (Th3Fanbus)
 	create = group user/David Hendricks (dhendrix)
-	create = group user/Nico Huber (Nico)
-	create = group user/Stefan T (stefanct)
+	delete = group user/Anastasia Klimchuk (aklm)
 	delete = group user/Angel Pons (Th3Fanbus)
 	delete = group user/David Hendricks (dhendrix)
-	delete = group user/Nico Huber (Nico)
-	delete = group user/Stefan T (stefanct)
 	submit = group flashrom developers
 	label-Code-Review = -2..+2 group flashrom developers
 	label-Verified = -1..+1 group flashrom developers