diff --git a/docker/Dockerfile b/docker/Dockerfile
index 10f18b377..35aaba096 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -180,7 +180,7 @@ RUN set -ex \
 # ===== PDK dependencies =====
 
 # Package managers
-RUN npm install -g @aws/pdk aws-cdk bun pnpm projen yarn
+RUN npm install -g @aws/pdk aws-cdk bun pnpm@8 projen yarn
 
 # Poetry setup
 RUN curl -sSL https://install.python-poetry.org | python
diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh
index 62c014a0d..570b87a6d 100755
--- a/docker/dockerbuild.sh
+++ b/docker/dockerbuild.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/p9i6h6j0
 docker buildx build . -t aws-pdk --platform linux/amd64
 docker tag aws-pdk:latest public.ecr.aws/p9i6h6j0/aws-pdk:latest
 docker push public.ecr.aws/p9i6h6j0/aws-pdk:latest
\ No newline at end of file
diff --git a/package.json b/package.json
index f04361d60..bc99a5f90 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
   },
   "engines": {
     "node": ">=16",
-    "pnpm": ">=8"
+    "pnpm": ">=8 <9"
   },
   "main": "lib/index.js",
   "license": "Apache-2.0",
diff --git a/packages/monorepo/src/components/nx-configurator.ts b/packages/monorepo/src/components/nx-configurator.ts
index ea65bf254..b75028e99 100644
--- a/packages/monorepo/src/components/nx-configurator.ts
+++ b/packages/monorepo/src/components/nx-configurator.ts
@@ -464,7 +464,7 @@ export class NxConfigurator extends Component implements INxProjectCore {
           private: true,
           engines: {
             node: ">=16",
-            pnpm: ">=8",
+            pnpm: ">=8 <9",
           },
           scripts: Object.fromEntries(
             this.project.tasks.all
diff --git a/packages/monorepo/src/projects/typescript/monorepo-ts.ts b/packages/monorepo/src/projects/typescript/monorepo-ts.ts
index 3f2eeaa75..da11fcd8e 100644
--- a/packages/monorepo/src/projects/typescript/monorepo-ts.ts
+++ b/packages/monorepo/src/projects/typescript/monorepo-ts.ts
@@ -225,7 +225,7 @@ export class MonorepoTsProject
       case NodePackageManager.PNPM: {
         // https://pnpm.io/package_json
         // https://github.com/pnpm/pnpm/releases/tag/v8.0.0
-        this.package.addEngine("pnpm", ">=8");
+        this.package.addEngine("pnpm", ">=8 <9");
         break;
       }
       case NodePackageManager.YARN_CLASSIC:
diff --git a/packages/monorepo/test/__snapshots__/monorepo.test.ts.snap b/packages/monorepo/test/__snapshots__/monorepo.test.ts.snap
index 50c6ecf77..783a1d330 100644
--- a/packages/monorepo/test/__snapshots__/monorepo.test.ts.snap
+++ b/packages/monorepo/test/__snapshots__/monorepo.test.ts.snap
@@ -931,7 +931,7 @@ yes=true
     },
     "engines": {
       "node": ">=16",
-      "pnpm": ">=8",
+      "pnpm": ">=8 <9",
     },
     "license": "Apache-2.0",
     "main": "lib/index.js",
@@ -19945,7 +19945,7 @@ link-workspace-packages=true
     },
     "engines": {
       "node": ">=16",
-      "pnpm": ">=8",
+      "pnpm": ">=8 <9",
     },
     "private": true,
     "scripts": {
@@ -22377,7 +22377,7 @@ yes=true
     },
     "engines": {
       "node": ">=16",
-      "pnpm": ">=8",
+      "pnpm": ">=8 <9",
     },
     "license": "Apache-2.0",
     "main": "lib/index.js",
diff --git a/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap b/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap
index dc5704495..947bda1d3 100644
--- a/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap
+++ b/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap
@@ -56556,7 +56556,7 @@ yes=true
     },
     "engines": {
       "node": ">=16",
-      "pnpm": ">=8",
+      "pnpm": ">=8 <9",
     },
     "license": "Apache-2.0",
     "main": "lib/index.js",
diff --git a/packages/type-safe-api/test/project/__snapshots__/type-safe-websocket-api-project.test.ts.snap b/packages/type-safe-api/test/project/__snapshots__/type-safe-websocket-api-project.test.ts.snap
index 71b7beac2..793bf3658 100644
--- a/packages/type-safe-api/test/project/__snapshots__/type-safe-websocket-api-project.test.ts.snap
+++ b/packages/type-safe-api/test/project/__snapshots__/type-safe-websocket-api-project.test.ts.snap
@@ -22202,7 +22202,7 @@ yes=true
     },
     "engines": {
       "node": ">=16",
-      "pnpm": ">=8",
+      "pnpm": ">=8 <9",
     },
     "license": "Apache-2.0",
     "main": "lib/index.js",