WIP stablizing CI builds