Fixing build erb issue and CNAME removed