Some changes to host determination. We run this with foreman, now