diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index d6fa63eca1..bffabe9703 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -30,7 +30,7 @@
   - koji_builder
   - {
       role: osbs-client,
-        when: env == 'staging',
+        when: env == 'staging' and ansible_architecture == 'x86_64',
         general: {
           verbose: 0,
           build_json_dir: '/usr/share/osbs/',
@@ -60,7 +60,7 @@
     }
   - {
       role: osbs-client,
-        when: env == 'production',
+        when: env == 'production' and ansible_architecture == 'x86_64',
         general: {
           verbose: 0,
           build_json_dir: '/usr/share/osbs/',