diff --git a/inventory/group_vars/bodhi-backend b/inventory/group_vars/bodhi-backend
index 5510409840..bea29982ed 100644
--- a/inventory/group_vars/bodhi-backend
+++ b/inventory/group_vars/bodhi-backend
@@ -44,7 +44,7 @@ fedmsg_error_recipients:
 
 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 
-fas_client_groups: sysadmin-releng
+fas_client_groups: sysadmin-releng,sysadmin-bodhi
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
 ## XXX - note that the csi_ stuff is kept at the host_vars/ level.
diff --git a/inventory/group_vars/bodhi2 b/inventory/group_vars/bodhi2
index 9240224f29..5592e816f7 100644
--- a/inventory/group_vars/bodhi2
+++ b/inventory/group_vars/bodhi2
@@ -13,7 +13,7 @@ testing: False
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-host_group: bodhi2
+host_group: releng
 
 # Definining these vars has a number of effects
 # 1) mod_wsgi is configured to use the vars for its own setup
@@ -28,7 +28,7 @@ tcp_ports: [ 80 ]
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 
-fas_client_groups: sysadmin-noc
+fas_client_groups: sysadmin-noc,sysadmin-bodhi
 
 # These set a config value in /etc/fedmsg.d/, see roles/bodhi2/base/
 # frontend nodes won't run either of these
diff --git a/inventory/group_vars/bodhi2-stg b/inventory/group_vars/bodhi2-stg
index 3f657b0067..e33bcf0284 100644
--- a/inventory/group_vars/bodhi2-stg
+++ b/inventory/group_vars/bodhi2-stg
@@ -28,6 +28,8 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '
 
 fas_client_groups: sysadmin-noc,sysadmin-bodhi
 
+host_group: releng
+
 # Mount /mnt/fedora_koji as read-only in staging
 nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid"
 datacenter: staging