diff --git a/SampleApplications/Samples/NetCoreConsoleClient/CreateSampleClientCert.cmd b/SampleApplications/Samples/NetCoreConsoleClient/CreateCert.cmd
similarity index 100%
rename from SampleApplications/Samples/NetCoreConsoleClient/CreateSampleClientCert.cmd
rename to SampleApplications/Samples/NetCoreConsoleClient/CreateCert.cmd
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/createcert.sh b/SampleApplications/Samples/NetCoreConsoleClient/createcert.sh
new file mode 100755
index 0000000000..37773a800a
--- /dev/null
+++ b/SampleApplications/Samples/NetCoreConsoleClient/createcert.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Create a UA Sample Client cert for OPC UA client
+#
+openssl req -newkey rsa:1024 -out cert.crt -keyout cert.key -subj "/DC=$HOSTNAME/CN=UA Sample Client" -nodes
+openssl x509 -days 365 -req -in cert.crt -signkey cert.key -out cert.pem -sha1 -extfile sampleclient.ext 
+openssl pkcs12 -export -in cert.pem -inkey cert.key -out $HOSTNAME.pfx -nodes 
+openssl x509 -in cert.pem -out $HOSTNAME.der -outform DER 
+openssl x509 -in $HOSTNAME.der -inform DER -text
+rm cert.*
+mkdir -p "./OPC Foundation/CertificateStores/MachineDefault/certs"
+mkdir -p "./OPC Foundation/CertificateStores/MachineDefault/private"
+mv $HOSTNAME.der "./OPC Foundation/CertificateStores/MachineDefault/certs"
+mv $HOSTNAME.pfx "./OPC Foundation/CertificateStores/MachineDefault/private"
+
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/sampleclient.ext b/SampleApplications/Samples/NetCoreConsoleClient/sampleclient.ext
new file mode 100644
index 0000000000..b5e1daf044
--- /dev/null
+++ b/SampleApplications/Samples/NetCoreConsoleClient/sampleclient.ext
@@ -0,0 +1,8 @@
+# Extensions to add to a certificate request
+
+subjectKeyIdentifier=hash
+subjectAltName=URI:urn:localhost:OPCFoundation:SampleClient
+authorityKeyIdentifier=critical,keyid,issuer:always
+basicConstraints = critical, CA:FALSE
+keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment, dataEncipherment, keyCertSign
+extendedKeyUsage = critical, serverAuth, clientAuth
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/CreateCert.cmd b/SampleApplications/Samples/NetCoreConsoleServer/CreateCert.cmd
new file mode 100644
index 0000000000..896c1a3383
--- /dev/null
+++ b/SampleApplications/Samples/NetCoreConsoleServer/CreateCert.cmd
@@ -0,0 +1,8 @@
+REM create the app certificate for NetCoreConsoleServer
+set CERTSTORE=".\OPC Foundation\CertificateStores\MachineDefault"
+rd /S/Q %CERTSTORE%
+md %CERTSTORE%
+Opc.Ua.CertificateGenerator.exe -cmd issue -sp %CERTSTORE% -an "UA Sample Server" -dn %COMPUTERNAME% -sn "CN=UA Sample Server/DC=%COMPUTERNAME%" -au "urn:localhost:OPCFoundation:SampleServer
+set CERTSTORE=
+
+
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der b/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der
deleted file mode 100644
index a3eda154e7..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der b/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der
deleted file mode 100644
index 1e9f485f1a..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].pfx b/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].pfx
deleted file mode 100644
index b9cc0f3908..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].pfx and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].pfx b/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].pfx
deleted file mode 100644
index 9f6d2dcb98..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/MachineDefault/private/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].pfx and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der b/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der
deleted file mode 100644
index a3eda154e7..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Client [75AE1D3E2968FF8FDF2E951C9B082BE7163ED5C6].der and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der b/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der
deleted file mode 100644
index 1e9f485f1a..0000000000
Binary files a/SampleApplications/Samples/NetCoreConsoleServer/OPC Foundation/CertificateStores/UA Applications/certs/UA Sample Server [3627D88581A9636C3660099EB92C0E3735557499].der and /dev/null differ
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/createcert.sh b/SampleApplications/Samples/NetCoreConsoleServer/createcert.sh
new file mode 100755
index 0000000000..2dc0fce10a
--- /dev/null
+++ b/SampleApplications/Samples/NetCoreConsoleServer/createcert.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Create a UA Sample Server cert for OPC UA server
+#
+openssl req -newkey rsa:1024 -out cert.crt -keyout cert.key -subj "/DC=$HOSTNAME/CN=UA Sample Server" -nodes
+openssl x509 -days 365 -req -in cert.crt -signkey cert.key -out cert.pem -sha1 -extfile sampleserver.ext 
+openssl pkcs12 -export -in cert.pem -inkey cert.key -out $HOSTNAME.pfx -nodes 
+openssl x509 -in cert.pem -out $HOSTNAME.der -outform DER 
+openssl x509 -in $HOSTNAME.der -inform DER -text
+rm cert.*
+mkdir -p "./OPC Foundation/CertificateStores/MachineDefault/certs"
+mkdir -p "./OPC Foundation/CertificateStores/MachineDefault/private"
+mv $HOSTNAME.der "./OPC Foundation/CertificateStores/MachineDefault/certs"
+mv $HOSTNAME.pfx "./OPC Foundation/CertificateStores/MachineDefault/private"
+
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/sampleserver.ext b/SampleApplications/Samples/NetCoreConsoleServer/sampleserver.ext
new file mode 100644
index 0000000000..b5e1daf044
--- /dev/null
+++ b/SampleApplications/Samples/NetCoreConsoleServer/sampleserver.ext
@@ -0,0 +1,8 @@
+# Extensions to add to a certificate request
+
+subjectKeyIdentifier=hash
+subjectAltName=URI:urn:localhost:OPCFoundation:SampleClient
+authorityKeyIdentifier=critical,keyid,issuer:always
+basicConstraints = critical, CA:FALSE
+keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment, dataEncipherment, keyCertSign
+extendedKeyUsage = critical, serverAuth, clientAuth