diff --git a/.sublime-project b/.sublime-project
index da2ef41a1..0ae007b34 100644
--- a/.sublime-project
+++ b/.sublime-project
@@ -10,10 +10,8 @@
             "clangd": {
                 "enabled": true,
                 "initializationOptions": {
-                    // Use with toolchain version 39+
                     // Set `"binary": "custom",` option in LSP-clangd config to use toolchain clangd
-                    // "custom_command": ["toolchain/current/bin/clangd"],
-
+                    "custom_command": ["toolchain/current/bin/clangd"],
                     "clangd.compile-commands-dir": "build/latest",
                     "clangd.header-insertion": "never",
                     "clangd.query-driver": "**/arm-none-eabi-*",
diff --git a/.vscode/example/settings.json.tmpl b/.vscode/example/settings.json.tmpl
index 5e0da6897..5e5b5dcf4 100644
--- a/.vscode/example/settings.json.tmpl
+++ b/.vscode/example/settings.json.tmpl
@@ -12,7 +12,7 @@
         "SConstruct": "python",
         "*.fam": "python"
     },
-    // "clangd.path": "${workspaceFolder}/toolchain/current/bin/clangd@FBT_PLATFORM_EXECUTABLE_EXT@",
+    "clangd.path": "${workspaceFolder}/toolchain/current/bin/clangd@FBT_PLATFORM_EXECUTABLE_EXT@",
     "clangd.arguments": [
         "--query-driver=**/arm-none-eabi-*",
         "--compile-commands-dir=${workspaceFolder}/build/latest",
diff --git a/scripts/toolchain/fbtenv.cmd b/scripts/toolchain/fbtenv.cmd
index c0a3cd870..182ba9bb1 100644
--- a/scripts/toolchain/fbtenv.cmd
+++ b/scripts/toolchain/fbtenv.cmd
@@ -13,7 +13,7 @@ if not ["%FBT_NOENV%"] == [""] (
     exit /b 0
 )
 
-set "FLIPPER_TOOLCHAIN_VERSION=38"
+set "FLIPPER_TOOLCHAIN_VERSION=39"
 
 if ["%FBT_TOOLCHAIN_PATH%"] == [""] (
     set "FBT_TOOLCHAIN_PATH=%FBT_ROOT%"
diff --git a/scripts/toolchain/fbtenv.sh b/scripts/toolchain/fbtenv.sh
index 156fabcca..ce92beca7 100755
--- a/scripts/toolchain/fbtenv.sh
+++ b/scripts/toolchain/fbtenv.sh
@@ -4,7 +4,7 @@
 
 # public variables
 DEFAULT_SCRIPT_PATH="$(pwd -P)";
-FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"38"}";
+FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"39"}";
 
 if [ -z ${FBT_TOOLCHAIN_PATH+x} ] ; then
     FBT_TOOLCHAIN_PATH_WAS_SET=0;
diff --git a/scripts/ufbt/project_template/.vscode/settings.json b/scripts/ufbt/project_template/.vscode/settings.json
index b93ad82f1..d304752a9 100644
--- a/scripts/ufbt/project_template/.vscode/settings.json
+++ b/scripts/ufbt/project_template/.vscode/settings.json
@@ -19,7 +19,7 @@
     "[python]": {
         "editor.defaultFormatter": "ms-python.black-formatter"
     },
-    // "clangd.path": "@UFBT_TOOLCHAIN_CLANGD@",
+    "clangd.path": "@UFBT_TOOLCHAIN_CLANGD@",
     "clangd.arguments": [
         "--query-driver=**/arm-none-eabi-*",
         "--compile-commands-dir=${workspaceFolder}/.vscode",