diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
index c21678ea..881e0ad4 100755
--- a/.devcontainer/postCreateCommand.sh
+++ b/.devcontainer/postCreateCommand.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Install pnpm.
-npm install -g @pnpm/exe@9.1.0
+# Install/Activate PNPM version defined in root package.json
+corepack enable pnpm
 
 
 # Make sure 'node' user can access the 'node_modules' folder that will be mounted as a volume
diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
index b2608975..11c4eeb1 100644
--- a/.github/actions/install-dependencies/action.yml
+++ b/.github/actions/install-dependencies/action.yml
@@ -10,9 +10,9 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - uses: pnpm/action-setup@v4
-      with:
-        version: 9
+    - name: Setup PNPM
+      run: corepack enable pnpm
+      shell: bash
 
     - name: Use Node.js ${{ inputs.node-version }}
       uses: actions/setup-node@v4
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 3a76ca8e..95c0f73c 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -14,9 +14,8 @@ runs:
       uses: nrwl/nx-set-shas@v4
 
     - name: Setup PNPM
-      uses: pnpm/action-setup@v4
-      with:
-        version: 9
+      run: corepack enable pnpm
+      shell: bash
 
     - name: Setup Node.js ${{ inputs.node-version }}
       uses: actions/setup-node@v4
diff --git a/package.json b/package.json
index 4a8a82c2..b7ed9351 100644
--- a/package.json
+++ b/package.json
@@ -91,5 +91,6 @@
   },
   "nx": {
     "includedScripts": []
-  }
+  },
+  "packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
 }