diff --git a/tools/run_shipyard.sh b/tools/run_shipyard.sh
index 739aedd4..f5e3d02b 100755
--- a/tools/run_shipyard.sh
+++ b/tools/run_shipyard.sh
@@ -31,8 +31,8 @@ set -ex
 
 # Get the path of the directory where the script is located
 # Source Base Docker Command
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd ${DIR} && source shipyard_docker_base_command.sh
+DIR="$(realpath $(dirname "${BASH_SOURCE}"))"
+source "${DIR}/shipyard_docker_base_command.sh"
 
 # Execute Shipyard CLI
 #
diff --git a/tools/shipyard_docker_base_command.sh b/tools/shipyard_docker_base_command.sh
index 1906c0d1..9e8b51af 100644
--- a/tools/shipyard_docker_base_command.sh
+++ b/tools/shipyard_docker_base_command.sh
@@ -19,7 +19,7 @@
 # before executing this script if they differ from the default values.
 #
 NAMESPACE="${NAMESPACE:-ucp}"
-SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/attcomdev/shipyard:latest}"
+SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/airshipit/shipyard:master}"
 
 # Define Base Docker Command
 base_docker_command=$(cat << EndOfCommand