Merge "Fixing invalid hostname filled by ci-installer"