diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 07381c3fb2..b49a0ddfc5 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -508,6 +508,72 @@
     - name: systemctl daemon-reload
       shell: 'systemctl daemon-reload'
 
+  roles:
+    - {
+      role: osbs-client,
+        general: {
+          verbose: 0,
+          build_json_dir: '/etc/osbs/input/',
+          openshift_required_version: 1.1.0,
+        },
+        default: {
+          username: "{{ osbs_koji_stg_username }}",
+          password: "{{ osbs_koji_stg_password }}",
+          koji_use_kerberos: True,
+          koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
+          koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
+          openshift_url: 'https://{{osbs_url}}/',
+          registry_uri: 'https://{{docker_registry}}/v2',
+          source_registry_uri: 'https://{{source_registry}}/v2',
+          build_host: '{{osbs_url}}',
+          koji_root: 'https://{{koji_url}}/koji',
+          koji_hub: 'https://{{koji_url}}/kojihub',
+          sources_command: 'fedpkg sources',
+          build_type: 'prod',
+          authoritative_registry: 'registry.example.com',
+          vendor: 'Fedora Project',
+          verify_ssl: true,
+          use_auth: true,
+          builder_use_auth: true,
+          distribution_scope: 'private',
+          registry_api_versions: 'v2',
+          builder_openshift_url: 'https://{{osbs_url}}'
+        },
+      when: env == "staging"
+      }
+    - {
+      role: osbs-client,
+        general: {
+          verbose: 0,
+          build_json_dir: '/etc/osbs/input/',
+          openshift_required_version: 1.1.0,
+        },
+        default: {
+          username: "{{ osbs_koji_prod_username }}",
+          password: "{{ osbs_koji_prod_password }}",
+          koji_use_kerberos: True,
+          koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
+          koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
+          openshift_url: 'https://{{osbs_url}}/',
+          registry_uri: 'https://{{docker_registry}}/v2',
+          source_registry_uri: 'https://{{source_registry}}/v2',
+          build_host: '{{osbs_url}}',
+          koji_root: 'https://{{koji_url}}/koji',
+          koji_hub: 'https://{{koji_url}}/kojihub',
+          sources_command: 'fedpkg sources',
+          build_type: 'prod',
+          authoritative_registry: 'registry.example.com',
+          vendor: 'Fedora Project',
+          verify_ssl: true,
+          use_auth: true,
+          builder_use_auth: true,
+          distribution_scope: 'private',
+          registry_api_versions: 'v2',
+          builder_openshift_url: 'https://{{osbs_url}}'
+        },
+      when: env == "production"
+      }
+
   tasks:
     - name: copy docker iptables script
       copy: