diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg
index a166fe982c..97ecf53a75 100644
--- a/inventory/group_vars/osbs-stg
+++ b/inventory/group_vars/osbs-stg
@@ -20,13 +20,15 @@ koji_builder_user: dockerbuilder
 osbs_client_conf_path: /etc/osbs.conf
 
 openshift_htpasswd_file: /etc/origin/htpasswd
-openshift_ansible_git_rev: openshift-ansible-3.5.97-1
-openshift_ansible_ssh_user: root
-openshift_ansible_install_examples: false
-openshift_ansible_containerized_deploy: false
-openshift_auth_profile: osbs
+
+# openshift-ansible variables
+oa_version: openshift-ansible-3.5.97-1
+oa_ssh_user: root
+oa_install_examples: false
+oa_containerized_deploy: false
+oa_auth_profile: osbs
 origin_release: v1.5.1
-openshift_debug_level: 2
+oa_debug_level: 2
 
 osbs_namespace: "osbs"
 osbs_koji_username: "kojibuilder_stg"
diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml
index bbff4c2d3b..7a2731aee2 100644
--- a/playbooks/groups/osbs-orchestrator-cluster.yml
+++ b/playbooks/groups/osbs-orchestrator-cluster.yml
@@ -211,17 +211,17 @@
     openshift_release: "{{ origin_release }}"
     openshift_ansible_path: "/root/openshift-ansible"
     openshift_ansible_playbook: "playbooks/byo/config.yml"
-    openshift_ansible_version: "{{ openshift_ansible_git_rev }}"
-    openshift_ansible_ssh_user: "{{ openshift_ansible_ssh_user }}"
-    openshift_ansible_install_examples: "{{ openshift_ansible_install_examples }}"
-    openshift_ansible_containerized_deploy: "{{ openshift_ansible_containerized_deploy }}"
+    openshift_ansible_version: "{{ oa_version }}"
+    openshift_ansible_ssh_user: "{{ oa_ssh_user }}"
+    openshift_ansible_install_examples: "{{ oa_examples }}"
+    openshift_ansible_containerized_deploy: "{{ oa_containerized_deploy }}"
     openshift_cluster_masters_group: "osbs-masters-stg"
     openshift_cluster_nodes_group: "osbs-nodes-stg"
     openshift_cluster_infra_group: "osbs-masters-stg"
-    openshift_auth_profile: "{{ openshift_auth_profile }}"
+    openshift_auth_profile: "{{ oa_auth_profile }}"
     openshift_cluster_url: "{{ osbs_url }}"
     openshift_master_ha: false
-    openshift_debug_level: "{{ openshift_debug_level }}"
+    openshift_debug_level: "{{ oa_debug_level }}"
     openshift_shared_infra: true
     openshift_deployment_type: "origin"
     openshift_metrics_deploy: true
@@ -235,17 +235,17 @@
     openshift_release: "{{ origin_release }}"
     openshift_ansible_path: "/root/openshift-ansible"
     openshift_ansible_playbook: "playbooks/byo/config.yml"
-    openshift_ansible_version: "{{ openshift_ansible_git_rev }}"
-    openshift_ansible_ssh_user: "{{ openshift_ansible_ssh_user }}"
-    openshift_ansible_install_examples: "{{ openshift_ansible_install_examples }}"
-    openshift_ansible_containerized_deploy: "{{ openshift_ansible_containerized_deploy }}"
+    openshift_ansible_version: "{{ oa_version }}"
+    openshift_ansible_ssh_user: "{{ oa_ssh_user }}"
+    openshift_ansible_install_examples: "{{ oa_install_examples }}"
+    openshift_ansible_containerized_deploy: "{{ oa_containerized_deploy }}"
     openshift_cluster_masters_group: "osbsworker-masters-stg"
     openshift_cluster_nodes_group: "osbsworker-nodes-stg"
     openshift_cluster_infra_group: "osbsworker-masters-stg"
-    openshift_auth_profile: "{{ openshift_auth_profile }}"
+    openshift_auth_profile: "{{ oa_auth_profile }}"
     openshift_cluster_url: "{{ osbsworker_x86_64_url }}"
     openshift_master_ha: false
-    openshift_debug_level: "{{ openshift_debug_level }}"
+    openshift_debug_level: "{{ oa_debug_level }}"
     openshift_shared_infra: true
     openshift_deployment_type: "origin"
     openshift_metrics_deploy: true