Update utitlity dockerfiles to be based on master file