Tweak 3 tier to remove broken hardcoded datacenter