fix yamls
Merge branch 'master' into CFY-1231-new-bootstrap