diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 351a31b2..2065c385 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ concurrency:
 
 env:
   CI: true
-  NODE_VERSION: 16
+  NODE_VERSION: 20
   PNPM_CACHE_FOLDER: .pnpm-store
 
 jobs:
diff --git a/apps/next/package.json b/apps/next/package.json
index a8f847cc..d7906386 100644
--- a/apps/next/package.json
+++ b/apps/next/package.json
@@ -3,7 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "prepare": "pnpm codegen",
     "codegen": "panda codegen ",
     "dev": "rimraf .next && next dev -p 3001",
     "build": "next build",
diff --git a/apps/storybook/package.json b/apps/storybook/package.json
index 203dcbe4..21b9c33c 100644
--- a/apps/storybook/package.json
+++ b/apps/storybook/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "scripts": {
     "postinstall": "pnpm dlx playwright@1.38.1 install --with-deps chromium",
-    "prepare": "pnpm codegen",
     "codegen": "panda codegen",
     "test": "pnpm dlx concurrently -k -s first -n 'SB,TEST' -c 'magenta,blue' 'pnpm dlx http-server storybook-static --port 6006 --silent' 'pnpm dlx wait-on tcp:6006 && pnpm test-storybook'",
     "test:live": "test-storybook",
diff --git a/package.json b/package.json
index e0940acb..431b3874 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,9 @@
     "test": "turbo run test",
     "format": "prettier --write '**/{*.js,*.ts,*.tsx,*.json,*.md,*.mdx}'",
     "format:check": "prettier -c '**/{*.js,*.ts,*.tsx,*.json,*.md,*.mdx}'",
-    "ci": "turbo run format:check build lint test",
+    "ci:1": "turbo run format:check build",
+    "ci:2": "turbo run lint test",
+    "ci": "pnpm run ci:1 && pnpm install && pnpn ci:2",
     "ci:publish": "pnpm run ci:packages && pnpm run ci:storybook",
     "ci:packages": "pnpm  --filter=\"./presets/**\" --filter=\"./packages/**\" publish -r --publish-branch beta --access public",
     "ci:storybook": "pnpm --filter @committed/ds-storybook run deploy-storybook --ci",
diff --git a/packages/ds/package.json b/packages/ds/package.json
index ad248e92..6f1b7a07 100644
--- a/packages/ds/package.json
+++ b/packages/ds/package.json
@@ -26,7 +26,6 @@
     "clean": "rimraf dist",
     "debug": "panda debug",
     "studio": "panda studio",
-    "prepare": "pnpm codegen",
     "codegen": "panda codegen",
     "dev": "tsc --watch",
     "build:ts": "tsc",
diff --git a/turbo.json b/turbo.json
index 780390b8..07cf8964 100644
--- a/turbo.json
+++ b/turbo.json
@@ -25,7 +25,9 @@
       "outputs": ["coverage/**"],
       "dependsOn": ["build"]
     },
-    "lint": {},
+    "lint": {
+      "dependsOn": ["build"]
+    },
     "dev": {
       "dependsOn": ["codegen"],
       "cache": false,