diff --git a/packages/gradle/src/generators/ci-workflow/__snapshots__/generator.spec.ts.snap b/packages/gradle/src/generators/ci-workflow/__snapshots__/generator.spec.ts.snap
index cdb0599e2fdbe..86dad706a30d9 100644
--- a/packages/gradle/src/generators/ci-workflow/__snapshots__/generator.spec.ts.snap
+++ b/packages/gradle/src/generators/ci-workflow/__snapshots__/generator.spec.ts.snap
@@ -17,7 +17,7 @@ jobs:
     steps:
       - checkout
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-jvm" --stop-agents-after="build"
 
@@ -56,7 +56,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-jvm" --stop-agents-after="build"
 
diff --git a/packages/gradle/src/generators/ci-workflow/generator.spec.ts b/packages/gradle/src/generators/ci-workflow/generator.spec.ts
index 5ab336ce1b755..e3d25c070f1f0 100644
--- a/packages/gradle/src/generators/ci-workflow/generator.spec.ts
+++ b/packages/gradle/src/generators/ci-workflow/generator.spec.ts
@@ -1,5 +1,5 @@
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Tree, updateJson, NxJsonConfiguration } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 
 import { ciWorkflowGenerator } from './generator';
 
@@ -10,16 +10,6 @@ describe('ci-workflow generator', () => {
     tree = createTreeWithEmptyWorkspace();
   });
 
