Merge "Fix automation of node image building"