Completed v2 infrastructure scripts