diff --git a/SampleApplications/Samples/NetCoreConsoleClient/Properties/launchSettings.json b/SampleApplications/Samples/NetCoreConsoleClient/Properties/launchSettings.json
new file mode 100644
index 0000000000..ce4cc11e04
--- /dev/null
+++ b/SampleApplications/Samples/NetCoreConsoleClient/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "NetCoreConsoleClient": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "COMPlus_ReadyToRunExcludeList": "System.Security.Cryptography.X509Certificates"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/Properties/launchSettings.json b/SampleApplications/Samples/NetCoreConsoleServer/Properties/launchSettings.json
new file mode 100644
index 0000000000..a8c0c769e5
--- /dev/null
+++ b/SampleApplications/Samples/NetCoreConsoleServer/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "NetCoreConsoleServer": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "Key": "Value",
+        "COMPlus_ReadyToRunExcludeList": "System.Security.Cryptography.X509Certificates"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Stack/Opc.Ua.Core/Security/Certificates/CertificateFactory.cs b/Stack/Opc.Ua.Core/Security/Certificates/CertificateFactory.cs
index af6b170dd2..7e941dc4be 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/CertificateFactory.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/CertificateFactory.cs
@@ -224,7 +224,7 @@ namespace Opc.Ua
 
             var nameValues = new ArrayList();
             nameValues.Add(domainNames[0]);
-            nameValues.Add(applicationName);
+            nameValues.Add(subjectName);
 
             // self signed 
             X509Name subjectDN = new X509Name(nameOids, nameValues);
@@ -480,7 +480,7 @@ namespace Opc.Ua
             // create the subject name,
             if (String.IsNullOrEmpty(subjectName))
             {
-                subjectName = Utils.Format("CN={0}/DC={1}", applicationName, domainNames[0]);
+                subjectName = applicationName;
             }
         }
         #endregion