diff --git a/groups b/groups
index 86a16a9..502cd2c 100644
--- a/groups
+++ b/groups
@@ -1,7 +1,7 @@
 # UUID                                  	Group Name
 #
 0bc64754b78802646ba7e84fefb836824f744905	Administrators
-22a41d283c1425a62ada6af76678b31928e8d537	Non-Interactive Users
+22a41d283c1425a62ada6af76678b31928e8d537	Service Users
 github:openbmc/Everyone                 	github/openbmc/Everyone
 github:openbmc/ibm-development          	github/openbmc/ibm-development
 global:Anonymous-Users                  	Anonymous Users
diff --git a/project.config b/project.config
index 09e8a62..e79a6ff 100644
--- a/project.config
+++ b/project.config
@@ -36,10 +36,10 @@
     editTopicName = +force group Administrators
     editTopicName = +force group Project Owners
     label-Verified = -1..+1 group Administrators
-    label-Verified = -1..+1 group Non-Interactive Users
+    label-Verified = -1..+1 group Service Users
     label-Verified = -1..+1 group Project Owners
     label-Ok-To-Test = +0..+1 group Administrators
-    label-Ok-To-Test = +0..+1 group Non-Interactive Users
+    label-Ok-To-Test = +0..+1 group Service Users
     label-Ok-To-Test = +0..+1 group Project Owners
 	label-Ok-To-Test = +0..+1 group github/openbmc/ibm-development
 [access "refs/meta/config"]
@@ -89,6 +89,6 @@
 [capability]
 	administrateServer = group Administrators
 	createProject = group Administrators
-	priority = batch group Non-Interactive Users
-	streamEvents = group Non-Interactive Users
+	priority = batch group Service Users
+	streamEvents = group Service Users
 	streamEvents = group github/openbmc/Everyone