Make CI Build more Robust