diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 38da78ba9321c..7e9d906b54806 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,26 +3,28 @@
 {
   "name": "NxDevContainer",
   // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-  "image": "mcr.microsoft.com/devcontainers/typescript-node:0-18",
+  "image": "mcr.microsoft.com/devcontainers/typescript-node:20-bullseye",
   "features": {
     "ghcr.io/devcontainers/features/rust:1": {}
   },
-
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // 4211 = nx graph port
   "forwardPorts": [4211],
-
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "pnpm install",
+  "postCreateCommand": "./.devcontainer/postCreateCommand.sh",
+  // Configure tool-specific properties.
   "customizations": {
     "vscode": {
-      "extensions": ["nrwl.angular-console"]
+      "extensions": [
+        "nrwl.angular-console",
+        "firsttris.vscode-jest-runner",
+        "eamodio.gitlens"
+      ],
+      "settings": {
+        "debug.javascript.autoAttachFilter": "onlyWithFlag" // workaround for that issue: https://github.com/microsoft/vscode-js-debug/issues/374#issuecomment-622239998
+      }
     }
   }
-
-  // Configure tool-specific properties.
-  // "customizations": {},
-
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
   // "remoteUser": "root"
 }
diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
new file mode 100755
index 0000000000000..b35481cbadbbb
--- /dev/null
+++ b/.devcontainer/postCreateCommand.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Update the underlying (Debian) OS, to make sure we have the latest security patches and libraries like 'GLIBC' 
+sudo apt-get update  && sudo apt-get -y upgrade
+
+# Update pnpm
+#npm install -g pnpm
+
+# Install dependencies
+pnpm install --frozen-lockfile
+
diff --git a/.prettierignore b/.prettierignore
index 1f1510e6637f1..2930b83bc3ea0 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -35,4 +35,6 @@ graph/client/src/assets/generated-task-graphs
 /.env
 CODEOWNERS
 
-/.nx/cache
\ No newline at end of file
+/.nx/cache
+
+.pnpm-store
\ No newline at end of file