Take latest build-infra (fix build)