diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index 7fd5854208c..47d682f8a8e 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -12,7 +12,7 @@ If you already have VS Code and Docker installed, you can click the badge above
 
 1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
 
-2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
+2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build with **9 GB of RAM** being recommended. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
 
     > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3e40ce61f95..63b61fb7a10 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,9 +6,18 @@
 	"overrideCommand": false,
 	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined", "--shm-size=1g"],
 
-	"settings": {
-		"resmon.show.battery": false,
-		"resmon.show.cpufreq": false
+	// VS Code extensions and settings
+	"customizations": {
+		"vscode": {
+			"settings": {
+				"resmon.show.battery": false,
+				"resmon.show.cpufreq": false
+			},
+			"extensions": [
+				"dbaeumer.vscode-eslint",
+				"mutantdino.resourcemonitor"
+			]
+		}
 	},
 
 	// noVNC, VNC
@@ -24,17 +33,12 @@
 		}
 	},
 
-	"extensions": [
-		"dbaeumer.vscode-eslint",
-		"mutantdino.resourcemonitor"
-	],
-
 	// Optionally loads a cached yarn install for the repo
 	"postCreateCommand": ".devcontainer/cache/restore-diff.sh",
 
 	"remoteUser": "node",
 
 	"hostRequirements": {
-		"memory": "8gb"
+		"memory": "9gb"
 	}
 }