diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 04bf1c9471..28f7f8a81d 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -419,47 +419,56 @@
         creates: "/etc/origin/koji-builder-policy-added"
       environment: "{{ osbs_environment }}"
 
-{% if env == 'staging' %}
-  - name: Create worker namespace
-    hosts: osbs-masters-stg[0]
-    tags:
-      - osbs-worker-namespace
-    user: root
-    roles:
-      - role: osbs-namespace
-        osbs_namespace: "{{ osbs_worker_namespace }}"
-        osbs_service_accounts: "{{ osbs_worker_service_accounts }}"
-        osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
-        osbs_authoritative_registry: "{{ source_registry }}"
-        osbs_sources_command: "{{ osbs_conf_sources_command }}"
-        osbs_vendor: "{{ osbs_conf_vendor }}"
+- name: Create worker namespace
+  hosts: osbs-masters-stg[0]
+  tags:
+    - osbs-worker-namespace
+  user: root
+  roles:
+    - {
+      role: osbs-namespace,
+        osbs_namespace: "{{ osbs_worker_namespace }}",
+        osbs_service_accounts: "{{ osbs_worker_service_accounts }}",
+        osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}",
+        osbs_authoritative_registry: "{{ source_registry }}",
+        osbs_sources_command: "{{ osbs_conf_sources_command }}",
+        osbs_vendor: "{{ osbs_conf_vendor }}",
+      when: env == "staging"
+    }
 
-  - name: setup koji secret in worker namespace
-    hosts: osbs-masters-stg[0]
-    tags:
-      - osbs-worker-namespace
-    roles:
-    - role: osbs-secret
-      osbs_namespace: "{{ osbs_worker_namespace }}"
-      osbs_secret_name: kojisecret
+- name: setup koji secret in worker namespace
+  hosts: osbs-masters-stg[0]
+  tags:
+    - osbs-worker-namespace
+  roles:
+  - {
+    role: osbs-secret,
+      osbs_namespace: "{{ osbs_worker_namespace }}",
+      osbs_secret_name: kojisecret,
       osbs_secret_files:
-      - source: "/etc/pki/koji/fedora-builder.pem"
-        dest: cert
+        - { source: "/etc/pki/koji/fedora-builder.pem",
+            dest: cert
+          },
+    when: env == "staging"
+    }
 
-  - name: setup dist registry secret in worker namespace
-    hosts: osbs-masters-stg[0]
-    tags:
-      - osbs-worker-namespace
-    roles:
-    - role: osbs-secret
-      osbs_namespace: "{{ osbs_worker_namespace }}"
-      osbs_secret_name: registry-secret
+- name: setup dist registry secret in worker namespace
+  hosts: osbs-masters-stg[0]
+  tags:
+    - osbs-worker-namespace
+  roles:
+  - {
+    role: osbs-secret,
+      osbs_namespace: "{{ osbs_worker_namespace }}",
+      osbs_secret_name: registry-secret,
       osbs_secret_files:
-      - source: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem"
-        dest: registry.crt
-      - source: "{{private}}/files/koji/{{docker_cert_name}}.key.pem"
-        dest: registry.key
-{% endif %}
+        - { source: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem",
+            dest: registry.crt },
+        - { source: "{{private}}/files/koji/{{docker_cert_name}}.key.pem",
+            dest: registry.key },
+    when: env == "staging"
+    }
+
 
 - name: Manage docker images and image stream
   hosts: osbs-masters-stg[0]:osbs-masters[0]