Merge "update the build nodes as 18 instead of 16"