Improve certificate generation and include missing IP SAN