diff --git a/.circleci/config.yml b/.circleci/config.yml
index c5dfc45b15..1439035325 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,6 @@ jobs:
     executor: linux
     environment:
       NX_E2E_CI_CACHE_KEY: e2e-circleci-linux
-      NX_VERBOSE_LOGGING: 'true'
       NX_DAEMON: 'true'
       NX_PERF_LOGGING: 'false'
       NX_NATIVE_LOGGING: 'false'
@@ -88,7 +87,7 @@ jobs:
       NX_CI_EXECUTION_ENV: 'linux'
     steps:
       - checkout
-      - run: npx nx-cloud@next start-ci-run --distributes-on="8 linux-medium" --stop-agents-after="e2e" --with-env-vars="auto"
+      - run: npx nx-cloud@next start-ci-run --distributes-on="8 linux-medium" --stop-agents-after="e2e"
       - run:
           command: |
             sudo apt-get update
@@ -161,6 +160,11 @@ jobs:
           command: |
             pnpm nx affected -t e2e-macos --parallel=1 --base=$NX_BASE --head=$NX_HEAD
           no_output_timeout: 45m
+      - run:
+          name: Close CI group
+          command: |
+            pnpm nx-cloud stop-all-agents
+          no_output_timeout: 45m
 
 # -------------------------
 #        WORKFLOWS(JOBS)
diff --git a/.nx/workflows/agents.yaml b/.nx/workflows/agents.yaml
index 902127533a..27afa8d0c5 100644
--- a/.nx/workflows/agents.yaml
+++ b/.nx/workflows/agents.yaml
@@ -9,10 +9,15 @@ launch-templates:
       GIT_COMMITTER_NAME: Test
       SELECTED_PM: 'pnpm'
       NPM_CONFIG_PREFIX: '/home/workflows/.npm-global'
+      NX_E2E_CI_CACHE_KEY: e2e-circleci-linux
+      NX_PERF_LOGGING: 'false'
+      NX_NATIVE_LOGGING: 'false'
+      CI: 'true'
+      NX_E2E_RUN_E2E: 'true'
+      NX_CLOUD_ACCESS_TOKEN: '{{secrets.NX_CLOUD_ACCESS_TOKEN}}'
     init-steps:
       - name: Checkout
         uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/checkout/main.yaml'
-
       - name: Cache restore
         uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/cache/main.yaml'
         env:
diff --git a/graph/client-e2e/src/e2e/dev-task-graph.cy.ts b/graph/client-e2e/src/e2e/dev-task-graph.cy.ts
index b4ded6a348..8cb3ca13bc 100644
--- a/graph/client-e2e/src/e2e/dev-task-graph.cy.ts
+++ b/graph/client-e2e/src/e2e/dev-task-graph.cy.ts
@@ -198,6 +198,7 @@ describe('dev mode - task graph', () => {
           // Load the fixture data and find the property based on the query parameter
 
           const expandedInputs = nxExamplesTaskInputs[taskId];
+          console.log(expandedInputs);
 
           // Reply with the selected property
           req.reply({
diff --git a/graph/client-e2e/src/e2e/release-static-app.cy.ts b/graph/client-e2e/src/e2e/release-static-app.cy.ts
index ad57e0a324..dc1bd5f042 100644
--- a/graph/client-e2e/src/e2e/release-static-app.cy.ts
+++ b/graph/client-e2e/src/e2e/release-static-app.cy.ts
@@ -58,57 +58,6 @@ describe('release static-mode app', () => {
         });
       });
     });
-
-    ['depGraphService', 'projectGraphService'].forEach((serviceName) => {
-      describe(`deprecated api - ${serviceName}`, () => {
-        it('should focus project', () => {
-          cy.window().then((window) => {
-            window.externalApi[serviceName].send({
-              type: 'focusProject',
-              projectName: 'cart',
-            });
-            checkFocusedProject(nxExamplesJson, 'cart');
-          });
-        });
-
-        it('should select all projects', () => {
-          cy.window().then((window) => {
-            window.externalApi[serviceName].send({ type: 'selectAll' });
-            checkSelectAll(nxExamplesJson);
-          });
-        });
-
-        it('should select a project', () => {
-          cy.window().then((window) => {
-            window.externalApi[serviceName].send({
-              type: 'selectProject',
-              projectName: 'cart',
-            });
-            checkSelectedProject('cart');
-          });
-        });
-
-        it('should deselect a project', () => {
-          cy.window().then((window) => {
-            window.externalApi[serviceName].send({
-              type: 'selectProject',
-              projectName: 'cart',
-            });
-            window.externalApi[serviceName].send({
-              type: 'selectProject',
-              projectName: 'cart-e2e',
-            });
-            window.externalApi[serviceName].send({
-              type: 'deselectProject',
-              projectName: 'cart',
-            });
-
-            checkSelectedProject('cart-e2e');
-            checkDeselectedProject('cart');
-          });
-        });
-      });
-    });
   });
 });
 
diff --git a/graph/client-e2e/src/support/app.po.ts b/graph/client-e2e/src/support/app.po.ts
index 889b0294eb..67248279fe 100644
--- a/graph/client-e2e/src/support/app.po.ts
+++ b/graph/client-e2e/src/support/app.po.ts
@@ -49,7 +49,7 @@ export const getSelectTargetDropdown = () =>
 export const openTooltipForNode = (nodeId: string) =>
   cy.window().then((window) => {
     // @ts-ignore - we will access private methods only in this e2e test
-    const pos = window.externalApi.graphService.renderGraph.cy
+    const pos = window.externalApi._graphService.renderGraph.cy
       .$(nodeId)
       .renderedPosition();
     cy.get('#cytoscape-graph').click(pos.x, pos.y);
diff --git a/graph/client/src/assets/dev-e2e/environment.js b/graph/client/src/assets/dev-e2e/environment.js
index f1545c8ca7..5a015e8fab 100644
--- a/graph/client/src/assets/dev-e2e/environment.js
+++ b/graph/client/src/assets/dev-e2e/environment.js
@@ -13,6 +13,7 @@ window.appConfig = {
       projectGraphUrl: 'assets/project-graphs/e2e.json',
       taskGraphUrl: 'assets/task-graphs/e2e.json',
       taskInputsUrl: 'assets/task-inputs/e2e.json',
+      sourceMapsUrl: 'assets/source-maps/e2e.json',
     },
     {
       id: 'affected',
@@ -20,6 +21,7 @@ window.appConfig = {
       projectGraphUrl: 'assets/project-graphs/affected.json',
       taskGraphUrl: 'assets/task-graphs/affected.json',
       taskInputsUrl: 'assets/task-inputs/affected.json',
+      sourceMapsUrl: 'assets/source-maps/e2e-affected.json',
     },
   ],
   defaultWorkspaceId: 'e2e',
diff --git a/nx.json b/nx.json
index be4e71a75f..d0bbe55b36 100644
--- a/nx.json
+++ b/nx.json
@@ -200,5 +200,5 @@
   "nxCloudUrl": "https://staging.nx.app",
   "parallel": 1,
   "cacheDirectory": "/tmp/nx-cache",
-  "bust": 2
+  "bust": 5
 }