CNAME added
fixing some templates issues