infra provider tweaks