diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll
index 53f3069..62f6d27 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll and b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll
index ab26cfe..489081c 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll and b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.LsClient.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.LsClient.dll
index 8351622..d93ffe8 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.LsClient.dll and b/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.LsClient.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.SsoAdmin.Utils.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.SsoAdmin.Utils.dll
index d2ea3c6..f14434c 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.SsoAdmin.Utils.dll and b/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.SsoAdmin.Utils.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.SsoAdminClient.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.SsoAdminClient.dll
index 2218e45..bf3d0ee 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.SsoAdminClient.dll and b/Modules/VMware.vSphere.SsoAdmin/netcoreapp3.1/VMware.vSphere.SsoAdminClient.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
index ad4d30c..4500fea 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
@@ -683,11 +683,10 @@ namespace VMware.vSphere.SsoAdminClient
 
          if (ldapCertificates != null && ldapCertificates.Length > 0) {
             var certificates = new List<string>();
-            foreach (var ldapCert in ldapCertificates) {
-               if (ldapCert != null) {
-                  certificates.Add(ldapCert.ToString());
-               }  
+            foreach (var ldapCert in ldapCertificates) {               
+               certificates.Add(Convert.ToBase64String(ldapCert.Export(X509ContentType.Cert), Base64FormattingOptions.InsertLineBreaks));               
             }
+
             if (certificates.Count > 0) {
                adminLdapIdentitySourceDetails.certificates = certificates.ToArray();
             }
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/build.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/build.ps1
index ae02368..4ad378b 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/build.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/build.ps1
@@ -49,7 +49,7 @@ param($OutputFolder)
          "VMware.vSphere.LsClient",
          "bin",
          $Configuration,
-         "netcoreapp2.0",
+         "netcoreapp3.1",
          "VMware.vSphere.LsClient.dll")
 
       $net45LsSource = [IO.Path]::Combine(
@@ -67,7 +67,7 @@ param($OutputFolder)
          "VMware.vSphere.SsoAdminClient",
          "bin",
          $Configuration,
-         "netcoreapp2.0",
+         "netcoreapp3.1",
          "VMware.vSphere.SsoAdminClient.dll")
 
       $net45SsoAdminSource = [IO.Path]::Combine(
@@ -85,7 +85,7 @@ param($OutputFolder)
          "VMware.vSphere.SsoAdmin.Utils",
          "bin",
          $Configuration,
-         "netcoreapp2.0",
+         "netcoreapp3.1",
          "VMware.vSphere.SsoAdmin.Utils.dll")
 
       $net45UtilsSource = [IO.Path]::Combine(