diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index 092b3f92aa..ebee530b3b 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -51,7 +51,9 @@ UBUNTU_SEC_REPO=${UBUNTU_SEC_REPO:-$(awk "/^deb .*ubuntu\/? ${UBUNTU_RELEASE}-se
 
 
 ## Library Check -------------------------------------------------------------
-info_block "Checking for required libraries." 2> /dev/null || source $(dirname ${0})/scripts-library.sh
+info_block "Checking for required libraries." 2> /dev/null ||
+    source $(dirname ${0})/scripts-library.sh ||
+    source scripts/scripts-library.sh
 
 
 ## Main ----------------------------------------------------------------------
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index b3718e3119..9507be074f 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -30,8 +30,9 @@ export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:-"noninteractive"}
 
 
 ## Functions -----------------------------------------------------------------
-info_block "Checking for required libraries." 2> /dev/null || source $(dirname ${0})/scripts-library.sh
-
+info_block "Checking for required libraries." 2> /dev/null ||
+    source $(dirname ${0})/scripts-library.sh ||
+    source scripts/scripts-library.sh
 
 ## Main ----------------------------------------------------------------------
 info_block "Bootstrapping System with Ansible"
diff --git a/scripts/run-aio-build.sh b/scripts/run-aio-build.sh
index 97d0bcaae8..7a052fb258 100755
--- a/scripts/run-aio-build.sh
+++ b/scripts/run-aio-build.sh
@@ -38,13 +38,13 @@ git clone -b ${REPO_BRANCH} ${REPO_URL} ${WORKING_FOLDER}
 cd ${WORKING_FOLDER}
 
 # first, bootstrap the AIO host
-source $(dirname ${0})/bootstrap-aio.sh
+source scripts/bootstrap-aio.sh
 
 # next, bootstrap Ansible
-source $(dirname ${0})/bootstrap-ansible.sh
+source scripts/bootstrap-ansible.sh
 
 # finally, run all the playbooks
-bash $(dirname ${0})/run-playbooks.sh
+bash scripts/run-playbooks.sh
 
 # put a motd in place to help the user know what stuff is accessible once the build is complete
 cat > /etc/update-motd.d/20-openstack<< EOF