Rework artifact upload handling