diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 889cf69fa4..00a7370043 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -99,7 +99,9 @@
           builder_use_auth: true,
           distribution_scope: 'private',
           registry_api_versions: 'v2',
-          builder_openshift_url: 'https://{{osbs_url}}'
+          builder_openshift_url: 'https://{{osbs_url}}',
+          namespace: 'osbs',
+          can_orchestrate: true
         }
     }
   - {
diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml
index 2c87484038..17b1acf988 100644
--- a/playbooks/groups/osbs-orchestrator-cluster.yml
+++ b/playbooks/groups/osbs-orchestrator-cluster.yml
@@ -681,7 +681,9 @@
           builder_use_auth: true,
           distribution_scope: 'private',
           registry_api_versions: 'v2',
-          builder_openshift_url: 'https://{{osbs_url}}'
+          builder_openshift_url: 'https://{{osbs_url}}',
+          namespace: 'osbs',
+          can_orchestrate: true
         },
       when: env == "staging"
       }
diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2
index ba245a98c7..1ca745ad93 100644
--- a/roles/osbs-client/templates/osbs.conf.j2
+++ b/roles/osbs-client/templates/osbs.conf.j2
@@ -31,6 +31,15 @@ kerberos_keytab = {{ default.kerberos_keytab }}
 {% if default.kerberos_principal is defined %}
 kerberos_principal = {{ default.kerberos_principal }}
 {% endif %}
+
+# Orchestrator/Worker Architecture split additions
+{% if default.can_orchestrate is defined %}
+can_orchestrate = {{ default.can_orchestrate }}
+{% endif %}
+{% if default.namespace is defined %}
+namespace = {{ default.namespace }}
+{% endif %}
+
 openshift_url = {{ default.openshift_url }}
 koji_root = {{ default.koji_root }}
 koji_hub = {{ default.koji_hub }}
@@ -77,6 +86,15 @@ kerberos_keytab = {{ default.kerberos_keytab }}
 {% if default.kerberos_principal is defined %}
 kerberos_principal = {{ default.kerberos_principal }}
 {% endif %}
+
+# Orchestrator/Worker Architecture split additions
+{% if default.can_orchestrate is defined %}
+can_orchestrate = {{ default.can_orchestrate }}
+{% endif %}
+{% if default.namespace is defined %}
+namespace = {{ default.namespace }}
+{% endif %}
+
 openshift_url = {{ default.openshift_url }}
 koji_root = {{ default.koji_root }}
 koji_hub = {{ default.koji_hub }}