Separate image creation to a separate task + matching API