diff --git a/inventory/group_vars/beaker-stg b/inventory/group_vars/beaker-stg
index 41004d95e9..d467691029 100644
--- a/inventory/group_vars/beaker-stg
+++ b/inventory/group_vars/beaker-stg
@@ -5,7 +5,7 @@ num_cpus: 2
 
 tcp_ports: [ 80, 443, 8000 ]
 udp_ports: [ 69 ]
-fas_client_groups: sysadmin-qa
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
diff --git a/inventory/group_vars/qadevel-stg b/inventory/group_vars/qadevel-stg
index 8ce882b20f..c6c5eace3f 100644
--- a/inventory/group_vars/qadevel-stg
+++ b/inventory/group_vars/qadevel-stg
@@ -7,7 +7,7 @@ num_cpus: 1
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-fas_client_groups: sysadmin-qa
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
 
 # default virt install command is for a single nic-device
 # define in another group file for more nics (see buildvm)
diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb-dev
index 82e6d9ba89..474db8d550 100644
--- a/inventory/group_vars/resultsdb-dev
+++ b/inventory/group_vars/resultsdb-dev
@@ -7,7 +7,7 @@ num_cpus: 4
 # the host_vars/$hostname file
 
 tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}", "{{ execdb_db_port }}" ]
-fas_client_groups: sysadmin-qa,sysadmin-main
+fas_client_groups: sysadmin-qa,sysadmin-main.fi-apprentice
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index c6d0c0463b..69d7e8bdf3 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -1,4 +1,6 @@
 ---
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
+
 grokmirror_basedir: /var/lib/git/mirror
 grokmirror_user: grokmirror
 grokmirror_repos:
diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
index 43b5941c77..b6c4e08db5 100644
--- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
@@ -8,7 +8,7 @@ volgroup: /dev/vg_guests
 eth0_ip: 10.5.124.181
 vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
-fas_client_groups: sysadmin-qa,sysadmin-main
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
 lvm_size: 45000
 
 # default virt install command is for a single nic-device