diff --git a/.vscode/launch.json b/.vscode/launch.json
index 35d2af3..79c0934 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,8 +5,8 @@
       "name": ".NET Launch (Client) 1",
       "type": "coreclr",
       "request": "launch",
-      "preLaunchTask": "build",
-      "program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net9.0/Desktop",
+      "preLaunchTask": "build-client",
+      "program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net9.0/Desktop.dll",
       "args": [],
       "cwd": "${workspaceFolder}",
       "stopAtEntry": false,
@@ -16,8 +16,8 @@
       "name": ".NET Launch (Client) 2",
       "type": "coreclr",
       "request": "launch",
-      "preLaunchTask": "build",
-      "program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net9.0/Desktop",
+      "preLaunchTask": "build-client",
+      "program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net9.0/Desktop.dll",
       "args": [],
       "cwd": "${workspaceFolder}",
       "stopAtEntry": false,
@@ -27,9 +27,12 @@
       "name": ".NET Launch (Server)",
       "type": "coreclr",
       "request": "launch",
-      "preLaunchTask": "build",
-      "program": "${workspaceFolder}/Platforms/Server/bin/Debug/net9.0/Server",
+      "preLaunchTask": "build-server",
+      "program": "${workspaceFolder}/Platforms/Server/bin/Debug/net9.0/Server.dll",
       "args": [],
+      "env": {
+        "PORT": "8888",
+      },
       "cwd": "${workspaceFolder}",
       "stopAtEntry": false,
       "console": "internalConsole"
@@ -38,7 +41,10 @@
   "compounds": [
     {
       "name": ".NET Launch Client & Server",
-      "configurations": [".NET Launch (Server)", ".NET Launch (Client) 1"]
+      "configurations": [
+        ".NET Launch (Server)",
+        ".NET Launch (Client) 1"
+      ]
     },
     {
       "name": ".NET Launch 2 Client & 1 Server",
@@ -50,7 +56,10 @@
     },
     {
       "name": ".NET Launch 2 Clients",
-      "configurations": [".NET Launch (Client) 1", ".NET Launch (Client) 2"]
+      "configurations": [
+        ".NET Launch (Client) 1",
+        ".NET Launch (Client) 2"
+      ]
     }
   ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index bc90acc..85504ad 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,13 +2,32 @@
   "version": "2.0.0",
   "tasks": [
     {
+      "label": "build-client",
       "command": "dotnet",
+      "type": "process",
       "args": [
-        "build"
+        "build",
+        "${workspaceFolder}/Platforms/Desktop"
       ],
-      "group": "build",
-      "problemMatcher": [],
-      "label": "build"
+      "problemMatcher": "$msCompile",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    },
+    {
+      "label": "build-server",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/Platforms/Server"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
     }
   ]
 }