diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8ea4c533..37d9ac7f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,9 +5,24 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "cds run ...", "cwd": "${workspaceFolder}/${input:sample}",
-      "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
-      "args": [ "--", "cds", "run", "--with-mocks", "--in-memory?" ],
+      "name": "bookshop",
+      "cwd": "${workspaceFolder}/bookshop",
+      "request": "launch",
+      "type": "node",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": ["-n"],
+      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
+      "console": "integratedTerminal",
+      "skipFiles": ["<node_internals>/**"]
+    },
+    {
+      "name": "Fiori App",
+      "cwd": "${workspaceFolder}/fiori",
+      "request": "launch",
+      "type": "node",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": ["-n"],
+      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
       "console": "integratedTerminal",
       "skipFiles": ["<node_internals>/**"]
     }
@@ -17,12 +32,7 @@
       "type": "pickString",
       "id": "sample",
       "description": "Which sample do you want to start?",
-      "options": [
-        "bookshop",
-        "fiori",
-        "reviews",
-        "reviews/test/bookshop"
-      ],
+      "options": ["bookshop", "fiori", "reviews", "reviews/test/bookshop"],
       "default": "bookshop"
     }
   ]
diff --git a/bookshop/.vscode/launch.json b/bookshop/.vscode/launch.json
new file mode 100644
index 00000000..3e0e9708
--- /dev/null
+++ b/bookshop/.vscode/launch.json
@@ -0,0 +1,25 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Attach to...",
+      "type": "node",
+      "request": "attach",
+      "processId": "${command:PickProcess}",
+      "skipFiles": ["<node_internals>/**"]
+    },
+    {
+      "name": "cds run",
+      "type": "node",
+      "request": "launch",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": ["-n"],
+      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
+      "console": "integratedTerminal",
+      "skipFiles": ["<node_internals>/**"]
+    }
+  ]
+}