Small changes to havae everything building and deploying painlessly :)