[PR] Updates to align with provisioning changes