diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c3c1c82593..f7ffe27432 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,8 @@
 		"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"