diff --git a/packages/nx/src/tasks-runner/forked-process-task-runner.ts b/packages/nx/src/tasks-runner/forked-process-task-runner.ts
index 028047c080..fc30554f5b 100644
--- a/packages/nx/src/tasks-runner/forked-process-task-runner.ts
+++ b/packages/nx/src/tasks-runner/forked-process-task-runner.ts
@@ -325,6 +325,8 @@ export class ForkedProcessTaskRunner {
     const env: NodeJS.ProcessEnv = {
       NX_TASK_TARGET_PROJECT: task.target.project,
       NX_TASK_HASH: task.hash,
+      // used when Nx is invoked via Lerna
+      LERNA_PACKAGE_NAME: task.target.project,
     };
 
     // TODO: remove this once we have a reasonable way to configure it
diff --git a/packages/nx/src/tasks-runner/utils.ts b/packages/nx/src/tasks-runner/utils.ts
index bf3da2b10a..7e1593bfed 100644
--- a/packages/nx/src/tasks-runner/utils.ts
+++ b/packages/nx/src/tasks-runner/utils.ts
@@ -298,6 +298,8 @@ function longRunningTask(task: Task) {
   const t = task.target.target;
   return (
     (!!task.overrides['watch'] && task.overrides['watch'] !== 'false') ||
+    t.endsWith(':watch') ||
+    t.endsWith('-watch') ||
     t === 'serve' ||
     t === 'dev' ||
     t === 'start'