diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index fa90dc6a2d..781a3be02e 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -58,8 +58,8 @@
       nfs_src_dir: 'fedora_ostree_content_stg/compose/ostree'
       when: env == 'staging' and 'runroot' in group_names and not inventory_hostname.startswith('buildvm-s390x')
 
-    - { role: fas_client, when: not inventory_hostname.startswith('bkernel') }
-    - { role: sudo, when: not inventory_hostname.startswith('bkernel') }
+    - { role: fas_client, when: not inventory_hostname.startswith('bkernel') and env == 'production' }
+    - { role: sudo, when: not inventory_hostname.startswith('bkernel') and env == 'production' }
     - koji_builder
     - role: keytab/service
       kt_location: /etc/kojid/kojid.keytab
@@ -86,9 +86,9 @@
 
   tasks:
     - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-      when: not inventory_hostname.startswith('bkernel')
+      when: not inventory_hostname.startswith('bkernel') and env == 'production'
     - import_tasks: "{{ tasks_path }}/motd.yml"
-      when: not inventory_hostname.startswith('bkernel')
+      when: not inventory_hostname.startswith('bkernel') and env == 'production'
 
 #    - name: make sure kojid is running
 #      service: name=kojid state=started enabled=yes