diff --git a/.vscode/launch.json b/.vscode/launch.json
index e27b257da4..270395ae14 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -14,7 +14,7 @@
       "outFiles": [
         "${workspaceFolder}/out/src/**/*.js"
       ],
-      "preLaunchTask": "BuildAll"
+      "preLaunchTask": "Build"
     },
     {
       "name": "Launch Extension (Build client only)",
@@ -47,6 +47,12 @@
         "${workspaceFolder}/out/**/*.js"
       ],
       "preLaunchTask": "Build"
-    }
+    },
+    {
+      "name": "PowerShell Launch Current File",
+      "type": "PowerShell",
+      "request": "launch",
+      "script": "${file}",
+    },
   ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 16dc6000d5..75bd70aa16 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -37,49 +37,32 @@
   },
   "tasks": [
     {
-      "label": "Install",
+      "label": "Restore",
       "type": "shell",
       "command": "Invoke-Build Restore",
-      "problemMatcher": []
-    },
-    {
-      "label": "CleanAll",
-      "type": "shell",
-      "command": "Invoke-Build CleanAll",
-      "problemMatcher": []
     },
     {
       "label": "Clean",
       "type": "shell",
       "command": "Invoke-Build Clean",
-      "problemMatcher": []
-    },
-    {
-      "label": "BuildAll",
-      "type": "shell",
-      "command": "Invoke-Build BuildAll",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": []
     },
     {
       "label": "Build",
       "type": "shell",
       "command": "Invoke-Build Build",
       "group": "build",
-      "problemMatcher": []
     },
     {
       "label": "Test",
       "type": "shell",
       "command": "Invoke-Build Test",
-      "group": {
-        "kind": "test",
-        "isDefault": true
-      },
-      "problemMatcher": []
+      "group": "test",
+    },
+    {
+      "label": "Package",
+      "type": "shell",
+      "command": "Invoke-Build Package",
+      "group": "build"
     }
   ]
 }
diff --git a/package.json b/package.json
index a12569c5fa..c8a0822040 100644
--- a/package.json
+++ b/package.json
@@ -459,7 +459,7 @@
               "type": "PowerShell",
               "request": "launch",
               "script": "^\"\\${file}\"",
-              "cwd": "^\"\\${file}\""
+              "cwd": "^\"\\${workspaceFolder}\""
             }
           },
           {
diff --git a/vscode-powershell.build.ps1 b/vscode-powershell.build.ps1
index 1904c1376c..8ae05d3222 100644
--- a/vscode-powershell.build.ps1
+++ b/vscode-powershell.build.ps1
@@ -49,8 +49,6 @@ task CleanEditorServices -If (Get-EditorServicesPath) {
     Invoke-Build Clean (Get-EditorServicesPath)
 }
 
-task CleanAll CleanEditorServices, Clean
-
 #endregion
 #region Build tasks
 
@@ -69,8 +67,6 @@ task Build CopyEditorServices, Restore, {
     exec { & npm run compile }
 }
 
-task BuildAll BuildEditorServices, Build
-
 #endregion
 #region Test tasks
 
@@ -84,8 +80,6 @@ task TestEditorServices -If (Get-EditorServicesPath) {
     Invoke-Build Test (Get-EditorServicesPath)
 }
 
-task TestAll TestEditorServices, Test
-
 #endregion
 
 #region Package tasks
@@ -106,7 +100,7 @@ task UpdateReadme -If { $script:IsPreviewExtension } {
     }
 }
 
-task Package UpdateReadme, {
+task Package UpdateReadme, Build, {
     assert { Test-Path ./modules/PowerShellEditorServices }
     Write-Host "`n### Packaging $($script:PackageJson.name)-$($script:PackageJson.version).vsix`n" -ForegroundColor Green
     exec { & npm run package }