Switch from infra to patrick as source, more reliable