Fixes to match the latest ci cookbook.

Code review plox @mahmoudimus @bninja @mjallday @remear