Some enhancements to bootstrap.yml

Fixed in new commit.