diff --git a/.vscode/launch.json b/.vscode/launch.json
index d2bb0f29a8..c94535bfbc 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,7 +7,10 @@
       "name": "Chrome",
       "url": "http://127.0.0.1:3100",
       "webRoot": "${workspaceFolder}/..",
-      "sourceMaps": true
+      "sourceMaps": true,
+      "sourceMapPathOverrides": {
+        "webpack:///*": "${workspaceFolder}/../*"
+      }
     },
     {
       "type": "java",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index f35c971de3..252b35771b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -13,7 +13,7 @@
   },
   "tasks": [
     {
-      "label": "Run Tests",
+      "label": "Run Tests CE",
       "type": "shell",
       "command": "yarn",
       "group": "test",
@@ -53,19 +53,8 @@
     {
       "label": "Yarn Install",
       "type": "shell",
-      "command": "yarn",
+      "command": "yarn install; yarn lerna bootstrap",
       "args": []
-    },
-    {
-      "label": "Lerna Bootstrap",
-      "type": "shell",
-      "command": "yarn",
-      "args": ["lerna", "bootstrap"]
-    },
-    {
-      "label": "Bootstrap",
-      "dependsOrder": "sequence",
-      "dependsOn": ["Yarn Install", "Lerna Bootstrap"]
     }
   ],
   "inputs": [