diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index ab47c3f6d6..4be83f1e7d 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -24,6 +24,9 @@ export BOOTSTRAP_OPTS=${BOOTSTRAP_OPTS:-''}
 # Store the clone repo root location
 export OSA_CLONE_DIR="${OSA_CLONE_DIR:-$(readlink -f $(dirname $0)/..)}"
 
+# This script should be executed from the root directory of the cloned repo
+cd "$(dirname "${0}")/.."
+
 ## Main ----------------------------------------------------------------------
 
 # Ensure that some of the wrapper options are overridden
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index bfce6d7916..dc699e9bb2 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -18,7 +18,6 @@
 ## Shell Opts ----------------------------------------------------------------
 set -e -u -x
 
-
 ## Vars ----------------------------------------------------------------------
 export HTTP_PROXY=${HTTP_PROXY:-""}
 export HTTPS_PROXY=${HTTPS_PROXY:-""}
@@ -40,7 +39,6 @@ export OSA_WRAPPER_BIN="${OSA_WRAPPER_BIN:-scripts/openstack-ansible.sh}"
 # This script should be executed from the root directory of the cloned repo
 cd "$(dirname "${0}")/.."
 
-
 ## Functions -----------------------------------------------------------------
 info_block "Checking for required libraries." 2> /dev/null ||
     source scripts/scripts-library.sh