Add utility to reset images. Better handle upgrade flow.