Add final workflow stages, rename some to get sorting right