diff --git a/inventory/group_vars/pkgs-stg b/inventory/group_vars/pkgs-stg
index dc7513cd2b..ebd501e2dc 100644
--- a/inventory/group_vars/pkgs-stg
+++ b/inventory/group_vars/pkgs-stg
@@ -12,6 +12,7 @@ fas_client_groups: sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc
 fas_client_restricted_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell %(username)s
 fas_client_admin_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell -s %(username)s
 fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc"
+admin_groups: "@cvs @sysadmin-cvs @sysadmin-build @sysadmin-noc"
 
 git_group: packager
 git_port: 9418
diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index 73c4ab18f2..8bc7daf72b 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -165,7 +165,7 @@
   - distgit
 
 - name: Get admin users
-  command: "/srv/web/infra/ansible/scripts/users-from-fas @sysadmin-main {{ fas_client_ssh_groups | split(',') | join(' ')}}"
+  command: "/srv/web/infra/ansible/scripts/users-from-fas @sysadmin-main {{ admin_groups }}"
   register: admin_user_list
   run_once: True
   delegate_to: localhost