diff --git a/.vscode/launch.json b/.vscode/launch.json
index ce0ca73..62cd269 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,32 +6,41 @@
     // See: https://github.com/Microsoft/vscode-recipes/tree/master/debugging-jest-tests
     "configurations": [
         {
-          "type": "node",
-          "request": "launch",
-          "name": "Jest All",
-          "program": "${workspaceFolder}/node_modules/.bin/jest",
-          "args": ["--runInBand"],
-          "console": "integratedTerminal",
-          "internalConsoleOptions": "neverOpen",
-          "disableOptimisticBPs": true,
-          "windows": {
-            "program": "${workspaceFolder}/node_modules/jest/bin/jest",
-          }
+            "name": "Jest All",
+            "type": "pwa-node",
+            "request": "launch",
+            "runtimeArgs": [
+                "run-script",
+                "test",
+                "--runInBand"
+            ],
+            "runtimeExecutable": "npm",
+            "console": "integratedTerminal",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "sourceMaps": true
         },
         {
-          "type": "node",
-          "request": "launch",
-          "name": "Jest Current File",
-          "program": "${workspaceFolder}/node_modules/.bin/jest",
-          "args": [
-            "${fileBasenameNoExtension}"
-          ],
-          "console": "integratedTerminal",
-          "internalConsoleOptions": "neverOpen",
-          "disableOptimisticBPs": true,
-          "windows": {
-            "program": "${workspaceFolder}/node_modules/jest/bin/jest",
-          }
+            "name": "Jest Current File",
+            "type": "pwa-node",
+            "request": "launch",
+            "runtimeArgs": [
+                "run-script",
+                "test",
+                "--runInBand",
+                "${fileBasenameNoExtension}"
+            ],
+            "runtimeExecutable": "npm",
+            "console": "integratedTerminal",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "resolveSourceMapLocations": [
+                "${workspaceFolder}/**"
+                //"!**/node_modules/**"
+            ],
+            "sourceMaps": true
         }
-      ]
+    ]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 298a91d..373072a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,6 +2,7 @@
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": true
     },
+    "editor.formatOnSave": true,
     "files.associations": {
         "**/azure/*.yml": "azure-pipelines"
     },
@@ -14,4 +15,4 @@
         "agpl",
         "spdx"
     ]
-}
+}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1d67cc..a91cc18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## vNext
+
+* Updated debugger settings to leverage modern VSCode
+
 ## v0.23.1
 
 * Updated dependencies