smarter about using system fqdn