Fix hosts issue and change the template