Changes to set tag to instance name during hostname resolution