Add skip bootstrap option