Revert to using individual containers for providers