diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 1e7bd36f7e..de8835cdf0 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -28,6 +28,8 @@
         nfs_src_dir: "{{ koji_hub_nfs }}",
         when: "env == 'staging' or createrepo or 'runroot' in group_names and not inventory_hostname.startswith('buildvm-s390x')",
       }
+    - { 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: nfs/client
       mnt_dir: '/mnt/koji/ostree'
@@ -59,8 +61,6 @@
       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') and env == 'production' }
-    - { role: sudo, when: not inventory_hostname.startswith('bkernel') and env == 'production' }
     - role: keytab/service
       kt_location: /etc/kojid/kojid.keytab
       service: compile