diff --git a/deployment/libvirt/cleanup_network.sh b/deployment/libvirt/cleanup_network.sh
index a783a8c0..c6f0fac3 100755
--- a/deployment/libvirt/cleanup_network.sh
+++ b/deployment/libvirt/cleanup_network.sh
@@ -2,9 +2,9 @@
 #
 # cleanup_network.sh - Cleans up network interfaces - not safe to run blindly!
 
-MY_WORKING_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
-source ${MY_WORKING_DIR}/functions.sh
+source ${SCRIPT_DIR}/functions.sh
 
 NETWORK_DEFAULT=${NETWORK_DEFAULT:-default}
 BRIDGE_INTERFACE=${BRIDGE_INTERFACE=stxbr0}
diff --git a/deployment/libvirt/destroy_allinone.sh b/deployment/libvirt/destroy_allinone.sh
index 3b69e04e..911fad2d 100755
--- a/deployment/libvirt/destroy_allinone.sh
+++ b/deployment/libvirt/destroy_allinone.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-MY_WORKING_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
-source ${MY_WORKING_DIR}/functions.sh
+source ${SCRIPT_DIR}/functions.sh
 
 BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
 CONTROLLER=${CONTROLLER:-controller-allinone}
diff --git a/deployment/libvirt/destroy_standard_controller.sh b/deployment/libvirt/destroy_standard_controller.sh
index 0d65ce91..81ac6b54 100755
--- a/deployment/libvirt/destroy_standard_controller.sh
+++ b/deployment/libvirt/destroy_standard_controller.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-MY_WORKING_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
-source ${MY_WORKING_DIR}/functions.sh
+source ${SCRIPT_DIR}/functions.sh
 
 BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
 CONTROLLER=${CONTROLLER:-controller}
diff --git a/deployment/libvirt/setup_allinone.sh b/deployment/libvirt/setup_allinone.sh
index 091593a5..5069db71 100755
--- a/deployment/libvirt/setup_allinone.sh
+++ b/deployment/libvirt/setup_allinone.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+
 usage() {
     echo "$0 [-h] [-i <iso image>]"
     echo ""
@@ -38,7 +40,7 @@ CONTROLLER=${CONTROLLER:-controller-allinone}
 DOMAIN_DIRECTORY=vms
 DOMAIN_FILE=$DOMAIN_DIRECTORY/$CONTROLLER.xml
 
-bash destroy_allinone.sh
+bash ${SCRIPT_DIR}/destroy_allinone.sh
 
 [ ! -d ${DOMAIN_DIRECTORY} ] && mkdir ${DOMAIN_DIRECTORY}
 
@@ -49,7 +51,7 @@ for i in {0..1}; do
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${CONTROLLER_NODE}-2.img 200G
     ISOIMAGE=${ISOIMAGE}
     DOMAIN_FILE=${DOMAIN_DIRECTORY}/${CONTROLLER_NODE}.xml
-    cp controller_allinone.xml ${DOMAIN_FILE}
+    cp ${SCRIPT_DIR}/controller_allinone.xml ${DOMAIN_FILE}
     sed -i -e "
         s,NAME,${CONTROLLER_NODE},
         s,DISK0,/var/lib/libvirt/images/${CONTROLLER_NODE}-0.img,
diff --git a/deployment/libvirt/setup_standard_controller.sh b/deployment/libvirt/setup_standard_controller.sh
index 6ed6f087..0ce994ab 100755
--- a/deployment/libvirt/setup_standard_controller.sh
+++ b/deployment/libvirt/setup_standard_controller.sh
@@ -2,6 +2,8 @@
 
 #set -x
 
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+
 usage() {
     echo "$0 [-h] [-i <iso image>]"
     echo ""
@@ -40,7 +42,7 @@ CONTROLLER=${CONTROLLER:-controller}
 COMPUTE=${COMPUTE:-compute}
 DOMAIN_DIRECTORY=vms
 
-bash destroy_standard_controller.sh
+bash ${SCRIPT_DIR}/destroy_standard_controller.sh
 
 [ ! -d ${DOMAIN_DIRECTORY} ] && mkdir ${DOMAIN_DIRECTORY}
 
@@ -50,7 +52,7 @@ for i in {0..1}; do
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${CONTROLLER_NODE}-1.img 200G
     ISOIMAGE=${ISOIMAGE}
     DOMAIN_FILE=${DOMAIN_DIRECTORY}/${CONTROLLER_NODE}.xml
-    cp controller.xml ${DOMAIN_FILE}
+    cp ${SCRIPT_DIR}/controller.xml ${DOMAIN_FILE}
     sed -i -e "
         s,NAME,${CONTROLLER_NODE},
         s,DISK0,/var/lib/libvirt/images/${CONTROLLER_NODE}-0.img,
@@ -76,7 +78,7 @@ for i in {0..1}; do
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${COMPUTE_NODE}-0.img 200G
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${COMPUTE_NODE}-1.img 200G
     DOMAIN_FILE=${DOMAIN_DIRECTORY}/${COMPUTE_NODE}.xml
-    cp compute.xml ${DOMAIN_FILE}
+    cp ${SCRIPT_DIR}/compute.xml ${DOMAIN_FILE}
     sed -i -e "
         s,NAME,${COMPUTE_NODE},;
         s,DISK0,/var/lib/libvirt/images/${COMPUTE_NODE}-0.img,;