Upgrade to v3 bootstrap