Fix for DNS name coming from distro not environment