diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2b84e69ab26db5..4aee14628ca2a2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -34,7 +34,7 @@ jobs:
           - host: ubuntu-latest
             target: x86_64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
-            build: set -e && yarn nx -- run-many --target=build-native -- --target=x86_64-unknown-linux-musl
+            build: set -e && pnpm nx run-many --target=build-native -- --target=x86_64-unknown-linux-musl
           - host: macos-latest
             target: aarch64-apple-darwin
             build: |
@@ -131,7 +131,7 @@ jobs:
         with:
           node-version: 18
           check-latest: true
-          cache: yarn
+          cache: pnpm
           architecture: x86
       - name: Build in docker
         uses: addnab/docker-run-action@v3
diff --git a/docs/generated/packages/js/executors/swc.json b/docs/generated/packages/js/executors/swc.json
index 4f822309c49212..106578f4ef4486 100644
--- a/docs/generated/packages/js/executors/swc.json
+++ b/docs/generated/packages/js/executors/swc.json
@@ -121,7 +121,7 @@
       },
       "generateLockfile": {
         "type": "boolean",
-        "description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
+        "description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
         "default": false,
         "x-priority": "internal"
       }
diff --git a/docs/generated/packages/js/executors/tsc.json b/docs/generated/packages/js/executors/tsc.json
index ef60684d84c990..2fbe6d64e2aed0 100644
--- a/docs/generated/packages/js/executors/tsc.json
+++ b/docs/generated/packages/js/executors/tsc.json
@@ -120,7 +120,7 @@
       },
       "generateLockfile": {
         "type": "boolean",
-        "description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
+        "description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
         "default": false,
         "x-priority": "internal"
       }
diff --git a/docs/generated/packages/next/executors/build.json b/docs/generated/packages/next/executors/build.json
index 23a4958d4147be..caf2522900365b 100644
--- a/docs/generated/packages/next/executors/build.json
+++ b/docs/generated/packages/next/executors/build.json
@@ -62,7 +62,7 @@
       },
       "generateLockfile": {
         "type": "boolean",
-        "description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
+        "description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
         "default": false,
         "x-priority": "internal"
       },
