diff --git a/SampleApplications/Samples/NetCoreConsoleClient/CreateSampleClientCert.cmd b/SampleApplications/Samples/NetCoreConsoleClient/CreateSampleClientCert.cmd
new file mode 100644
index 0000000000..b0559bf04a
--- /dev/null
+++ b/SampleApplications/Samples/NetCoreConsoleClient/CreateSampleClientCert.cmd
@@ -0,0 +1,8 @@
+REM create the app certificate for NetCoreConsoleClient
+set CERTSTORE=".\OPC Foundation\CertificateStores\MachineDefault"
+rd /S/Q %CERTSTORE%
+md %CERTSTORE%
+Opc.Ua.CertificateGenerator.exe -cmd issue -sp %CERTSTORE% -an "UA Sample Client" -dn %COMPUTERNAME% -sn "CN=UA Sample Client/DC=%COMPUTERNAME%" -au "urn:localhost:OPCFoundation:SampleClient
+set CERTSTORE=
+
+
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der b/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der
deleted file mode 100644
index a3eda154e7..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der b/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der
deleted file mode 100644
index 1e9f485f1a..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].pfx b/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].pfx
deleted file mode 100644
index b9cc0f3908..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].pfx and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].pfx b/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].pfx
deleted file mode 100644
index 9f6d2dcb98..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].pfx and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der b/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der
deleted file mode 100644
index a3eda154e7..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der b/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der
deleted file mode 100644
index 1e9f485f1a..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleClient/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/Program.cs b/SampleApplications/Samples/NetCoreConsoleClient/Program.cs
index a66effe127..c4bffcf61a 100644
--- a/SampleApplications/Samples/NetCoreConsoleClient/Program.cs
+++ b/SampleApplications/Samples/NetCoreConsoleClient/Program.cs
@@ -57,18 +57,18 @@ namespace NetCoreConsoleClient
                     ApplicationCertificate = new CertificateIdentifier
                     {
                         StoreType = "Directory",
-                        StorePath = "",
+                        StorePath = "./OPC Foundation/CertificateStores/MachineDefault",
                         SubjectName = Utils.Format("CN={0}, DC={1}", "UA Sample Client", Utils.GetHostName())
                     },
                     TrustedPeerCertificates = new CertificateTrustList
                     {
                         StoreType = "Directory",
-                        StorePath = "",
+                        StorePath = "./OPC Foundation/CertificateStores/UA Applications",
                     },
                     TrustedIssuerCertificates = new CertificateTrustList
                     {
                         StoreType = "Directory",
-                        StorePath = "",
+                        StorePath = "./OPC Foundation/CertificateStores/UA Certificate Authorities",
                     },
                     NonceLength = 32,
                     AutoAcceptUntrustedCertificates = true
diff --git a/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs b/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
index 7a5812b931..68725c6457 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
@@ -536,7 +536,7 @@ namespace Opc.Ua
             List<X509CRL> crls = new List<X509CRL>();
 
             // check for CRL.
-            DirectoryInfo info = new DirectoryInfo(this.Directory.FullName + "\\crl");
+            DirectoryInfo info = new DirectoryInfo(this.Directory.FullName + Path.DirectorySeparatorChar + "crl");
 
             if (info.Exists)
             {
@@ -563,7 +563,7 @@ namespace Opc.Ua
             List<X509CRL> crls = new List<X509CRL>();
 
             // check for CRL.
-            DirectoryInfo info = new DirectoryInfo(this.Directory.FullName + "\\crl");
+            DirectoryInfo info = new DirectoryInfo(this.Directory.FullName + Path.DirectorySeparatorChar + "crl");
 
             if (info.Exists)
             {
@@ -622,7 +622,8 @@ namespace Opc.Ua
 
             StringBuilder builder = new StringBuilder();
             builder.Append(m_directory.FullName);
-            builder.Append("\\crl\\");
+            
+            builder.Append(Path.DirectorySeparatorChar + "crl" + Path.DirectorySeparatorChar);
             builder.Append(GetFileName(issuer));
             builder.Append(".crl");
 
@@ -647,7 +648,7 @@ namespace Opc.Ua
             }
 
             string filePath = m_directory.FullName;
-            filePath += "\\crl";
+            filePath += Path.DirectorySeparatorChar + "crl";
 
             DirectoryInfo dirInfo = new DirectoryInfo(filePath);