Remove existing hostname before adding on rebuild