diff --git a/tools/airship b/tools/airship
index 4c5a69ee2..b5c376fbf 100755
--- a/tools/airship
+++ b/tools/airship
@@ -29,13 +29,19 @@ fi
 ENV_FILE=$(mktemp)
 trap "{ rm -f $ENV_FILE; }" EXIT
 
+export OS_PASSWORD=${OS_PASSWORD:-password123}
+# If shipyard password is defined, provide it to shipyard component
+if [ "$1" = "shipyard" ] && [ -n "$OS_SHIPYARD_PASSWORD" ]; then
+    export OS_PASSWORD=${OS_SHIPYARD_PASSWORD}
+fi
+
 # prepare docker environment file
 cat > $ENV_FILE << EOF
 PEGLEG_PASSPHRASE=${PEGLEG_PASSPHRASE:-password123}
 PEGLEG_SALT=${PEGLEG_SALT:-password123}
 
-OS_AUTH_URL=${OS_AUTH_URL:-http://keystone-api.ucp.svc.cluster.local:5000/v3}
-OS_PASSWORD=${OS_PASSWORD:-password123}
+OS_AUTH_URL=${OS_AUTH_URL:-http://keystone.ucp.svc.cluster.local:80/v3}
+OS_PASSWORD=${OS_PASSWORD}
 OS_PROJECT_DOMAIN_NAME=${OS_PROJECT_DOMAIN_NAME:-default}
 OS_PROJECT_NAME=${OS_PROJECT_NAME:-service}
 OS_USERNAME=${OS_USERNAME:-shipyard}