[WIP] Convert builder images to use go
Modify images to allow testing