diff --git a/.changeset/move-next-builder.md b/.changeset/move-next-builder.md
new file mode 100644
index 00000000..e1dd10ab
--- /dev/null
+++ b/.changeset/move-next-builder.md
@@ -0,0 +1,5 @@
+---
+"@workflow/next": patch
+---
+
+Move NextBuilder to @workflow/next package
diff --git a/packages/cli/package.json b/packages/cli/package.json
index c5f85073..63f96e18 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -38,7 +38,6 @@
   },
   "devDependencies": {
     "@types/node": "catalog:",
-    "@types/watchpack": "2.4.4",
     "@workflow/tsconfig": "workspace:*"
   },
   "dependencies": {
@@ -68,7 +67,6 @@
     "ora": "^8.2.0",
     "terminal-link": "^5.0.0",
     "tinyglobby": "^0.2.14",
-    "watchpack": "2.4.4",
     "xdg-app-paths": "^5.1.0",
     "zod": "catalog:"
   }
diff --git a/packages/cli/src/lib/builders/webhook-route.test.ts b/packages/cli/src/lib/builders/webhook-route.test.ts.bkp
similarity index 99%
rename from packages/cli/src/lib/builders/webhook-route.test.ts
rename to packages/cli/src/lib/builders/webhook-route.test.ts.bkp
index 0e04535b..dad56279 100644
--- a/packages/cli/src/lib/builders/webhook-route.test.ts
+++ b/packages/cli/src/lib/builders/webhook-route.test.ts.bkp
@@ -2,7 +2,7 @@ import { mkdir, readFile, rm } from 'node:fs/promises';
 import { join } from 'node:path';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import type { WorkflowConfig } from '../config/types.js';
-import { NextBuilder } from './next-build.js';
+import { NextBuilder } from '@workflow/next/builder';
 import { VercelBuildOutputAPIBuilder } from './vercel-build-output-api.js';
 
 describe('Webhook route generation', () => {
diff --git a/packages/next/package.json b/packages/next/package.json
index 4dd4f611..1ac7f263 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -28,15 +28,17 @@
   },
   "dependencies": {
     "@swc/core": "1.11.24",
-    "@workflow/cli": "workspace:*",
+    "@workflow/builders": "workspace:*",
     "@workflow/core": "workspace:*",
     "@workflow/swc-plugin": "workspace:*",
-    "semver": "7.7.3"
+    "semver": "7.7.3",
+    "watchpack": "2.4.4"
   },
   "devDependencies": {
     "@workflow/tsconfig": "workspace:*",
     "@types/node": "catalog:",
     "@types/semver": "7.7.1",
+    "@types/watchpack": "2.4.4",
     "next": "16.0.1"
   },
   "peerDependencies": {
diff --git a/packages/cli/src/lib/builders/next-build.ts b/packages/next/src/builder.ts
similarity index 100%
rename from packages/cli/src/lib/builders/next-build.ts
rename to packages/next/src/builder.ts
diff --git a/packages/next/src/index.ts b/packages/next/src/index.ts
index ac8f4cfc..0a383778 100644
--- a/packages/next/src/index.ts
+++ b/packages/next/src/index.ts
@@ -1,4 +1,4 @@
-import { NextBuilder } from '@workflow/cli/dist/lib/builders/next-build';
+import { NextBuilder } from './builder.js';
 import type { NextConfig } from 'next';
 import semver from 'semver';
 
diff --git a/packages/next/src/runtime.ts b/packages/next/src/runtime.ts
index 03e64518..13e4a77f 100644
--- a/packages/next/src/runtime.ts
+++ b/packages/next/src/runtime.ts
@@ -1,4 +1,4 @@
 // re-export runtime as stub for resolving to not
 // require @workflow/core be a dependency as well as
 // @workflow/next
-export * from '@workflow/cli/dist/lib/runtime';
+export * from '@workflow/core/dist/runtime';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 03482a84..43fa66fa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -395,9 +395,6 @@ importers:
       tinyglobby:
         specifier: ^0.2.14
         version: 0.2.14
-      watchpack:
-        specifier: 2.4.4
-        version: 2.4.4
       xdg-app-paths:
         specifier: ^5.1.0
         version: 5.5.1
@@ -408,9 +405,6 @@ importers:
       '@types/node':
         specifier: 'catalog:'
         version: 22.19.0
-      '@types/watchpack':
-        specifier: 2.4.4
-        version: 2.4.4
       '@workflow/tsconfig':
         specifier: workspace:*
         version: link:../tsconfig
@@ -500,9 +494,9 @@ importers:
       '@swc/core':
         specifier: 1.11.24
         version: 1.11.24
-      '@workflow/cli':
+      '@workflow/builders':
         specifier: workspace:*
-        version: link:../cli
+        version: link:../builders
       '@workflow/core':
         specifier: workspace:*
         version: link:../core
@@ -512,6 +506,9 @@ importers:
       semver:
         specifier: 7.7.3
         version: 7.7.3
+      watchpack:
+        specifier: 2.4.4
+        version: 2.4.4
     devDependencies:
       '@types/node':
         specifier: 'catalog:'
@@ -519,6 +516,9 @@ importers:
       '@types/semver':
         specifier: 7.7.1
         version: 7.7.1
+      '@types/watchpack':
+        specifier: 2.4.4
+        version: 2.4.4
       '@workflow/tsconfig':
         specifier: workspace:*
         version: link:../tsconfig