diff --git a/docs/package.json b/docs/package.json
index 236437aff..2b188c1c6 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "docs",
+  "name": "@aws/docs",
   "scripts": {
     "build": "pnpm exec projen build",
     "compile": "pnpm exec projen compile",
diff --git a/docs/project.json b/docs/project.json
index 6540e650c..f53ab1208 100644
--- a/docs/project.json
+++ b/docs/project.json
@@ -1,5 +1,5 @@
 {
-  "name": "docs",
+  "name": "@aws/docs",
   "root": "docs",
   "targets": {
     "default": {
@@ -77,7 +77,8 @@
     "@aws/cdk-graph",
     "@aws/cdk-graph-plugin-diagram",
     "@aws/pipeline",
-    "@aws/infrastructure"
+    "@aws/infrastructure",
+    "@aws/docs"
   ],
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }
diff --git a/package.json b/package.json
index b96034cca..8bfc5d7d6 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "aws-pdk-monorepo",
+  "name": "@aws/pdk-monorepo",
   "scripts": {
     "build": "pnpm exec projen build",
     "clobber": "pnpm exec projen clobber",
@@ -110,6 +110,7 @@
       "packages/cdk-graph",
       "packages/cdk-graph-plugin-diagram",
       "packages/cloudscape-react-ts-website",
+      "docs",
       "packages/identity",
       "packages/infrastructure",
       "packages/monorepo",
@@ -117,8 +118,7 @@
       "packages/pdk-nag",
       "packages/pipeline",
       "packages/static-website",
-      "packages/type-safe-api",
-      "docs"
+      "packages/type-safe-api"
     ]
   },
   "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"."
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 0faf7c2fe..1100f8e57 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,6 +5,7 @@ packages:
   - packages/cdk-graph
   - packages/cdk-graph-plugin-diagram
   - packages/cloudscape-react-ts-website
+  - docs
   - packages/identity
   - packages/infrastructure
   - packages/monorepo
@@ -13,4 +14,3 @@ packages:
   - packages/pipeline
   - packages/static-website
   - packages/type-safe-api
-  - docs
diff --git a/projenrc/projects/docs-project.ts b/projenrc/projects/docs-project.ts
index 5a40ffaff..095d5d154 100644
--- a/projenrc/projects/docs-project.ts
+++ b/projenrc/projects/docs-project.ts
@@ -19,7 +19,7 @@ export class DocsProject extends TypeScriptProject {
       defaultReleaseBranch: "mainline",
       sampleCode: false,
       jest: false,
-      name: "docs",
+      name: "@aws/docs",
       depsUpgrade: false,
       deps: ["fs-extra"],
     });
diff --git a/projenrc/projects/pdk-monorepo-project.ts b/projenrc/projects/pdk-monorepo-project.ts
index 67416a847..d472f313f 100644
--- a/projenrc/projects/pdk-monorepo-project.ts
+++ b/projenrc/projects/pdk-monorepo-project.ts
@@ -31,7 +31,7 @@ export class PDKMonorepoProject extends MonorepoTsProject {
         ignorePatterns: ["packages/**/*.*"],
       },
       depsUpgrade: false,
-      name: "aws-pdk-monorepo",
+      name: "@aws/pdk-monorepo",
       devDeps: [
         "lerna",
         "nx",