Fixing multi instance hostname issue

Change-Id: Ie29bbf633266c7a8568a0e506f63f4308f10d40f