diff --git a/.devcontainer.json b/.devcontainer.json
index 366f6ed46a..16a1bcc119 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -5,11 +5,9 @@
         "vscode": {
             "settings": {
                 "C_Cpp.intelliSenseEngine": "disabled",
-                "clangd.arguments": [
-                    "--compile-commands-dir=${workspaceFolder}/out"
-                ],
                 "cmake.generator": "Ninja Multi-Config",
-                "cmake.buildDirectory": "${workspaceFolder}/out"
+                "cmake.buildDirectory": "${workspaceFolder}/out",
+                "cmake.copyCompileCommands": "${workspaceFolder}/compile_commands.json"
             },
             "extensions": [
                 "ms-vscode.cpptools-extension-pack",
diff --git a/.gitignore b/.gitignore
index f893d4badb..35282e1e49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ ipch/
 .vs/
 .vscode/
 .cache/
+compile_commands.json
 
 /Telegram/log.txt
 /Telegram/data