diff --git a/nx-dev/nx-dev/project.json b/nx-dev/nx-dev/project.json
index 09fdd316650509..bbdd4696ebf59a 100644
--- a/nx-dev/nx-dev/project.json
+++ b/nx-dev/nx-dev/project.json
@@ -26,7 +26,7 @@
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/nx-dev/nx-dev/public",
-        "command": "yarn next-sitemap --config ./nx-dev/nx-dev/next-sitemap.config.js"
+        "command": "pnpm next-sitemap --config ./nx-dev/nx-dev/next-sitemap.config.js"
       }
     },
     "sync-documentation": {
diff --git a/nx.json b/nx.json
index e52c5c2bf526ad..2b481099f2b341 100644
--- a/nx.json
+++ b/nx.json
@@ -129,10 +129,10 @@
       "options": {
         "commands": [
           {
-            "command": "yarn e2e-start-local-registry"
+            "command": "pnpm e2e-start-local-registry"
           },
           {
-            "command": "yarn e2e-build-package-publish"
+            "command": "pnpm e2e-build-package-publish"
           },
           {
             "command": "nx run-e2e-tests {projectName}"
@@ -159,10 +159,10 @@
       "options": {
         "commands": [
           {
-            "command": "yarn e2e-start-local-registry"
+            "command": "pnpm e2e-start-local-registry"
           },
           {
-            "command": "yarn e2e-build-package-publish"
+            "command": "pnpm e2e-build-package-publish"
           },
           {
             "command": "nx run-e2e-tests {projectName}"
diff --git a/package.json b/package.json
index 6a1e98603a2a07..3f2b30cca29221 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "version": "pnpm prettier lerna.json --write",
     "depcheck": "ts-node -P ./scripts/tsconfig.scripts.json ./scripts/depcheck",
     "local-registry": "./scripts/local-registry.sh",
-    "documentation": "ts-node -P scripts/tsconfig.scripts.json ./scripts/documentation/generators/main.ts && yarn check-documentation-map",
+    "documentation": "ts-node -P scripts/tsconfig.scripts.json ./scripts/documentation/generators/main.ts && pnpm check-documentation-map",
     "submit-plugin": "node ./scripts/submit-plugin.js",
     "prepare": "is-ci || husky install",
     "echo": "echo 123458",
diff --git a/packages/js/src/executors/swc/schema.json b/packages/js/src/executors/swc/schema.json
index 6617cd2a3feedc..dc8bfc12303c6b 100644
--- a/packages/js/src/executors/swc/schema.json
+++ b/packages/js/src/executors/swc/schema.json
@@ -102,7 +102,7 @@
     },
     "generateLockfile": {
       "type": "boolean",
-      "description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
+      "description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
       "default": false,
       "x-priority": "internal"
     }
diff --git a/packages/js/src/executors/tsc/schema.json b/packages/js/src/executors/tsc/schema.json
index 2313966360aa0b..9a8cc6557b78c9 100644
--- a/packages/js/src/executors/tsc/schema.json
+++ b/packages/js/src/executors/tsc/schema.json
@@ -90,7 +90,7 @@
     },
     "generateLockfile": {
       "type": "boolean",
-      "description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
+      "description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
       "default": false,
       "x-priority": "internal"
     }
diff --git a/packages/next/src/executors/build/schema.json b/packages/next/src/executors/build/schema.json
index 091ea2c9587670..1a669e4b8694e4 100644
--- a/packages/next/src/executors/build/schema.json
+++ b/packages/next/src/executors/build/schema.json
@@ -59,7 +59,7 @@
     },
     "generateLockfile": {
       "type": "boolean",
-      "description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
+      "description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
       "default": false,
       "x-priority": "internal"
     },
diff --git a/packages/nx/project.json b/packages/nx/project.json
index e97967071700c0..b291e8c93d170e 100644
--- a/packages/nx/project.json
+++ b/packages/nx/project.json
@@ -15,7 +15,7 @@
       }
     },
     "artifacts": {
-      "command": "yarn napi artifacts -c build/packages/nx/package.json -d ./artifacts --dist build/packages/nx/native-packages"
+      "command": "pnpm napi artifacts -c build/packages/nx/package.json -d ./artifacts --dist build/packages/nx/native-packages"
     },
     "build-base": {
       "executor": "@nx/js:tsc",
diff --git a/packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap b/packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap
index 0759e4e6b5994f..b7d2d793f7698c 100644
--- a/packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap
+++ b/packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap
@@ -91,7 +91,7 @@ pipelines:
 
                 - pnpm install --frozen-lockfile
                 - pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
-                - pnpm exec nx-cloud record -- yarn nx format:check
+                - pnpm exec nx-cloud record -- pnpm exec nx format:check
                 - pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
                 - pnpm exec nx-cloud stop-all-agents
           - step: *agent
@@ -385,7 +385,7 @@ pipelines:
 
                 - pnpm install --frozen-lockfile
                 - pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
-                - pnpm exec nx-cloud record -- yarn nx format:check
+                - pnpm exec nx-cloud record -- pnpm exec nx format:check
                 - pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
                 - pnpm exec nx-cloud stop-all-agents
           - step: *agent
@@ -679,7 +679,7 @@ pipelines:
 
                 - pnpm install --frozen-lockfile
                 - pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
-                - pnpm exec nx-cloud record -- yarn nx format:check
+                - pnpm exec nx-cloud record -- pnpm exec nx format:check
                 - pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
                 - pnpm exec nx-cloud stop-all-agents
           - step: *agent
diff --git a/packages/workspace/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__ b/packages/workspace/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__
index d077fa45d31977..1dedbf5b68ce6b 100644
--- a/packages/workspace/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__
+++ b/packages/workspace/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__
@@ -28,7 +28,7 @@ pipelines:
                 <% } %>
                 - <%= packageManagerInstall %>
                 - <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
-                - <%= packageManagerPrefix %> nx-cloud record -- yarn nx format:check
+                - <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check
                 - <%= packageManagerPrefix %> nx affected --target=lint & <%= packageManagerPrefix %> nx affected --target=test & <%= packageManagerPrefix %> nx affected --target=build
                 - <%= packageManagerPrefix %> nx-cloud stop-all-agents
           - step: *agent