refactor image variants, and upload