diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1c02faa9e5..f7ffe27432 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,12 @@
 {
 	"name": "PWA Studio",
-	"image": "mcr.microsoft.com/devcontainers/javascript-node:0-14",
+	"image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+	"containerEnv": {
+		"NODE_OPTIONS": "--openssl-legacy-provider"
+	},
 	"forwardPorts": [10000],
-	"postCreateCommand": "yarn install --frozen-lockfile && yarn build && yarn workspace @magento/venia-concept run watch",
+	"postCreateCommand": "yarn install --frozen-lockfile && yarn build",
+	"postStartCommand": "yarn workspace @magento/venia-concept run watch",
 	"extensions": [
 		"larsroettig.vscode-pwa-studio",
 		"GraphQL.vscode-graphql-syntax"