diff --git a/apps/sonar/sonar_Service.tf b/apps/sonar/sonar_Service.tf
index 6e932d5..6d7d056 100644
--- a/apps/sonar/sonar_Service.tf
+++ b/apps/sonar/sonar_Service.tf
@@ -59,9 +59,11 @@ module "saml" {
   group_mapping     = <<ENDF
 for group in user.ak_groups.all():
     if group.name == "authentik Admins":
-        yield "admin"
+        yield "sonar-administrators"
+    elif group.name == "app-${local.app_name}":
+        yield "sonar-users"
     elif group.name == "app-${local.app_name}-admin":
-        yield "admin"
+        yield "sonar-administrators"
     else:
         yield group.name
 ENDF