diff --git a/.vscode/example/settings.json b/.vscode/example/settings.json
index 00da3af2f..a59194901 100644
--- a/.vscode/example/settings.json
+++ b/.vscode/example/settings.json
@@ -14,7 +14,7 @@
         "*.scons": "python",
         "SConscript": "python",
         "SConstruct": "python",
-        "*.fam": "python",
+        "*.fam": "python"
     },
     "clangd.arguments": [
         // We might be able to tighten this a bit more to only include the correct toolchain.
diff --git a/scripts/ufbt/SConstruct b/scripts/ufbt/SConstruct
index 11fefd22b..784d66161 100644
--- a/scripts/ufbt/SConstruct
+++ b/scripts/ufbt/SConstruct
@@ -393,7 +393,9 @@ for template_file in project_template_dir.Dir(".vscode").glob("*"):
                 ),
                 "@UFBT_APP_DIR@": PosixPathWrapper.fix_path(original_app_dir.abspath),
                 "@UFBT_ROOT_DIR@": PosixPathWrapper.fix_path(Dir("#").abspath),
-                "@UFBT_DEBUG_DIR@": dist_env.subst("FBT_DEBUG_DIR"),
+                "@UFBT_DEBUG_DIR@": PosixPathWrapper.fix_path(
+                    dist_env.subst("$FBT_DEBUG_DIR")
+                ),
                 "@UFBT_DEBUG_ELF_DIR@": PosixPathWrapper.fix_path(
                     dist_env["FBT_FAP_DEBUG_ELF_ROOT"].abspath
                 ),
diff --git a/scripts/ufbt/project_template/.vscode/tasks.json b/scripts/ufbt/project_template/.vscode/tasks.json
index 65c749e07..16ef12836 100644
--- a/scripts/ufbt/project_template/.vscode/tasks.json
+++ b/scripts/ufbt/project_template/.vscode/tasks.json
@@ -31,29 +31,23 @@
             "command": "ufbt -c"
         },
         {
-            "label": "Flash FW (ST-Link)",
+            "label": "Flash FW (SWD)",
             "group": "build",
             "type": "shell",
             "command": "ufbt FORCE=1 flash"
         },
-        {
-            "label": "Flash FW (blackmagic)",
-            "group": "build",
-            "type": "shell",
-            "command": "ufbt flash_blackmagic"
-        },
-        {
-            "label": "Flash FW (JLink)",
-            "group": "build",
-            "type": "shell",
-            "command": "ufbt FORCE=1 jflash"
-        },
         {
             "label": "Flash FW (USB, with resources)",
             "group": "build",
             "type": "shell",
             "command": "ufbt FORCE=1 flash_usb"
         },
+        {
+            "label": "Open Flipper CLI session",
+            "group": "build",
+            "type": "shell",
+            "command": "ufbt cli"
+        },
         {
             "label": "Update uFBT SDK",
             "group": "build",
@@ -61,7 +55,7 @@
             "command": "ufbt update"
         },
         {
-            "label": "Update VSCode config for current SDK",
+            "label": "Update VSCode config",
             "group": "build",
             "type": "shell",
             "command": "ufbt vscode_dist"