diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7cff8fd..4cefb53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,11 +78,9 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Build application
-        run: pnpm build
+        run: pnpm build:ci
         env:
           # Provide minimal env vars for build (no actual secrets needed for build check)
           POSTGRES_URL: "postgresql://user:pass@localhost:5432/db"
           BETTER_AUTH_SECRET: "build-check-secret-32-characters!"
           NEXT_PUBLIC_APP_URL: "http://localhost:3000"
-          # Skip database migration during CI build
-          SKIP_ENV_VALIDATION: "true"
diff --git a/CLAUDE.md b/CLAUDE.md
index c273a78..58a5a8f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -103,6 +103,7 @@ BLOB_READ_WRITE_TOKEN=  # Leave empty for local dev, set for Vercel Blob in prod
 ```bash
 npm run dev          # Start dev server (DON'T run this yourself - ask user)
 npm run build        # Build for production (runs db:migrate first)
+npm run build:ci     # Build without database (for CI/CD pipelines)
 npm run start        # Start production server
 npm run lint         # Run ESLint (ALWAYS run after changes)
 npm run typecheck    # TypeScript type checking (ALWAYS run after changes)
diff --git a/create-agentic-app/package-lock.json b/create-agentic-app/package-lock.json
index 2cf8408..29934d5 100644
--- a/create-agentic-app/package-lock.json
+++ b/create-agentic-app/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "create-agentic-app",
-  "version": "1.1.22",
+  "version": "1.1.23",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "create-agentic-app",
-      "version": "1.1.22",
+      "version": "1.1.23",
       "license": "MIT",
       "dependencies": {
         "chalk": "^5.3.0",
diff --git a/create-agentic-app/package.json b/create-agentic-app/package.json
index e854d4b..1a06850 100644
--- a/create-agentic-app/package.json
+++ b/create-agentic-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-agentic-app",
-  "version": "1.1.22",
+  "version": "1.1.23",
   "description": "Scaffold a new agentic AI application with Next.js, Better Auth, and AI SDK",
   "type": "module",
   "bin": {
diff --git a/create-agentic-app/template/CLAUDE.md b/create-agentic-app/template/CLAUDE.md
index c273a78..58a5a8f 100644
--- a/create-agentic-app/template/CLAUDE.md
+++ b/create-agentic-app/template/CLAUDE.md
@@ -103,6 +103,7 @@ BLOB_READ_WRITE_TOKEN=  # Leave empty for local dev, set for Vercel Blob in prod
 ```bash
 npm run dev          # Start dev server (DON'T run this yourself - ask user)
 npm run build        # Build for production (runs db:migrate first)
+npm run build:ci     # Build without database (for CI/CD pipelines)
 npm run start        # Start production server
 npm run lint         # Run ESLint (ALWAYS run after changes)
 npm run typecheck    # TypeScript type checking (ALWAYS run after changes)
diff --git a/create-agentic-app/template/package.json b/create-agentic-app/template/package.json
index 7adb8b1..16624e8 100644
--- a/create-agentic-app/template/package.json
+++ b/create-agentic-app/template/package.json
@@ -4,6 +4,7 @@
   "scripts": {
     "dev": "next dev --turbopack",
     "build": "pnpm run db:migrate && next build",
+    "build:ci": "next build",
     "start": "next start",
     "lint": "eslint .",
     "typecheck": "tsc --noEmit",
diff --git a/package.json b/package.json
index 0b48e32..34ec7fc 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "scripts": {
     "dev": "next dev --turbopack",
     "build": "pnpm run db:migrate && next build",
+    "build:ci": "next build",
     "start": "next start",
     "lint": "eslint .",
     "typecheck": "tsc --noEmit",