diff --git a/.vscode/launch.json b/.vscode/launch.json
index 38cc33fa134..3fc8dd41f13 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -17,22 +17,28 @@
 			"console": "integratedTerminal"
 		},
 		{
-			"name": "codegen2 (pxt-bedrock)",
+			"name": "pxt ci (pxt-core)",
 			"type": "node",
 			"request": "launch",
+			"program": "${workspaceRoot}/built/pxt.js",
+			"stopOnEntry": false,
+			"args": [
+				"ci",
+			],
+			"cwd": "${workspaceRoot}",
+			"runtimeExecutable": null,
 			"runtimeArgs": [
-				"run-script",
-				"vscode:debug"
+				"--nolazy"
 			],
-			"runtimeExecutable": "npm",
-			"stopOnEntry": false,
-			"sourceMaps": true,
-			"outFiles": [],
-            "localRoot": "${workspaceRoot}/../pxt-bedrock/codegen2",
-			"console": "integratedTerminal"
+			"env": {
+				"NODE_ENV": "development"
+			},
+			"console": "integratedTerminal",
+			"sourceMaps": false,
+			"outFiles": []
 		},
 		{
-			"name": "pxt ci (pxt-core)",
+			"name": "pxt ci (microbit)",
 			"type": "node",
 			"request": "launch",
 			"program": "${workspaceRoot}/built/pxt.js",
@@ -40,7 +46,7 @@
 			"args": [
 				"ci",
 			],
-			"cwd": "${workspaceRoot}",
+			"cwd": "${workspaceRoot}/../pxt-microbit",
 			"runtimeExecutable": null,
 			"runtimeArgs": [
 				"--nolazy"
@@ -53,7 +59,7 @@
 			"outFiles": []
 		},
 		{
-			"name": "pxt ci (microbit)",
+			"name": "pxt ci (bedrock)",
 			"type": "node",
 			"request": "launch",
 			"program": "${workspaceRoot}/built/pxt.js",
@@ -61,7 +67,7 @@
 			"args": [
 				"ci",
 			],
-			"cwd": "${workspaceRoot}/../pxt-microbit",
+			"cwd": "${workspaceRoot}/../pxt-bedrock",
 			"runtimeExecutable": null,
 			"runtimeArgs": [
 				"--nolazy"