diff --git a/platformio/ide/tpls/vscode/.gitignore.tpl b/platformio/ide/tpls/vscode/.gitignore.tpl
index eb9d2d5c..6a010304 100644
--- a/platformio/ide/tpls/vscode/.gitignore.tpl
+++ b/platformio/ide/tpls/vscode/.gitignore.tpl
@@ -1,5 +1,5 @@
 .pioenvs
 .piolibdeps
-.vscode/*.db
+.vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json
 .vscode/launch.json
diff --git a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
index 5efe4c0c..d428393d 100644
--- a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
+++ b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
@@ -18,7 +18,7 @@
             ],
             "browse": {
                 "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": "./.vscode/.browse.c_cpp.db",
+                "databaseFilename": "${workspaceRoot}/.vscode/.browse.c_cpp.db",
                 "path": [
 % for include in includes:
                     "{{include.replace('\\\\', '/').replace('\\', '/').replace('"', '\\"')}}",
diff --git a/platformio/ide/tpls/vscode/.vscode/launch.json.tpl b/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
index 900d1438..788edc2a 100644
--- a/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
+++ b/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
@@ -5,7 +5,7 @@
         {
             "type": "gdb",
             "request": "launch",
-            "cwd": "${workspaceFolder}",
+            "cwd": "${workspaceRoot}",
             "name": "PlatformIO Debugger",
             "target": "{{prog_path.replace('\\\\', '/').replace('\\', '/').replace('"', '\\"')}}",
             "gdbpath": "{{join(dirname(platformio_path), "piodebuggdb").replace('\\\\', '/').replace('\\', '/').replace('"', '\\"')}}",