initial work to make this suitable for our repo and iso images