Fix AWS sending hostname instead of IP OTW