Update to use tee for builder output