Improvements to have local configs based in the host name