diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index 23a18d2b1b..fdc8d7e981 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -176,6 +176,7 @@ sed -i "s|OSA_PLAYBOOK_PATH|${OSA_PLAYBOOK_PATH}|g" /usr/local/bin/openstack-ans
 
 # Create openstack ansible wrapper tool
 cp -v ${OSA_WRAPPER_BIN} /usr/local/bin/openstack-ansible
+sed -i "s|OSA_CLONE_DIR|${OSA_CLONE_DIR}|g" /usr/local/bin/openstack-ansible
 
 # Ensure wrapper tool is executable
 chmod +x /usr/local/bin/openstack-ansible
diff --git a/scripts/openstack-ansible.sh b/scripts/openstack-ansible.sh
index 677fe4d806..dd3d823a71 100644
--- a/scripts/openstack-ansible.sh
+++ b/scripts/openstack-ansible.sh
@@ -31,7 +31,7 @@ function info {
 RUN_CMD=$(basename ${0})
 
 # Apply the OpenStack-Ansible configuration selectively.
-if [[ "${PWD}" == *"${OSA_CLONE_DIR}"* ]] || [ "${RUN_CMD}" == "openstack-ansible" ]; then
+if [[ "${PWD}" == *"OSA_CLONE_DIR"* ]] || [ "${RUN_CMD}" == "openstack-ansible" ]; then
 
   # Source the Ansible configuration.
   . /usr/local/bin/openstack-ansible.rc