diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ef4c0cd..e725f44 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,8 @@
     "workspaceFolder": "/shared-workspaces/mantra",
     "extensions": [
         "adrianhumphreys.silverstripe",
-        "felixfbecker.php-pack",
+        "bmewburn.vscode-intelephense-client",
+        "felixfbecker.php-debug",
 		"manuth.eslint-language-service",
         "ms-vscode.vscode-typescript-tslint-plugin",
         "neilbrayfield.php-docblocker"
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 5d64269..daf1c8d 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,8 @@
 {
 	"recommendations": [
 		"adrianhumphreys.silverstripe",
-		"felixfbecker.php-pack",
+        "bmewburn.vscode-intelephense-client",
+		"felixfbecker.php-debug",
 		"manuth.eslint-language-service",
 		"ms-vscode-remote.remote-containers",
 		"msjsdiag.debugger-for-chrome",