diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml
index 81e91882..80b99572 100644
--- a/.github/workflows/pull.yml
+++ b/.github/workflows/pull.yml
@@ -50,12 +50,17 @@ jobs:
       - name: Install dependencies
         run: pnpm bootstrap:ci
 
-      - name: NX Affected
-        uses: nrwl/nx-set-shas@v4
-
-      - name: Build, Lint, Test using Distributed Task Execution
+      - name: Nx Cloud - Main Job
         uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0
         with:
           number-of-agents: 3
+          parallel-commands: |
+            npx nx-cloud record -- npx nx format:check
           parallel-commands-on-agents: |
-            npx nx affected -t build,lint,test --parallel=3
+            npx nx affected -t lint,test,build --parallel=3
+
+  agents:
+    name: Nx Cloud - Agents
+    uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0
+    with:
+      number-of-agents: 3
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 5eda466e..02e0a310 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -51,15 +51,14 @@ jobs:
       - name: Install dependencies
         run: pnpm bootstrap:ci
 
-      - name: NX Affected
-        uses: nrwl/nx-set-shas@v4
-
-      - name: Build, Lint, Test using Distributed Task Execution
+      - name: Nx Cloud - Main Job
         uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0
         with:
           number-of-agents: 3
+          parallel-commands: |
+            npx nx-cloud record -- npx nx format:check
           parallel-commands-on-agents: |
-            npx nx affected -t build,lint,test --parallel=3
+            npx nx affected -t lint,test,build --parallel=3
 
       - name: Config Git User
         run: |
@@ -77,3 +76,9 @@ jobs:
       - name: Publish Packages
         run: |
           pnpm publish:ci
+
+  agents:
+    name: Nx Cloud - Agents
+    uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0
+    with:
+      number-of-agents: 3