diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg
index 8ca7c6e8b7..fd15cdda48 100644
--- a/inventory/group_vars/osbs-stg
+++ b/inventory/group_vars/osbs-stg
@@ -90,8 +90,6 @@ osbs_authoritative_registry: "{{ stable_registry }}"
 osbs_registry_api_versions:
 - v2
 osbs_registry_secret_name: v2-registry-dockercfg
-osbs_registry_uri: ''
-osbs_source_registry_uri: ''
 osbs_build_json_dir: /usr/share/osbs
 osbs_sources_command: fedpkg sources
 osbs_vendor: Fedora Project
diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml
index b800e10bbd..f15ad2a52c 100644
--- a/playbooks/groups/osbs-orchestrator-cluster.yml
+++ b/playbooks/groups/osbs-orchestrator-cluster.yml
@@ -385,11 +385,6 @@
 
 - name: Setup Koji auth for OpenShift Orchestrator
   hosts: osbs-masters-stg[0]
-  tags:
-    - osbs-cluster-req
-  user: root
-  gather_facts: True
-
   vars_files:
     - /srv/web/infra/ansible/vars/global.yml
     - "/srv/private/ansible/vars.yml"
@@ -413,7 +408,7 @@
       when: env == "staging"
 
     - name: set policy for koji builder in openshift for atomic-reactor
-      shell: "oadm policy add-role-to-user -n {{ osbs_namespace }} edit system:serviceaccount:{{osbs_namespace}}:{{osbs_ && touch /etc/origin/atomic-reactor-policy-added"
+      shell: "oadm policy add-role-to-user -n {{ osbs_namespace }} edit system:serviceaccount:{{osbs_namespace}}:{{osbs_builder_user}} && touch /etc/origin/atomic-reactor-policy-added"
       args:
         creates: "/etc/origin/atomic-reactor-policy-added"