diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 5f9c596f1e..99bad3fe3b 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -373,9 +373,9 @@
     osbs_secret_files:
     - source: "{{ private }}/files/osbs/{{ env }}/odcs-oidc-token"
       dest: token
+    when: env == "staging"
   tags:
     - osbs-worker-namespace
-  when: env == "staging"
 
 - name: Create orchestrator namespace
   hosts: osbs-masters-stg[0]:osbs-masters[0]
@@ -447,9 +447,10 @@
     osbs_secret_files:
     - source: "{{ private }}/files/osbs/{{ env }}/odcs-oidc-token"
       dest: token
+    when: env == "staging"
   tags:
     - osbs-orchestrator-namespace
-  when: env == "staging"
+
 
 - name: setup client config secret in orchestrator namespace
   hosts: osbs-masters-stg[0]:osbs-masters[0]