diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index 622225c6de..d1fdf15394 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -31,6 +31,7 @@
   - { role: sudo, when: not inventory_hostname.startswith('bkernel') }
   - {
       role: osbs-client,
+        when: env == 'staging',
         general: {
           verbose: 0,
           build_json_dir: '/usr/share/osbs/',
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 90c32f1e40..0efbea8110 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -38,6 +38,7 @@
   - koji_builder
   - {
       role: osbs-client,
+        when: env == 'staging',
         general: {
           verbose: 0,
           build_json_dir: '/usr/share/osbs/',
diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index ad24f38579..70e5fd6442 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -31,6 +31,7 @@
   - { role: koji_builder, when: env == "staging" or inventory_hostname.startswith('s390') or inventory_hostname.startswith('arm') }
   - {
       role: osbs-client,
+        when: env == 'staging',
         general: {
           verbose: 0,
           build_json_dir: '/usr/share/osbs/',