Fix default hostname mappings and configuration