Update to latest v1 bootstrap