diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e725f44..b865f7d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,10 +6,9 @@
     "extensions": [
         "adrianhumphreys.silverstripe",
         "bmewburn.vscode-intelephense-client",
-        "felixfbecker.php-debug",
-		"manuth.eslint-language-service",
-        "ms-vscode.vscode-typescript-tslint-plugin",
-        "neilbrayfield.php-docblocker"
+        "dbaeumer.vscode-eslint",
+        "neilbrayfield.php-docblocker",
+        "xdebug.php-debug"
     ],
     "settings": {
         "php.executablePath": null
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 7975a70..4c73510 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -2,10 +2,9 @@
 	"recommendations": [
 		"adrianhumphreys.silverstripe",
         "bmewburn.vscode-intelephense-client",
-		"felixfbecker.php-debug",
-		"manuth.eslint-language-service",
+        "dbaeumer.vscode-eslint",
 		"ms-vscode-remote.remote-containers",
-		"msjsdiag.debugger-for-edge",
-		"neilbrayfield.php-docblocker"
+		"neilbrayfield.php-docblocker",
+		"xdebug.php-debug"
 	]
 }