diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 11e20ca71b..5f9c596f1e 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -375,6 +375,7 @@
       dest: token
   tags:
     - osbs-worker-namespace
+  when: env == "staging"
 
 - name: Create orchestrator namespace
   hosts: osbs-masters-stg[0]:osbs-masters[0]
@@ -448,6 +449,7 @@
       dest: token
   tags:
     - osbs-orchestrator-namespace
+  when: env == "staging"
 
 - name: setup client config secret in orchestrator namespace
   hosts: osbs-masters-stg[0]:osbs-masters[0]