A set of one or more shelves is configured to be disposed within an enclosure system of a substrate processing system. The set of one or more shelves includes first upper surfaces disposed substantially in a first plane, carrier alignment features configured to align a carrier on the first upper surfaces, second upper surfaces disposed substantially in a second plane that is above the first plane, and process kit ring alignment features configured to align a process kit ring on the carrier above the second upper surfaces.