diff --git a/packages/angular/testing/src/testing-utils.ts b/packages/angular/testing/src/testing-utils.ts
index 46c7a68fe3..1b007bab72 100644
--- a/packages/angular/testing/src/testing-utils.ts
+++ b/packages/angular/testing/src/testing-utils.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs';
+import type { Observable } from 'rxjs';
 import { first, toArray } from 'rxjs/operators';
 
 /**
diff --git a/packages/devkit/src/utils/convert-nx-executor.ts b/packages/devkit/src/utils/convert-nx-executor.ts
index 74f2fc2813..f24cc68ddf 100644
--- a/packages/devkit/src/utils/convert-nx-executor.ts
+++ b/packages/devkit/src/utils/convert-nx-executor.ts
@@ -1,4 +1,4 @@
-import { from, Observable } from 'rxjs';
+import type { Observable } from 'rxjs';
 import type { Executor, ExecutorContext } from '@nrwl/tao/src/shared/workspace';
 import { Workspaces } from '@nrwl/tao/src/shared/workspace';
 
@@ -41,9 +41,9 @@ function toObservable<T extends { success: boolean }>(
   promiseOrAsyncIterator: Promise<T> | AsyncIterableIterator<T>
 ): Observable<T> {
   if (typeof (promiseOrAsyncIterator as any).then === 'function') {
-    return from(promiseOrAsyncIterator as Promise<T>);
+    return require('rxjs').from(promiseOrAsyncIterator as Promise<T>);
   } else {
-    return new Observable((subscriber) => {
+    return new (require('rxjs').Observable)((subscriber) => {
       let asyncIterator = promiseOrAsyncIterator as AsyncIterableIterator<T>;
 
       function recurse(iterator: AsyncIterableIterator<T>) {
diff --git a/packages/tao/src/commands/run.ts b/packages/tao/src/commands/run.ts
index 4c2f59c86a..790f17e8d6 100644
--- a/packages/tao/src/commands/run.ts
+++ b/packages/tao/src/commands/run.ts
@@ -18,7 +18,6 @@ import {
 
 import * as chalk from 'chalk';
 import { logger } from '../shared/logger';
-import { eachValueFrom } from 'rxjs-for-await';
 
 export interface Target {
   project: string;
@@ -257,7 +256,8 @@ async function runExecutorInternal<T extends { success: boolean }>(
       },
       isVerbose
     );
-    return eachValueFrom<T>(observable as any);
+    const { eachValueFrom } = require('rxjs-for-await');
+    return eachValueFrom(observable as any);
   }
 }
 
diff --git a/packages/workspace/src/tasks-runner/default-tasks-runner.ts b/packages/workspace/src/tasks-runner/default-tasks-runner.ts
index b2c58e4c1a..4ce0e48ae7 100644
--- a/packages/workspace/src/tasks-runner/default-tasks-runner.ts
+++ b/packages/workspace/src/tasks-runner/default-tasks-runner.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
 import { TaskCompleteEvent, TasksRunner } from './tasks-runner';
 import type { ProjectGraph, NxJsonConfiguration, Task } from '@nrwl/devkit';
 import { TaskOrchestrator } from './task-orchestrator';
diff --git a/packages/workspace/src/utilities/run-webpack.ts b/packages/workspace/src/utilities/run-webpack.ts
index d7fc188a24..6e5767eddb 100644
--- a/packages/workspace/src/utilities/run-webpack.ts
+++ b/packages/workspace/src/utilities/run-webpack.ts
@@ -1,6 +1,6 @@
 import type { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
 
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
 
 import { extname } from 'path';
 import * as url from 'url';
diff --git a/packages/workspace/src/utils/update-task.ts b/packages/workspace/src/utils/update-task.ts
index c2a0335458..761b830612 100644
--- a/packages/workspace/src/utils/update-task.ts
+++ b/packages/workspace/src/utils/update-task.ts
@@ -8,7 +8,7 @@ import {
   TaskId,
   Tree,
 } from '@angular-devkit/schematics';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
 import { fork } from 'child_process';
 import { join } from 'path';
 import { readJsonInTree } from './ast-utils';