Mbst 9893 more granular uploads

I'd maybe move this switch into a separated method