Updated infrastructure [skip ci]