Merge "Add default fqdn and web port"