Fix infra provider wait