diff --git a/.circleci/config.yml b/.circleci/config.yml
index ba498cd4d15a2..ced0e0a694b1a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,10 +98,6 @@ jobs:
       - browser-tools/install-chrome
       - run-pnpm-install:
           os: linux
-      - run:
-          name: Check Documentation
-          command: pnpm nx documentation --no-dte
-          no_output_timeout: 20m
       - run:
           name: Run Checks/Lint/Test/Build
           no_output_timeout: 60m
@@ -114,7 +110,7 @@ jobs:
             pnpm nx run-many -t check-imports check-commit check-lock-files check-codeowners documentation --parallel=1 --no-dte &
             pids+=($!)
 
-            (pnpm nx affected --targets=lint,test,build --base=$NX_BASE --head=$NX_HEAD --parallel=3 &&
+            (pnpm nx affected --targets=lint,test,build --base=$NX_BASE --head=$NX_HEAD --parallel=3 --exclude nx &&
             pnpm nx affected --targets=e2e,e2e-ci --base=$NX_BASE --head=$NX_HEAD --parallel=1) &
             pids+=($!)
 
diff --git a/nx.json b/nx.json
index 4e9ad71484b5a..24750ba2831a1 100644
--- a/nx.json
+++ b/nx.json
@@ -212,6 +212,6 @@
   "nxCloudUrl": "https://staging.nx.app",
   "parallel": 1,
   "cacheDirectory": "/tmp/nx-cache",
-  "bust": 6,
+  "bust": 7,
   "defaultBase": "master"
 }
diff --git a/packages/nx/src/project-graph/plugins/isolation/plugin-worker.ts b/packages/nx/src/project-graph/plugins/isolation/plugin-worker.ts
index ed636665e021f..0303021a83da1 100644
--- a/packages/nx/src/project-graph/plugins/isolation/plugin-worker.ts
+++ b/packages/nx/src/project-graph/plugins/isolation/plugin-worker.ts
@@ -132,9 +132,16 @@ const server = createServer((socket) => {
 
 server.listen(socketPath);
 
-process.on('exit', () => {
+const exitHandler = (exitCode: number) => () => {
   server.close();
   try {
     unlinkSync(socketPath);
   } catch (e) {}
-});
+  process.exit(exitCode);
+};
+
+const events = ['SIGINT', 'SIGTERM', 'SIGQUIT', 'exit'];
+
+events.forEach((event) => process.once(event, exitHandler(0)));
+process.once('uncaughtException', exitHandler(1));
+process.once('unhandledRejection', exitHandler(1));