-  beforeEach(() => {
-    updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
-      return {
-        ...json,
-        nxCloudAccessToken: 'xxxx-xxx-xxxx',
-        nxCloudUrl: 'https://my.nx.app',
-      };
-    });
-  });
-
   describe.each([
     ['github', '.github/workflows/ci.yml'],
     ['circleci', '.circleci/config.yml'],
diff --git a/packages/gradle/src/generators/ci-workflow/generator.ts b/packages/gradle/src/generators/ci-workflow/generator.ts
index f8649ef149b55..f548efb227a4c 100644
--- a/packages/gradle/src/generators/ci-workflow/generator.ts
+++ b/packages/gradle/src/generators/ci-workflow/generator.ts
@@ -7,6 +7,7 @@ import {
   formatFiles,
   detectPackageManager,
   readNxJson,
+  readJson,
 } from '@nx/devkit';
 import { join } from 'path';
 import { getNxCloudUrl, isNxCloudUsed } from 'nx/src/utils/nx-cloud-utils';
@@ -33,13 +34,7 @@ export interface Schema {
 export async function ciWorkflowGenerator(tree: Tree, schema: Schema) {
   const ci = schema.ci;
 
-  const nxJson: NxJsonConfiguration = readNxJson(tree);
-  const nxCloudUsed = isNxCloudUsed(nxJson);
-  if (!nxCloudUsed) {
-    throw new Error('This workspace is not connected to Nx Cloud.');
-  }
-
-  const options = getTemplateData(schema, nxJson);
+  const options = getTemplateData(tree, schema);
   generateFiles(tree, join(__dirname, 'files', ci), '', options);
   await formatFiles(tree);
 }
@@ -54,10 +49,7 @@ interface Substitutes {
   nxCloudHost: string;
 }
 
-function getTemplateData(
-  options: Schema,
-  nxJson: NxJsonConfiguration
-): Substitutes {
+function getTemplateData(tree: Tree, options: Schema): Substitutes {
   const { name: workflowName, fileName: workflowFileName } = names(
     options.name
   );
@@ -65,8 +57,11 @@ function getTemplateData(
   const { exec: packageManagerPrefix } =
     getPackageManagerCommand(packageManager);
 
-  const nxCloudUrl = getNxCloudUrl(nxJson);
-  const nxCloudHost = new URL(nxCloudUrl).host;
+  let nxCloudHost: string = 'nx.app';
+  try {
+    const nxCloudUrl = getNxCloudUrl(readJson(tree, 'nx.json'));
+    nxCloudHost = new URL(nxCloudUrl).host;
+  } catch {}
 
   const mainBranch = deduceDefaultBase();
 
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 4e71999d898d5..fe90ca18ca9e9 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
@@ -44,7 +44,7 @@ jobs:
             echo "##vso[task.setvariable variable=BASE_SHA]$LAST_SHA"
           fi
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
       # - script: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci"
 
@@ -52,7 +52,8 @@ jobs:
       - script: git branch --track main origin/main
         condition: eq(variables['Build.Reason'], 'PullRequest')
 
-      - script: npx nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - script: npx nx-cloud record -- echo Hello World
       - script: npx nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build e2e-ci
 "
 `;
@@ -71,7 +72,7 @@ pipelines:
           script:
             - export NX_BRANCH=$BITBUCKET_PR_ID
 
-            # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+            # Connect your workspace on nx.app and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
             # - npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci"
 
@@ -86,13 +87,14 @@ pipelines:
           name: 'Build and test affected apps on "main" branch changes'
           script:
             - export NX_BRANCH=$BITBUCKET_BRANCH
-            # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+            # Connect your workspace on nx.app and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
             # - npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci"
 
             - npm ci
 
-            - npx nx-cloud record -- nx format:check
+            # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+            # - npx nx-cloud record -- echo Hello World
             - npx nx affected -t lint test build e2e-ci --base=HEAD~1
 "
 `;
@@ -110,7 +112,7 @@ jobs:
     steps:
       - checkout
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
       # - run: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci"
 
@@ -118,7 +120,8 @@ jobs:
       - nx/set-shas:
           main-branch-name: 'main'
 
-      - run: npx nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: npx nx-cloud record -- echo Hello World
       - run: npx nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build e2e-ci
 
 workflows:
@@ -151,7 +154,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
       # - run: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci"
 
@@ -163,7 +166,8 @@ jobs:
       - run: npm ci
       - uses: nrwl/nx-set-shas@v4
 
-      - run: npx nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: npx nx-cloud record -- echo Hello World
       - run: npx nx affected -t lint test build e2e-ci
 "
 `;
@@ -189,7 +193,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
       # - run: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci"
 
@@ -201,7 +205,8 @@ jobs:
       - run: npm ci
       - uses: nrwl/nx-set-shas@v4
 
-      - run: npx nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: npx nx-cloud record -- echo Hello World
       - run: npx nx affected -t lint test build e2e-ci
 "
 `;
@@ -250,7 +255,7 @@ jobs:
             echo "##vso[task.setvariable variable=BASE_SHA]$LAST_SHA"
           fi
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - script: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -258,7 +263,8 @@ jobs:
       - script: git branch --track main origin/main
         condition: eq(variables['Build.Reason'], 'PullRequest')
 
-      - script: npx nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - script: npx nx-cloud record -- echo Hello World
       - script: npx nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build
 "
 `;
@@ -277,7 +283,7 @@ pipelines:
           script:
             - export NX_BRANCH=$BITBUCKET_PR_ID
 
-            # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+            # Connect your workspace on nx.app and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
             # - npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -292,13 +298,14 @@ pipelines:
           name: 'Build and test affected apps on "main" branch changes'
           script:
             - export NX_BRANCH=$BITBUCKET_BRANCH
-            # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+            # Connect your workspace on nx.app and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
             # - npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
             - npm ci
 
-            - npx nx-cloud record -- nx format:check
+            # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+            # - npx nx-cloud record -- echo Hello World
             - npx nx affected -t lint test build --base=HEAD~1
 "
 `;
@@ -316,7 +323,7 @@ jobs:
     steps:
       - checkout
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -324,7 +331,8 @@ jobs:
       - nx/set-shas:
           main-branch-name: 'main'
 
-      - run: npx nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: npx nx-cloud record -- echo Hello World
       - run: npx nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build
 
 workflows:
@@ -357,7 +365,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -369,7 +377,8 @@ jobs:
       - run: npm ci
       - uses: nrwl/nx-set-shas@v4
 
-      - run: npx nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: npx nx-cloud record -- echo Hello World
       - run: npx nx affected -t lint test build
 "
 `;
@@ -395,7 +404,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -407,7 +416,8 @@ jobs:
       - run: npm ci
       - uses: nrwl/nx-set-shas@v4
 
-      - run: npx nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: npx nx-cloud record -- echo Hello World
       - run: npx nx affected -t lint test build
 "
 `;
@@ -424,7 +434,7 @@ CI:
     - main
     - merge_requests
   script:
-    # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+    # Connect your workspace on nx.app and uncomment this to enable task distribution.
     # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
     # - npx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -432,13 +442,12 @@ CI:
     - NX_HEAD=$CI_COMMIT_SHA
     - NX_BASE=\${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
-    - npx nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+    # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+    # - npx nx-cloud record -- echo Hello World
     - npx nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build
 "
 `;
 
-exports[`CI Workflow generator with npm should throw error is nx cloud is not set 1`] = `"This workspace is not connected to Nx Cloud."`;
-
 exports[`CI Workflow generator with pnpm should generate azure CI config 1`] = `
 "name: CI
 
@@ -486,7 +495,7 @@ jobs:
       - script: npm install --prefix=$HOME/.local -g pnpm@8
         displayName: Install PNPM
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - script: pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -494,7 +503,8 @@ jobs:
       - script: git branch --track main origin/main
         condition: eq(variables['Build.Reason'], 'PullRequest')
 
-      - script: pnpm exec nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - script: pnpm exec nx-cloud record -- echo Hello World
       - script: pnpm exec nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build
 "
 `;
@@ -515,7 +525,7 @@ pipelines:
 
             - npm install --prefix=$HOME/.local -g pnpm@8
 
-            # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+            # Connect your workspace on nx.app and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
             # - pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -530,7 +540,7 @@ pipelines:
           name: 'Build and test affected apps on "main" branch changes'
           script:
             - export NX_BRANCH=$BITBUCKET_BRANCH
-            # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+            # Connect your workspace on nx.app and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
             # - pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -538,7 +548,8 @@ pipelines:
 
             - pnpm install --frozen-lockfile
 
-            - pnpm exec nx-cloud record -- nx format:check
+            # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+            # - pnpm exec nx-cloud record -- echo Hello World
             - pnpm exec nx affected -t lint test build --base=HEAD~1
 "
 `;
@@ -560,7 +571,7 @@ jobs:
           name: Install PNPM
           command: npm install --prefix=$HOME/.local -g pnpm@8
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -568,7 +579,8 @@ jobs:
       - nx/set-shas:
           main-branch-name: 'main'
 
-      - run: pnpm exec nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: pnpm exec nx-cloud record -- echo Hello World
       - run: pnpm exec nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build
 
 workflows:
@@ -605,7 +617,7 @@ jobs:
         with:
           version: 8
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -617,7 +629,8 @@ jobs:
       - run: pnpm install --frozen-lockfile
       - uses: nrwl/nx-set-shas@v4
 
-      - run: pnpm exec nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: pnpm exec nx-cloud record -- echo Hello World
       - run: pnpm exec nx affected -t lint test build
 "
 `;
@@ -647,7 +660,7 @@ jobs:
         with:
           version: 8
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -659,7 +672,8 @@ jobs:
       - run: pnpm install --frozen-lockfile
       - uses: nrwl/nx-set-shas@v4
 
-      - run: pnpm exec nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: pnpm exec nx-cloud record -- echo Hello World
       - run: pnpm exec nx affected -t lint test build
 "
 `;
@@ -678,7 +692,7 @@ CI:
   script:
     - npm install --prefix=$HOME/.local -g pnpm@8
 
-    # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+    # Connect your workspace on nx.app and uncomment this to enable task distribution.
     # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
     # - pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -686,13 +700,12 @@ CI:
     - NX_HEAD=$CI_COMMIT_SHA
     - NX_BASE=\${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
-    - pnpm exec nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+    # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+    # - pnpm exec nx-cloud record -- echo Hello World
     - pnpm exec nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build
 "
 `;
 
-exports[`CI Workflow generator with pnpm should throw error is nx cloud is not set 1`] = `"This workspace is not connected to Nx Cloud."`;
-
 exports[`CI Workflow generator with yarn should generate azure CI config 1`] = `
 "name: CI
 
@@ -737,7 +750,7 @@ jobs:
             echo "##vso[task.setvariable variable=BASE_SHA]$LAST_SHA"
           fi
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - script: yarn nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -745,7 +758,8 @@ jobs:
       - script: git branch --track main origin/main
         condition: eq(variables['Build.Reason'], 'PullRequest')
 
-      - script: yarn nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - script: yarn nx-cloud record -- echo Hello World
       - script: yarn nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build
 "
 `;
@@ -764,7 +778,7 @@ pipelines:
           script:
             - export NX_BRANCH=$BITBUCKET_PR_ID
 
-            # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+            # Connect your workspace on nx.app and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
             # - yarn nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -779,13 +793,14 @@ pipelines:
           name: 'Build and test affected apps on "main" branch changes'
           script:
             - export NX_BRANCH=$BITBUCKET_BRANCH
-            # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+            # Connect your workspace on nx.app and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
             # - yarn nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
             - yarn install --frozen-lockfile
 
-            - yarn nx-cloud record -- nx format:check
+            # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+            # - yarn nx-cloud record -- echo Hello World
             - yarn nx affected -t lint test build --base=HEAD~1
 "
 `;
@@ -803,7 +818,7 @@ jobs:
     steps:
       - checkout
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: yarn nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -811,7 +826,8 @@ jobs:
       - nx/set-shas:
           main-branch-name: 'main'
 
-      - run: yarn nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: yarn nx-cloud record -- echo Hello World
       - run: yarn nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build
 
 workflows:
@@ -844,7 +860,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: yarn nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -856,7 +872,8 @@ jobs:
       - run: yarn install --frozen-lockfile
       - uses: nrwl/nx-set-shas@v4
 
-      - run: yarn nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: yarn nx-cloud record -- echo Hello World
       - run: yarn nx affected -t lint test build
 "
 `;
@@ -882,7 +899,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+      # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
       # - run: yarn nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -894,7 +911,8 @@ jobs:
       - run: yarn install --frozen-lockfile
       - uses: nrwl/nx-set-shas@v4
 
-      - run: yarn nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: yarn nx-cloud record -- echo Hello World
       - run: yarn nx affected -t lint test build
 "
 `;
@@ -911,7 +929,7 @@ CI:
     - main
     - merge_requests
   script:
-    # Connect your workspace on my.nx.app and uncomment this to enable task distribution.
+    # Connect your workspace on nx.app and uncomment this to enable task distribution.
     # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
     # - yarn nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
 
@@ -919,9 +937,8 @@ CI:
     - NX_HEAD=$CI_COMMIT_SHA
     - NX_BASE=\${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
-    - yarn nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+    # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+    # - yarn nx-cloud record -- echo Hello World
     - yarn nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build
 "
 `;
-
-exports[`CI Workflow generator with yarn should throw error is nx cloud is not set 1`] = `"This workspace is not connected to Nx Cloud."`;
diff --git a/packages/workspace/src/generators/ci-workflow/ci-workflow.spec.ts b/packages/workspace/src/generators/ci-workflow/ci-workflow.spec.ts
index 4a3f3ac74d0e1..f421fa2b66fab 100644
--- a/packages/workspace/src/generators/ci-workflow/ci-workflow.spec.ts
+++ b/packages/workspace/src/generators/ci-workflow/ci-workflow.spec.ts
@@ -1,5 +1,4 @@
 import {
-  NxJsonConfiguration,
   PackageManager,
   readJson,
   readNxJson,
@@ -54,7 +53,6 @@ describe('CI Workflow generator', () => {
       });
 
       it('should generate github CI config', async () => {
-        setNxCloud(tree);
         await ciWorkflowGenerator(tree, { ci: 'github', name: 'CI' });
 
         expect(
@@ -63,21 +61,18 @@ describe('CI Workflow generator', () => {
       });
 
       it('should generate circleci CI config', async () => {
-        setNxCloud(tree);
         await ciWorkflowGenerator(tree, { ci: 'circleci', name: 'CI' });
 
         expect(tree.read('.circleci/config.yml', 'utf-8')).toMatchSnapshot();
       });
 
       it('should generate azure CI config', async () => {
-        setNxCloud(tree);
         await ciWorkflowGenerator(tree, { ci: 'azure', name: 'CI' });
 
         expect(tree.read('azure-pipelines.yml', 'utf-8')).toMatchSnapshot();
       });
 
       it('should generate github CI config with custom name', async () => {
-        setNxCloud(tree);
         await ciWorkflowGenerator(tree, {
           ci: 'github',
           name: 'My custom-workflow',
@@ -89,7 +84,6 @@ describe('CI Workflow generator', () => {
       });
 
       it('should generate bitbucket pipelines config', async () => {
-        setNxCloud(tree);
         await ciWorkflowGenerator(tree, {
           ci: 'bitbucket-pipelines',
           name: 'CI',
@@ -99,8 +93,6 @@ describe('CI Workflow generator', () => {
       });
 
       it('should prefix nx.json affected defaultBase with origin/ if ci is bitbucket-pipelines', async () => {
-        setNxCloud(tree);
-
         const nxJson = readJson(tree, 'nx.json');
         nxJson.affected.defaultBase = 'my-branch';
         writeJson(tree, 'nx.json', nxJson);
@@ -116,8 +108,6 @@ describe('CI Workflow generator', () => {
       });
 
       it('should prefix nx.json base with origin/ if ci is bitbucket-pipelines', async () => {
-        setNxCloud(tree);
-
         const nxJson = readNxJson(tree);
         nxJson.defaultBase = 'my-branch';
         writeJson(tree, 'nx.json', nxJson);
@@ -131,20 +121,10 @@ describe('CI Workflow generator', () => {
       });
 
       it('should generate gitlab config', async () => {
-        setNxCloud(tree);
         await ciWorkflowGenerator(tree, { ci: 'gitlab', name: 'CI' });
 
         expect(tree.read('.gitlab-ci.yml', 'utf-8')).toMatchSnapshot();
       });
-
-      it('should throw error is nx cloud is not set', async () => {
-        await expect(
-          ciWorkflowGenerator(tree, {
-            ci: 'github',
-            name: 'CI',
-          })
-        ).rejects.toThrowErrorMatchingSnapshot();
-      });
     });
   });
 
@@ -160,28 +140,24 @@ describe('CI Workflow generator', () => {
     });
 
     it('should add e2e to github CI config', async () => {
-      setNxCloud(tree);
       await ciWorkflowGenerator(tree, { ci: 'github', name: 'CI' });
 
       expect(tree.read('.github/workflows/ci.yml', 'utf-8')).toMatchSnapshot();
     });
 
     it('should add e2e to circleci CI config', async () => {
-      setNxCloud(tree);
       await ciWorkflowGenerator(tree, { ci: 'circleci', name: 'CI' });
 
       expect(tree.read('.circleci/config.yml', 'utf-8')).toMatchSnapshot();
     });
 
     it('should add e2e to azure CI config', async () => {
-      setNxCloud(tree);
       await ciWorkflowGenerator(tree, { ci: 'azure', name: 'CI' });
 
       expect(tree.read('azure-pipelines.yml', 'utf-8')).toMatchSnapshot();
     });
 
     it('should add e2e to github CI config with custom name', async () => {
-      setNxCloud(tree);
       await ciWorkflowGenerator(tree, {
         ci: 'github',
         name: 'My custom-workflow',
@@ -193,7 +169,6 @@ describe('CI Workflow generator', () => {
     });
 
     it('should add e2e to bitbucket pipelines config', async () => {
-      setNxCloud(tree);
       await ciWorkflowGenerator(tree, {
         ci: 'bitbucket-pipelines',
         name: 'CI',
@@ -203,13 +178,3 @@ describe('CI Workflow generator', () => {
     });
   });
 });
-
-function setNxCloud(tree: Tree) {
-  updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
-    return {
-      ...json,
-      nxCloudAccessToken: 'xxxx-xxx-xxxx',
-      nxCloudUrl: 'https://my.nx.app',
-    };
-  });
-}
diff --git a/packages/workspace/src/generators/ci-workflow/ci-workflow.ts b/packages/workspace/src/generators/ci-workflow/ci-workflow.ts
index caa187c84573b..d1e021420ff52 100644
--- a/packages/workspace/src/generators/ci-workflow/ci-workflow.ts
+++ b/packages/workspace/src/generators/ci-workflow/ci-workflow.ts
@@ -22,14 +22,6 @@ export async function ciWorkflowGenerator(tree: Tree, schema: Schema) {
   const ci = schema.ci;
 
   const nxJson: NxJsonConfiguration = readJson(tree, 'nx.json');
-  const nxCloudUsed =
-    nxJson.nxCloudAccessToken ??
-    Object.values(nxJson.tasksRunnerOptions ?? {}).find(
-      (r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud'
-    );
-  if (!nxCloudUsed) {
-    throw new Error('This workspace is not connected to Nx Cloud.');
-  }
   if (ci === 'bitbucket-pipelines' && defaultBranchNeedsOriginPrefix(nxJson)) {
     writeJson(tree, 'nx.json', appendOriginPrefix(nxJson));
   }
@@ -59,8 +51,11 @@ function normalizeOptions(options: Schema, tree: Tree): Substitutes {
   const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } =
     getPackageManagerCommand(packageManager);
 
-  const nxCloudUrl = getNxCloudUrl(readJson(tree, 'nx.json'));
-  const nxCloudHost = new URL(nxCloudUrl).host;
+  let nxCloudHost: string = 'nx.app';
+  try {
+    const nxCloudUrl = getNxCloudUrl(readJson(tree, 'nx.json'));
+    nxCloudHost = new URL(nxCloudUrl).host;
+  } catch {}
 
   const packageJson = readJson(tree, 'package.json');
   const allDependencies = {
diff --git a/packages/workspace/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__ b/packages/workspace/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__
index 5d4b9572bfefa..8407bfbcfe6ad 100644
--- a/packages/workspace/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__
+++ b/packages/workspace/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__
@@ -54,5 +54,6 @@ jobs:
       - script: git branch --track <%= mainBranch %> origin/<%= mainBranch %>
         condition: eq(variables['Build.Reason'], 'PullRequest')
 
-      - script: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - script: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
       - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
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 0fb2e3a6e31f9..dcdb36090fc55 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__
@@ -39,5 +39,6 @@ pipelines:
             <% } %>
             - <%= packageManagerInstall %>
 
-            - <%= packageManagerPrefix %> nx-cloud record -- nx format:check
+            # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+            # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
             - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %> --base=HEAD~1
diff --git a/packages/workspace/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ b/packages/workspace/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__
index b04698fea264a..ec8f588285aac 100644
--- a/packages/workspace/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__
+++ b/packages/workspace/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__
@@ -23,7 +23,8 @@ jobs:
       - nx/set-shas:
           main-branch-name: '<%= mainBranch %>'
 
-      - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
       - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
 
 workflows:
diff --git a/packages/workspace/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ b/packages/workspace/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__
index d316cdb7a1b14..5916e41b167f7 100644
--- a/packages/workspace/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__
+++ b/packages/workspace/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__
@@ -35,5 +35,6 @@ jobs:
       - run: <%= packageManagerInstall %>
       - uses: nrwl/nx-set-shas@v4
 
-      - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
       - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
diff --git a/packages/workspace/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__ b/packages/workspace/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__
index e8f3f886ac050..d61a18ff7fed2 100644
--- a/packages/workspace/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__
+++ b/packages/workspace/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__
@@ -20,5 +20,6 @@ variables:
     - NX_HEAD=$CI_COMMIT_SHA
     - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
-    - <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+    # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+    # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
     - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>