diff --git a/groups b/groups
index 4b229bd..edd7dfd 100644
--- a/groups
+++ b/groups
@@ -4,7 +4,7 @@
 509faa55e50db90dd57f01cf09dbcd0bfa6b6709	GitHub Replication
 a6e3134e08eb39ad331956432902676456c592a6	Event Streaming Users
 d8d59c825a3342ebd9160c30899683e08ce073f6	ONF CLA Accepted
-e0bc180b4e2c094e414c0f6b3b20edd3f5050ec8	Non-Interactive Users
+e0bc180b4e2c094e414c0f6b3b20edd3f5050ec8	Service Users
 global:Anonymous-Users                  	Anonymous Users
 global:Project-Owners                   	Project Owners
 global:Registered-Users                 	Registered Users
diff --git a/project.config b/project.config
index 9baa3b1..6066a6c 100644
--- a/project.config
+++ b/project.config
@@ -24,7 +24,7 @@
 	submit = group Administrators
 	submit = group Project Owners
 	label-Verified = -1..+1 group Administrators
-	label-Verified = -1..+1 group Non-Interactive Users
+	label-Verified = -1..+1 group Service Users
 	forgeAuthor = group Administrators
 	forgeAuthor = group Project Owners
 	read = group Anonymous Users
@@ -49,12 +49,12 @@
 	create = group Project Owners
 [access "refs/tags/*"]
 	createTag = group Administrators
-	createTag = group Non-Interactive Users
+	createTag = group Service Users
 	createTag = group Project Owners
 	createSignedTag = group Administrators
-	createSignedTag = group Non-Interactive Users
+	createSignedTag = group Service Users
 	createSignedTag = group Project Owners
-	forgeCommitter = group Non-Interactive Users
+	forgeCommitter = group Service Users
 [label "Code-Review"]
 	function = MaxWithBlock
 	copyMinScore = true