move image building logic into builder
Riding that :tractor: right through builders! :lipstick: