Update to include self-signed certificates