Move service images to be more dynamic

#22