Fix to prevent common hostnames - use fqdn for stored configs

Improvement