diff --git a/.vscode/launch.json b/.vscode/launch.json
index 922a03a..1bc0381 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,6 +7,20 @@
 			"name": "Launch blinky/build/blinky",
 			"config": "${workspaceFolder}/build/blinky",
 			"runToEntryPoint": "main"
+		},
+		{
+			"type": "nrf-connect",
+			"request": "launch",
+			"name": "Launch blinky/build",
+			"config": "${workspaceFolder}/build",
+			"runToEntryPoint": "main"
+		},
+		{
+			"type": "nrf-connect",
+			"request": "launch",
+			"name": "Launch blinky/build/mcuboot",
+			"config": "${workspaceFolder}/build/mcuboot",
+			"runToEntryPoint": "main"
 		}
 	]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5bf47ee..b1f813a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,7 @@
 {
     "nrf-connect.debugging.bindings": {
-        "${workspaceFolder}/build/blinky": "Launch blinky/build/blinky"
+        "${workspaceFolder}/build/blinky": "Launch blinky/build/blinky",
+        "${workspaceFolder}/build": "Launch blinky/build",
+        "${workspaceFolder}/build/mcuboot": "Launch blinky/build/mcuboot"
     }
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..0c989f9
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,29 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Flash: full erase (wipe NVS/bonds)",
+            "type": "shell",
+            "command": "powershell",
+            "args": [
+                "-ExecutionPolicy",
+                "Bypass",
+                "-File",
+                "${workspaceFolder}\\tools\\flash_full_erase.ps1"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Flash: preserve settings/bonds",
+            "type": "shell",
+            "command": "powershell",
+            "args": [
+                "-ExecutionPolicy",
+                "Bypass",
+                "-File",
+                "${workspaceFolder}\\tools\\flash_preserve_settings.ps1"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef441f2..4324e07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.20.0)
+
+macro(app_set_runner_args)
+    board_runner_args(nrfutil "--erase-mode=ranges")
+endmacro()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(vesiscan)