diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8e7b4b6..95ef277 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -28,37 +28,11 @@
             }
         },
         {
-            "name": "Watch Server",
+            "name": ".NET Core Attach",
             "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            "cwd": "${workspaceFolder}",
-            "program": "dotnet",
-            "args": [
-                "watch",
-                "--launch-profile",
-                "Phares-Development",
-                "--project",
-                "Server",
-                "--verbose"
-            ]
-        },
-        {
-            "name": "Incognito Edge",
-            "type": "msedge",
-            "request": "launch",
-            "runtimeArgs": [
-                "--profile-directory=Default",
-                "-inprivate"
-            ],
-            "url": "https://localhost:7130/swagger/index.html",
-            "preLaunchTask": "build"
-        }
-    ],
-    "compounds": [
-        {
-            "name": "* Watch Server - Incognito Edge",
-            "configurations": [ "Watch Server", "Incognito Edge" ]
+            "request": "attach",
+            "preLaunchTask": "watch",
+            "processName": "OI.Metrology.Server.exe"
         }
     ]
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 3fb2e84..5e32c89 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -26,7 +26,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "watch",
+            "label": "old-watch",
             "command": "dotnet",
             "type": "process",
             "args": [
@@ -36,6 +36,40 @@
                 "${workspaceFolder}/Server/OI.Metrology.Server.csproj"
             ],
             "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "--launch-profile",
+                "https",
+                "run",
+                "--project",
+                "${workspaceFolder}/Server/OI.Metrology.Server.csproj",
+                "--verbose"
+            ],
+            "isBackground": true,
+            "dependsOn": [
+                "build"
+            ],
+            "problemMatcher": {
+                "fileLocation": "relative",
+                "pattern": {
+                    "regexp": "^([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(error|warning|info)\\s+(TS\\d+)\\s*:\\s*(.*)$",
+                    "file": 1,
+                    "location": 2,
+                    "severity": 3,
+                    "code": 4,
+                    "message": 5
+                },
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "^.*Shutdown requested.*",
+                    "endsPattern": "^.*Application started.*"
+                }
+            }
         }
     ]
 }
\ No newline at end of file
diff --git a/Client/wwwroot/appsettings.Development.json b/Client/wwwroot/appsettings.Development.json
index a15acf7..8605229 100644
--- a/Client/wwwroot/appsettings.Development.json
+++ b/Client/wwwroot/appsettings.Development.json
@@ -1,6 +1,6 @@
 {
   "ApiUrl": "https://localhost:7130",
-  "MonAResource": "Asdf_Asdf_EC",
   "IsDevelopment": true,
-  "IsStaging": false
+  "IsStaging": false,
+  "MonAResource": "Asdf_Asdf_EC"
 }
\ No newline at end of file
diff --git a/Client/wwwroot/appsettings.json b/Client/wwwroot/appsettings.json
index 65b38e6..54ddd2b 100644
--- a/Client/wwwroot/appsettings.json
+++ b/Client/wwwroot/appsettings.json
@@ -1,8 +1,8 @@
 {
   "ApiUrl": "http://localhost:50199",
   "Company": "Infineon Technologies Americas Corp.",
-  "MonAResource": "Asdf_Asdf_EC",
-  "MonASite": "auc",
   "IsDevelopment": false,
-  "IsStaging": false
+  "IsStaging": false,
+  "MonAResource": "Asdf_Asdf_EC",
+  "MonASite": "auc"
 }
\ No newline at end of file
diff --git a/Server/.vscode/launch.json b/Server/.vscode/launch.json
index 31e4dcf..eff4e55 100644
--- a/Server/.vscode/launch.json
+++ b/Server/.vscode/launch.json
@@ -10,14 +10,15 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/bin/Debug/net6.0/win-x64/Archive.dll",
+            "program": "${workspaceFolder}/bin/Debug/net7.0/win-x64/OI.Metrology.Server.dll",
             "args": [],
             "cwd": "${workspaceFolder}",
             "stopAtEntry": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
                 "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)",
+                "uriFormat": "%s/swagger/index.html"
             },
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
@@ -30,22 +31,8 @@
             "name": ".NET Core Attach",
             "type": "coreclr",
             "request": "attach",
-            "processName": "Archive"
-        },
-        {
-            "name": "Watch",
-            "type": "coreclr",
-            "request": "launch",
-            "cwd": "${workspaceFolder}",
-            "program": "dotnet",
-            "args": [
-                "watch",
-                "--launch-profile",
-                "Phares-Development",
-                "--project",
-                ".",
-                "--verbose" // Let's us confirm browser connects with hot reload capabilities
-            ]
+            "preLaunchTask": "watch",
+            "processName": "OI.Metrology.Server.exe"
         }
     ]
 }
\ No newline at end of file
diff --git a/Server/.vscode/tasks.json b/Server/.vscode/tasks.json
index ecc8e45..cd5c524 100644
--- a/Server/.vscode/tasks.json
+++ b/Server/.vscode/tasks.json
@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/Archive.csproj",
+                "${workspaceFolder}/OI.Metrology.Server.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -19,23 +19,57 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/Archive.csproj",
+                "${workspaceFolder}/OI.Metrology.Server.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "old-watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/OI.Metrology.Server.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        },
         {
             "label": "watch",
             "command": "dotnet",
             "type": "process",
             "args": [
                 "watch",
+                "--launch-profile",
+                "https",
                 "run",
                 "--project",
-                "${workspaceFolder}/Archive.csproj"
+                "${workspaceFolder}/OI.Metrology.Server.csproj",
+                "--verbose"
             ],
-            "problemMatcher": "$msCompile"
+            "isBackground": true,
+            "dependsOn": [
+                "build"
+            ],
+            "problemMatcher": {
+                "fileLocation": "relative",
+                "pattern": {
+                    "regexp": "^([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(error|warning|info)\\s+(TS\\d+)\\s*:\\s*(.*)$",
+                    "file": 1,
+                    "location": 2,
+                    "severity": 3,
+                    "code": 4,
+                    "message": 5
+                },
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "^.*Shutdown requested.*",
+                    "endsPattern": "^.*Application started.*"
+                }
+            }
         }
     ]
 }
\ No newline at end of file