Improve script to use $WORKSPACE