diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a02b1f5..f09c0e6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -36,14 +36,11 @@
       }
     }
   },
-  "containerEnv": {
-    "MIND_MAP_PORT": "51888" // This is different from default to prevent clashes with existing mind-map on host
-  },
-  "forwardPorts": [51888],
+  "appPort": ["51888:4242"],
   "portsAttributes": {
-    "51888": {
+    "4242": {
       "label": "mind-map Server (devcontainer)",
-      "onAutoForward": "notify"
+      "onAutoForward": "ignore"
     }
   }
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2a3727c..aeeacb8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -17,7 +17,7 @@
             "request": "launch",
             "mode": "auto",
             "program": "${workspaceFolder}/cmd/mind-map",
-            "args": ["serve", "--addr", ":${env:MIND_MAP_PORT}", "--dir", "${workspaceFolder}/testdata", "--webui", "${workspaceFolder}/webui/dist"],
+            "args": ["serve", "--dir", "${workspaceFolder}/testdata", "--webui", "${workspaceFolder}/webui/dist"],
             "preLaunchTask": "build-webui"
         },
         {
@@ -26,7 +26,7 @@
             "request": "launch",
             "mode": "auto",
             "program": "${workspaceFolder}/cmd/mind-map",
-            "args": ["serve", "--addr", ":${env:MIND_MAP_PORT}", "--dir", "${workspaceFolder}/testdata", "--webui", "${workspaceFolder}/webui/dist"],
+            "args": ["serve", "--dir", "${workspaceFolder}/testdata", "--webui", "${workspaceFolder}/webui/dist"],
         },
         {
             "name": "mind-map (stdio)",
@@ -42,7 +42,7 @@
             "request": "launch",
             "browserLaunchLocation": "ui",
             "runtimeExecutable": "stable",
-            "url": "http://localhost:${env:MIND_MAP_PORT}",
+            "url": "http://localhost:4242",
             "webRoot": "${workspaceFolder}/webui",
             "preLaunchTask": "waitForServer",
             "userDataDir": "${workspaceFolder}/.vscode/cache",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9067b8b..46f4a73 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -47,7 +47,7 @@
         {
             "label": "waitForServer",
             "type": "shell",
-            "command": "while ! nc -z localhost ${MIND_MAP_PORT}; do sleep 1; done",
+            "command": "while ! nc -z localhost 4242; do sleep 1; done",
             "group": "none",
             "dependsOn": ["build-webui"],
             "problemMatcher": {