diff --git a/devcontainer-example/devcontainer.json b/devcontainer-example/devcontainer.json
index 2e60f65d..16bbfb39 100644
--- a/devcontainer-example/devcontainer.json
+++ b/devcontainer-example/devcontainer.json
@@ -1,32 +1,38 @@
 {
-  "name": "Frappe Bench",
+  "name": "Frappe Development Stack",
+  "dockerComposeFile": "./docker-compose.yml",
+  "service": "frappe",
+  "workspaceFolder": "/workspace/development/frappe-bench",
+
+  // Use existing running container
+  "overrideCommand": false,
+  "shutdownAction": "none",
+
   "forwardPorts": [8000, 9000, 6787],
   "remoteUser": "frappe",
+
   "customizations": {
     "vscode": {
+
+      "settings": {
+        "terminal.integrated.profiles.linux": {"frappe bash": {"path": "/bin/bash"}},
+        "python.defaultInterpreterPath": "/workspace/development/frappe-bench/env/bin/python",
+        "terminal.integrated.defaultProfile.linux": "frappe bash",
+        "debug.node.autoAttach": "disabled"
+      },
+
       "extensions": [
         "ms-python.python",
         "ms-vscode.live-server",
         "grapecity.gc-excelviewer",
         "mtxr.sqltools",
         "visualstudioexptteam.vscodeintellicode"
-      ],
-      "settings": {
-        "terminal.integrated.profiles.linux": {
-          "frappe bash": {
-            "path": "/bin/bash"
-          }
-        },
-        "terminal.integrated.defaultProfile.linux": "frappe bash",
-        "debug.node.autoAttach": "disabled"
-      }
+      ]
     }
   },
-  "dockerComposeFile": "./docker-compose.yml",
-  "service": "frappe",
-  "workspaceFolder": "/workspace/development",
-  "shutdownAction": "stopCompose",
+
   "mounts": [
     "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/frappe/.ssh,type=bind,consistency=cached"
   ]
+
 }
diff --git a/devcontainer-example/devcontainer.json.old b/devcontainer-example/devcontainer.json.old
new file mode 100644
index 00000000..2e60f65d
--- /dev/null
+++ b/devcontainer-example/devcontainer.json.old
@@ -0,0 +1,32 @@
+{
+  "name": "Frappe Bench",
+  "forwardPorts": [8000, 9000, 6787],
+  "remoteUser": "frappe",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "ms-vscode.live-server",
+        "grapecity.gc-excelviewer",
+        "mtxr.sqltools",
+        "visualstudioexptteam.vscodeintellicode"
+      ],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "frappe bash": {
+            "path": "/bin/bash"
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "frappe bash",
+        "debug.node.autoAttach": "disabled"
+      }
+    }
+  },
+  "dockerComposeFile": "./docker-compose.yml",
+  "service": "frappe",
+  "workspaceFolder": "/workspace/development",
+  "shutdownAction": "stopCompose",
+  "mounts": [
+    "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/frappe/.ssh,type=bind,consistency=cached"
+  ]
+}