diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 07b92f460..50776dce4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
           echo "NX_CI_EXECUTION_ENV=Node $(node --version) -" >> $GITHUB_ENV
 
       - name: Start Nx Cloud CI Run
-        run: npx nx-cloud start-ci-run --distributes-on="6 custom-linux-medium-plus-js"
+        run: npx nx-cloud start-ci-run --distributes-on="6 custom-linux-medium-plus-js" --stop-agents-after="e2e-suite"
 
       - uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
@@ -61,8 +61,10 @@ jobs:
           cmd2: yarn nx run-many -t test --codeCoverage
           cmd3: yarn nx-cloud record -- yarn lint
           cmd4: yarn nx-cloud record -- yarn format-check
-          # Run distributed e2e test suites with independent local registries (max 1 per agent via parallel=1)
-          cmd5: yarn nx run-many -t e2e-suite --parallel 1
+      
+      # Run distributed e2e test suites with independent local registries (max 1 per agent via parallel=1)
+      - name: Run e2e test suites
+        run: yarn nx run-many -t e2e-suite --parallel 1
 
       - name: Publish code coverage report
         uses: codecov/codecov-action@v4