diff --git a/package-lock.json b/package-lock.json
index 0adf633..880ce59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@insforge/cli",
-  "version": "0.1.21",
+  "version": "0.1.29",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@insforge/cli",
-      "version": "0.1.21",
+      "version": "0.1.29",
       "license": "Apache-2.0",
       "dependencies": {
         "@clack/prompts": "^0.9.1",
@@ -1589,7 +1589,6 @@
       "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.56.1",
         "@typescript-eslint/types": "8.56.1",
@@ -1906,7 +1905,6 @@
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2053,7 +2051,6 @@
       "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
       "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "peerDependencies": {
         "bare-abort-controller": "*"
       },
@@ -2497,7 +2494,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -2552,7 +2548,6 @@
       "integrity": "sha512-uYixubwmqJZH+KLVYIVKY1JQt7tysXhtj21WSvjcSmU5SVNzMus1bgLe+pAt816yQ8opKfheVVoPLqvVMGejYw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.2",
@@ -3787,7 +3782,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -4569,7 +4563,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/package.json b/package.json
index a54d4ec..5a2a8b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@insforge/cli",
-  "version": "0.1.21",
+  "version": "0.1.30",
   "description": "InsForge CLI - Command line tool for InsForge platform",
   "type": "module",
   "bin": {
diff --git a/src/commands/create.ts b/src/commands/create.ts
index 52b2169..3f837da 100644
--- a/src/commands/create.ts
+++ b/src/commands/create.ts
@@ -11,11 +11,12 @@ import {
   getProject,
   getProjectApiKey,
 } from '../lib/api/platform.js';
-import { getAnonKey } from '../lib/api/oss.js';
+import { getAnonKey, runRawSql } from '../lib/api/oss.js';
 import { getGlobalConfig, saveGlobalConfig, saveProjectConfig, getFrontendUrl } from '../lib/config.js';
 import { requireAuth } from '../lib/credentials.js';
 import { handleError, getRootOpts, CLIError } from '../lib/errors.js';
 import { outputJson } from '../lib/output.js';
+import { readEnvFile } from '../lib/env.js';
 import { installCliGlobally, installSkills, reportCliUsage } from '../lib/skills.js';
 import { deployProject } from './deployments/deploy.js';
 import type { ProjectConfig } from '../types.js';
@@ -59,7 +60,7 @@ export function registerCreateCommand(program: Command): void {
     .option('--name <name>', 'Project name')
     .option('--org-id <id>', 'Organization ID')
     .option('--region <region>', 'Deployment region (us-east, us-west, eu-central, ap-southeast)')
-    .option('--template <template>', 'Template to use: react, nextjs, or empty')
+    .option('--template <template>', 'Template to use: react, nextjs, chatbot, crm, e-commerce, or empty')
     .action(async (opts, cmd) => {
       const { json, apiUrl } = getRootOpts(cmd);
       try {
@@ -108,7 +109,11 @@ export function registerCreateCommand(program: Command): void {
         }
 
         // 3. Select template
+        const validTemplates = ['react', 'nextjs', 'chatbot', 'crm', 'e-commerce', 'empty'];
         let template = opts.template as string | undefined;
+        if (template && !validTemplates.includes(template)) {
+          throw new CLIError(`Invalid template "${template}". Valid options: ${validTemplates.join(', ')}`);
+        }
         if (!template) {
           if (json) {
             template = 'empty';
@@ -118,6 +123,9 @@ export function registerCreateCommand(program: Command): void {
               options: [
                 { value: 'react', label: 'Web app template with React' },
                 { value: 'nextjs', label: 'Web app template with Next.js' },
+                { value: 'chatbot', label: 'AI Chatbot with Next.js' },
+                { value: 'crm', label: 'CRM with Next.js' },
+                { value: 'e-commerce', label: 'E-Commerce store with Next.js' },
                 { value: 'empty', label: 'Empty project' },
               ],
             });
@@ -152,7 +160,10 @@ export function registerCreateCommand(program: Command): void {
 
         // 6. Download template if selected
         const hasTemplate = template !== 'empty';
-        if (hasTemplate) {
+        const githubTemplates = ['chatbot', 'crm', 'e-commerce'];
+        if (githubTemplates.includes(template!)) {
+          await downloadGitHubTemplate(template!, projectConfig, json);
+        } else if (hasTemplate) {
           await downloadTemplate(template as Framework, projectConfig, projectName, json, apiUrl);
         }
 
@@ -186,9 +197,17 @@ export function registerCreateCommand(program: Command): void {
 
           if (!clack.isCancel(shouldDeploy) && shouldDeploy) {
             try {
+              // Read env vars from .env.local or .env to pass to deployment
+              const envVars = await readEnvFile(process.cwd());
+              const startBody: { envVars?: Array<{ key: string; value: string }> } = {};
+              if (envVars.length > 0) {
+                startBody.envVars = envVars;
+              }
+
               const deploySpinner = clack.spinner();
               const result = await deployProject({
                 sourceDir: process.cwd(),
+                startBody,
                 spinner: deploySpinner,
               });
 
@@ -291,4 +310,85 @@ async function downloadTemplate(
   }
 }
 
+async function downloadGitHubTemplate(
+  templateName: string,
+  projectConfig: ProjectConfig,
+  json: boolean,
+): Promise<void> {
+  const s = !json ? clack.spinner() : null;
+  s?.start(`Downloading ${templateName} template...`);
+
+  const tempDir = path.join(tmpdir(), `insforge-template-${Date.now()}`);
+
+  try {
+    await fs.mkdir(tempDir, { recursive: true });
+
+    // Shallow clone the templates repo
+    await execAsync(
+      'git clone --depth 1 https://github.com/InsForge/insforge-templates.git .',
+      { cwd: tempDir, maxBuffer: 10 * 1024 * 1024, timeout: 60_000 },
+    );
+
+    const templateDir = path.join(tempDir, templateName);
+    const stat = await fs.stat(templateDir).catch(() => null);
+    if (!stat?.isDirectory()) {
+      throw new Error(`Template "${templateName}" not found in repository`);
+    }
+
+    // Copy template files to cwd
+    s?.message('Copying template files...');
+    const cwd = process.cwd();
+    await copyDir(templateDir, cwd);
+
+    // Write .env.local from .env.example with InsForge credentials filled in
+    const envExamplePath = path.join(cwd, '.env.example');
+    const envExampleExists = await fs.stat(envExamplePath).catch(() => null);
+    if (envExampleExists) {
+      const anonKey = await getAnonKey();
+      const envExample = await fs.readFile(envExamplePath, 'utf-8');
+      const envContent = envExample.replace(
+        /^([A-Z][A-Z0-9_]*=)(.*)$/gm,
+        (_, prefix: string, _value: string) => {
+          const key = prefix.slice(0, -1); // remove trailing '='
+          if (/INSFORGE.*(URL|BASE_URL)$/.test(key)) return `${prefix}${projectConfig.oss_host}`;
+          if (/INSFORGE.*ANON_KEY$/.test(key)) return `${prefix}${anonKey}`;
+          if (key === 'NEXT_PUBLIC_APP_URL') return `${prefix}https://${projectConfig.appkey}.insforge.site`;
+          return `${prefix}${_value}`;
+        },
+      );
+      await fs.writeFile(path.join(cwd, '.env.local'), envContent);
+    }
+
+    s?.stop(`${templateName} template downloaded`);
+
+    // Auto-run database migrations if db_init.sql exists
+    const migrationPath = path.join(cwd, 'migrations', 'db_init.sql');
+    const migrationExists = await fs.stat(migrationPath).catch(() => null);
+    if (migrationExists) {
+      const dbSpinner = !json ? clack.spinner() : null;
+      dbSpinner?.start('Running database migrations...');
+      try {
+        const sql = await fs.readFile(migrationPath, 'utf-8');
+        await runRawSql(sql, true);
+        dbSpinner?.stop('Database migrations applied');
+      } catch (err) {
+        dbSpinner?.stop('Database migration failed');
+        if (!json) {
+          clack.log.warn(`Migration failed: ${(err as Error).message}`);
+          clack.log.info('You can run the migration manually: insforge db query --unrestricted "$(cat migrations/db_init.sql)"');
+        } else {
+          throw err;
+        }
+      }
+    }
+  } catch (err) {
+    s?.stop(`${templateName} template download failed`);
+    if (!json) {
+      clack.log.warn(`Failed to download ${templateName} template: ${(err as Error).message}`);
+      clack.log.info('You can manually clone from: https://github.com/InsForge/insforge-templates');
+    }
+  } finally {
+    await fs.rm(tempDir, { recursive: true, force: true }).catch(() => {});
+  }
+}
 
diff --git a/src/commands/db/query.ts b/src/commands/db/query.ts
index 04e5751..073fd5a 100644
--- a/src/commands/db/query.ts
+++ b/src/commands/db/query.ts
@@ -1,5 +1,5 @@
 import type { Command } from 'commander';
-import { ossFetch } from '../../lib/api/oss.js';
+import { runRawSql } from '../../lib/api/oss.js';
 import { requireAuth } from '../../lib/credentials.js';
 import { handleError, getRootOpts } from '../../lib/errors.js';
 import { outputJson, outputTable } from '../../lib/output.js';
@@ -15,23 +15,12 @@ export function registerDbCommands(dbCmd: Command): void {
       try {
         await requireAuth();
 
-        const endpoint = opts.unrestricted
-          ? '/api/database/advance/rawsql/unrestricted'
-          : '/api/database/advance/rawsql';
-
-        const res = await ossFetch(endpoint, {
-          method: 'POST',
-          body: JSON.stringify({ query: sql }),
-        });
-
-        const data = await res.json() as { rows?: Record<string, unknown>[]; data?: Record<string, unknown>[] };
+        const { rows, raw } = await runRawSql(sql, !!opts.unrestricted);
 
         if (json) {
-          outputJson(data);
+          outputJson(raw);
         } else {
-          // Try to render as table if results are array of objects
-          const rows = data.rows ?? data.data ?? null;
-          if (rows && rows.length > 0) {
+          if (rows.length > 0) {
             const headers = Object.keys(rows[0]);
             outputTable(
               headers,
@@ -40,7 +29,7 @@ export function registerDbCommands(dbCmd: Command): void {
             console.log(`${rows.length} row(s) returned.`);
           } else {
             console.log('Query executed successfully.');
-            if (rows && rows.length === 0) {
+            if (rows.length === 0) {
               console.log('No rows returned.');
             }
           }
diff --git a/src/lib/api/oss.ts b/src/lib/api/oss.ts
index 1e2c7ae..34d2130 100644
--- a/src/lib/api/oss.ts
+++ b/src/lib/api/oss.ts
@@ -14,6 +14,24 @@ function requireProjectConfig(): ProjectConfig {
  * Unified OSS API fetch. Uses API key as Bearer token for all requests,
  * which grants superadmin access (SQL execution, bucket management, etc.).
  */
+export interface RawSqlResult {
+  rows: Record<string, unknown>[];
+  raw: Record<string, unknown>;
+}
+
+export async function runRawSql(sql: string, unrestricted = false): Promise<RawSqlResult> {
+  const endpoint = unrestricted
+    ? '/api/database/advance/rawsql/unrestricted'
+    : '/api/database/advance/rawsql';
+  const res = await ossFetch(endpoint, {
+    method: 'POST',
+    body: JSON.stringify({ query: sql }),
+  });
+  const raw = await res.json() as Record<string, unknown>;
+  const rows = (raw.rows ?? raw.data ?? []) as Record<string, unknown>[];
+  return { rows, raw };
+}
+
 export async function getAnonKey(): Promise<string> {
   const res = await ossFetch('/api/auth/tokens/anon', { method: 'POST' });
   const data = await res.json() as { accessToken: string };
diff --git a/src/lib/env.ts b/src/lib/env.ts
new file mode 100644
index 0000000..7a35bb4
--- /dev/null
+++ b/src/lib/env.ts
@@ -0,0 +1,33 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+
+/**
+ * Read environment variables from the first env file found in the directory.
+ * Priority: .env.local > .env.production > .env
+ */
+export async function readEnvFile(cwd: string): Promise<Array<{ key: string; value: string }>> {
+  const candidates = ['.env.local', '.env.production', '.env'];
+  for (const name of candidates) {
+    const filePath = path.join(cwd, name);
+    const exists = await fs.stat(filePath).catch(() => null);
+    if (!exists) continue;
+
+    const content = await fs.readFile(filePath, 'utf-8');
+    const vars: Array<{ key: string; value: string }> = [];
+    for (const line of content.split('\n')) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith('#')) continue;
+      const eqIndex = trimmed.indexOf('=');
+      if (eqIndex === -1) continue;
+      const key = trimmed.slice(0, eqIndex).trim();
+      let value = trimmed.slice(eqIndex + 1).trim();
+      // Strip surrounding quotes
+      if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+        value = value.slice(1, -1);
+      }
+      if (key) vars.push({ key, value });
+    }
+    return vars;
+  }
+  return [];
+}