diff --git a/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj b/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj
index dfa136788a..ab998ccef7 100644
--- a/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj	
+++ b/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj	
@@ -342,13 +342,13 @@
     <Compile Include="Common\DiscoveredServerOnNetworkListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Common\DiscoveredServerOnNetworkListCtrl.designer.cs">
+    <Compile Include="Common\DiscoveredServerOnNetworkListCtrl.Designer.cs">
       <DependentUpon>DiscoveredServerOnNetworkListCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="Common\DiscoveredServerOnNetworkListDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Common\DiscoveredServerOnNetworkListDlg.designer.cs">
+    <Compile Include="Common\DiscoveredServerOnNetworkListDlg.Designer.cs">
       <DependentUpon>DiscoveredServerOnNetworkListDlg.cs</DependentUpon>
     </Compile>
     <Compile Include="Common\SelectHostCtrl.cs">
@@ -1054,4 +1054,4 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/NetCoreConsoleServer.csproj b/SampleApplications/Samples/NetCoreConsoleServer/NetCoreConsoleServer.csproj
index 51a56799bc..36f9a185e4 100644
--- a/SampleApplications/Samples/NetCoreConsoleServer/NetCoreConsoleServer.csproj
+++ b/SampleApplications/Samples/NetCoreConsoleServer/NetCoreConsoleServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net46</TargetFramework>
     <AssemblyName>NetCoreConsoleServer</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>NetCoreConsoleServer</PackageId>
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.SampleServer.Config.xml b/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.SampleServer.Config.xml
index 947850171f..12ff81a0ea 100644
--- a/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.SampleServer.Config.xml
+++ b/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.SampleServer.Config.xml
@@ -13,27 +13,27 @@
     
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
-      <StoreType>X509Store</StoreType>
-      <StorePath>CurrentUser\My</StorePath>
+      <StoreType>Directory</StoreType>
+      <StorePath>./OPC Foundation/PKI/own</StorePath>
       <SubjectName>CN=UA Core Sample Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/UA Certificate Authorities</StorePath>
+      <StorePath>./OPC Foundation/PKI/trusted</StorePath>
     </TrustedIssuerCertificates>
     
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/UA Applications</StorePath>
+      <StorePath>./OPC Foundation/PKI/issuer</StorePath>
     </TrustedPeerCertificates>
     
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/RejectedCertificates</StorePath>
+      <StorePath>./OPC Foundation/PKI/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
@@ -58,7 +58,6 @@
   <ServerConfiguration>
     <BaseAddresses>
       <ua:String>opc.tcp://localhost:51210/UA/SampleServer</ua:String>
-      <ua:String>https://localhost:51212/UA/SampleServer/</ua:String>
     </BaseAddresses>
 
     <!-- 
@@ -87,11 +86,10 @@
         <SecurityMode>Sign_2</SecurityMode>
         <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256</SecurityPolicyUri>
       </ServerSecurityPolicy>
-      <!--Removing no secuirty option from the configuration as this is a security risk
-        <ServerSecurityPolicy>
+      <ServerSecurityPolicy>
         <SecurityMode>None_1</SecurityMode>
         <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#None</SecurityPolicyUri>
-      </ServerSecurityPolicy>-->
+      </ServerSecurityPolicy>
       <ServerSecurityPolicy>
         <SecurityMode>Sign_2</SecurityMode>
         <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
@@ -164,7 +162,7 @@
       <ua:UserIdentityTokens />
     </RegistrationEndpoint>
 
-    <MaxRegistrationInterval>30000</MaxRegistrationInterval>
+    <MaxRegistrationInterval>0</MaxRegistrationInterval>
     <NodeManagerSaveFile>Opc.Ua.Server.nodes.xml</NodeManagerSaveFile>
     
     <MaxPublishRequestCount>20</MaxPublishRequestCount>
@@ -211,7 +209,7 @@
   </Extensions>
 
   <TraceConfiguration>
-    <OutputFilePath>%LocalApplicationData%/Logs/Opc.Ua.SampleServer.log.txt</OutputFilePath>
+    <OutputFilePath>./Opc.Ua.SampleServer.log.txt</OutputFilePath>
     <DeleteOnLoad>true</DeleteOnLoad>
     <!-- Show Only Errors -->
     <!-- <TraceMasks>1</TraceMasks> -->
@@ -230,4 +228,4 @@
   <!-- Disables the hi-res clock if the QueryPerformanceCounter does work on a particular machine. -->
   <DisableHiResClock>true</DisableHiResClock>
 
-</ApplicationConfiguration>
\ No newline at end of file
+</ApplicationConfiguration>