diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8d9e274..4a29481 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,7 @@
     "files.exclude": {
         "**/.git": false
     },
-    "thunder-client.saveToWorkspace": true,
+    "thunder-client.saveToWorkspace": false,
     "thunder-client.workspaceRelativePath": ".vscode",
     "coverage-gutters.coverageBaseDir": "../.vscode/TestResults/*"
 }
\ No newline at end of file
diff --git a/Archive/Services/AttachmentsService.cs b/Archive/Services/AttachmentsService.cs
index b5ffed3..5a8862a 100644
--- a/Archive/Services/AttachmentsService.cs
+++ b/Archive/Services/AttachmentsService.cs
@@ -72,7 +72,7 @@ public class AttachmentsService : IAttachmentsService
             queryString = "SELECT * FROM " + toolType.HeaderTableName + " WHERE AttachmentId = '" + title + "'";
         }
         DateTime SearchDate = new();
-        string connectionString = @"Server=messv01ec.ec.local\PROD1,53959;Database=Metrology_Archive;Integrated Security=True";
+        string connectionString = @"Server=messqlec1.infineon.com\PROD1,53959;Database=Metrology_Archive;Integrated Security=True";
         using (SqlConnection connection = new(connectionString))
         {
             SqlCommand command = new(queryString, connection);
diff --git a/Archive/appsettings.Development.json b/Archive/appsettings.Development.json
index 3f7265b..8e5d10f 100644
--- a/Archive/appsettings.Development.json
+++ b/Archive/appsettings.Development.json
@@ -3,10 +3,10 @@
   "ApiLoggingContentTypes": "application/json",
   "ApiLoggingPathPrefixes": "/api/inbound",
   "ApiLogPath": "D:\\Metrology\\MetrologyAPILogs",
-  "AttachmentPath": "\\\\messv02ecc1.ec.local\\EC_Metrology_Si\\MetrologyAttachments",
+  "AttachmentPath": "\\\\mesfs.infineon.com\\EC_Metrology_Si\\MetrologyAttachments",
   "BuildNumber": "1",  
   "Company": "Infineon Technologies Americas Corp.",
-  "ConnectionString": "Data Source=messv01ec.ec.local\\PROD1,53959;Integrated Security=True;Initial Catalog=Metrology_Archive;",
+  "ConnectionString": "Data Source=messqlec1.infineon.com\\PROD1,53959;Integrated Security=True;Initial Catalog=Metrology_Archive;",
   "GitCommitSeven": "1234567",
   "Logging": {
     "LogLevel": {
@@ -19,7 +19,7 @@
   "InboundApiAllowedIPList": "",
   "MonAResource": "OI_Metrology_Archive_IFX",
   "MonASite": "auc",
-  "Oi2SqlConnectionString": "Data Source=messv01ec.ec.local\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;",
+  "Oi2SqlConnectionString": "Data Source=messqlec1.infineon.com\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;",
   "OIExportPath": "\\\\openinsight-db-srv.na.infineon.com\\apps\\Metrology\\Data",
   "Serilog": {
     "Using": [
diff --git a/Archive/appsettings.json b/Archive/appsettings.json
index 8780533..51fbf40 100644
--- a/Archive/appsettings.json
+++ b/Archive/appsettings.json
@@ -3,10 +3,10 @@
   "ApiLoggingContentTypes": "application/json",
   "ApiLoggingPathPrefixes": "/api/inbound",
   "ApiLogPath": "D:\\Metrology\\MetrologyAPILogs",
-  "AttachmentPath": "\\\\messv02ecc1.ec.local\\EC_Metrology_Si\\MetrologyAttachments",
+  "AttachmentPath": "\\\\mesfs.infineon.com\\EC_Metrology_Si\\MetrologyAttachments",
   "BuildNumber": "1",  
   "Company": "Infineon Technologies Americas Corp.",
-  "ConnectionString": "Data Source=messv01ec.ec.local\\PROD1,53959;Integrated Security=True;Initial Catalog=Metrology_Archive;",
+  "ConnectionString": "Data Source=messqlec1.infineon.com\\PROD1,53959;Integrated Security=True;Initial Catalog=Metrology_Archive;",
   "GitCommitSeven": "1234567",
   "Logging": {
     "LogLevel": {
@@ -19,7 +19,7 @@
   "InboundApiAllowedIPList": "",
   "MonAResource": "OI_Metrology_Archive_EC",
   "MonASite": "auc",
-  "Oi2SqlConnectionString": "Data Source=messv01ec.ec.local\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;",
+  "Oi2SqlConnectionString": "Data Source=messqlec1.infineon.com\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;",
   "OIExportPath": "\\\\openinsight-db-srv.na.infineon.com\\apps\\Metrology\\Data",
   "Serilog": {
     "Using": [
diff --git a/Server/OI.Metrology.Server.csproj b/Server/OI.Metrology.Server.csproj
index b0ee548..7da6d0b 100644
--- a/Server/OI.Metrology.Server.csproj
+++ b/Server/OI.Metrology.Server.csproj
@@ -8,12 +8,11 @@
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
         <IsPackable>false</IsPackable>
-        <LangVersion>10.0</LangVersion>
         <Nullable>enable</Nullable>
         <OutputType>Exe</OutputType>
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <TargetFramework>net7.0</TargetFramework>
-        <UserSecretsId>6501aa0f-8499-4be5-96a9-e99b11323eeb</UserSecretsId>
+        <UserSecretsId>b0a3891c-b775-422c-80ee-63a2f385045d</UserSecretsId>
     </PropertyGroup>
     <ItemGroup>
         <Compile Remove="logs\**" />
diff --git a/Server/appsettings.json b/Server/appsettings.json
index ca10478..15911ce 100644
--- a/Server/appsettings.json
+++ b/Server/appsettings.json
@@ -1,14 +1,14 @@
 {
   "AllowedHosts": "*",
-  "ApiExportPath": "\\\\messv02ecc1.ec.local\\EC_Metrology_Si",
+  "ApiExportPath": "\\\\mesfs.infineon.com\\EC_Metrology_Si",
   "ApiLoggingContentTypes": "application/json",
   "ApiLoggingPathPrefixes": "/api/inbound",
   "ApiUrl": "~/api",
   "ApiLogPath": "D:\\Metrology\\MetrologyAPILogs",
-  "AttachmentPath": "\\\\messv02ecc1.ec.local\\EC_Metrology_Si\\MetrologyAttachments",
+  "AttachmentPath": "\\\\mesfs.infineon.com\\EC_Metrology_Si\\MetrologyAttachments",
   "BuildNumber": "1",
   "Company": "Infineon Technologies Americas Corp.",
-  "ConnectionString": "Data Source=messv01ec.ec.local\\PROD1,53959;Integrated Security=True;Initial Catalog=Metrology;",
+  "ConnectionString": "Data Source=messqlec1.infineon.com\\PROD1,53959;Integrated Security=True;Initial Catalog=Metrology;",
   "GitCommitSeven": "1234567",
   "Logging": {
     "LogLevel": {
@@ -24,7 +24,7 @@
   "MockRoot": "",
   "MonAResource": "OI_Metrology_Viewer_EC",
   "MonASite": "auc",
-  "Oi2SqlConnectionString": "Data Source=messv01ec.ec.local\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;",
+  "Oi2SqlConnectionString": "Data Source=messqlec1.infineon.com\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;",
   "Serilog": {
     "Using": [
       "Serilog.Sinks.Console",
@@ -63,14 +63,14 @@
     }
   },
   "TableToPath": {
-    "SPVRunHeader": "\\\\messa01ec.ec.local\\apps\\Metrology\\MET08ANLYSDIFAAST230\\Source",
-    "TencorRunHeader": "\\\\messa01ec.ec.local\\apps\\Metrology\\MET08DDUPSFS6420\\Source",
-    "SP1RunHeader": "\\\\messa01ec.ec.local\\apps\\Metrology\\MET08DDUPSP1TBI\\Source",
-    "MercuryProbeRunHeader": "\\\\messa01ec.ec.local\\apps\\Metrology\\MET08RESIHGCV\\Source",
-    "CDERunHeader": "\\\\messa01ec.ec.local\\apps\\Metrology\\MET08RESIMAPCDE\\Source",
-    "SRPRunHeader": "\\\\messa01ec.ec.local\\apps\\Metrology\\MET08RESISRP2100\\Source",
-    "BioRadRunHeader": "\\\\messa01ec.ec.local\\apps\\Metrology\\MET08THFTIRQS408M\\Source",
-    "StratusBioRadRunHeader": "\\\\messa01ec.ec.local\\apps\\Metrology\\MET08THFTIRSTRATUS\\Source"
+    "SPVRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08ANLYSDIFAAST230\\Source",
+    "TencorRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08DDUPSFS6420\\Source",
+    "SP1RunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08DDUPSP1TBI\\Source",
+    "MercuryProbeRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08RESIHGCV\\Source",
+    "CDERunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08RESIMAPCDE\\Source",
+    "SRPRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08RESISRP2100\\Source",
+    "BioRadRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08THFTIRQS408M\\Source",
+    "StratusBioRadRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08THFTIRSTRATUS\\Source"
   },
   "URLs": "http://localhost:5002;",
   "WorkingDirectoryName": "IFXApps"