Fixing a big hostname bug that affects HA mode