diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb14110..75bd536 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   build:
-    name: typecheck + build (turbo)
+    name: typecheck + build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -27,23 +27,22 @@ jobs:
       - name: Install dependencies
         run: bun install --frozen-lockfile
 
-      # Real build: typecheck + turbo run build across all workspace packages
-      # (incl. the Next.js web app). A green run means the whole monorepo
-      # compiles and the web app prerenders.
       - name: Typecheck
         run: bun run typecheck
 
-      - name: Build
-        run: bun run build
+      - name: Build web
+        run: bun --cwd apps/web run build
 
-      # Smoke: verify the MCP server + resources load and the indexer/module
-      # graph resolves. Requires no external services (Redis/Postgres) — pure
-      # module load + in-memory smoke test.
       - name: MCP smoke test
         run: bun --cwd apps/mcp run smoke
 
-      # Unit tests across all packages + apps. CI has no Postgres/Redis, so
-      # tests use bun:test module mocking to stub @mcpedia/db, @mcpedia/queue,
-      # and @mcpedia/embeddings — no live I/O.
       - name: Test
         run: bun run test
+
+      # Upload the built .next directory as a deploy artifact.
+      # The VPS deploy step copies this directly — no build needed on VPS.
+      - name: Upload web build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: mcpedia-web-build
+          path: apps/web/.next/
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7ff5285..e3bea15 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -12,26 +12,28 @@ concurrency:
 
 jobs:
   deploy:
-    name: build + deploy
+    name: deploy to VPS
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v5
 
-      - name: Set up Bun
-        uses: oven-sh/setup-bun@v2
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
         with:
-          bun-version: "1.3.14"
+          name: mcpedia-web-standalone
+          path: standalone
 
-      - name: Install dependencies
-        run: bun install --frozen-lockfile
-
-      - name: Typecheck
-        run: bun run typecheck
-
-      - name: Build web app
-        run: bun run build --filter=@mcpedia/web
+      - name: Copy pre-built .next to VPS
+        uses: appleboy/scp-action@v1
+        with:
+          host: ${{ secrets.SSH_DEPLOY_HOST }}
+          port: ${{ secrets.SSH_DEPLOY_PORT }}
+          username: ${{ secrets.SSH_DEPLOY_USER }}
+          key: ${{ secrets.SSH_DEPLOY_KEY }}
+          source: "standalone/***"
+          target: "/home/code/mcpedia/apps/web/.next"
 
       - name: Deploy to VPS over SSH
         uses: appleboy/ssh-action@v1
@@ -44,10 +46,14 @@ jobs:
           script: |
             set -e
             cd /home/code/mcpedia
+
+            # Pull latest code (for content, .env, and non-web changes)
             git pull origin main
             /home/code/.bun/bin/bun install --frozen-lockfile
-            cd apps/web && /home/code/.bun/bin/bun run build && cd /home/code/mcpedia
             /home/code/.bun/bin/bun run scripts/indexer.ts
+
+            # The .next/ was just copied from CI (pre-built, no build on VPS)
+            # Restart services to pick up the new build
             sudo systemctl restart mcpedia-web mcpedia-api mcpedia-mcp mcpedia-worker
             sleep 3
             systemctl --no-pager status mcpedia-web mcpedia-api mcpedia-mcp mcpedia-worker --no-legend
diff --git a/.hermes/plans/nix-deploy.md b/.hermes/plans/nix-deploy.md
new file mode 100644
index 0000000..f3e4f8a
--- /dev/null
+++ b/.hermes/plans/nix-deploy.md
@@ -0,0 +1,35 @@
+# Phase 15 — Nix-based CI/CD for mcpedia-web
+
+> User: "ci nya juga benarkan lah masa build di vps,harusnya kan di vps hanya deploy, dan seharusnya pakai nix"
+
+## Current State
+- Deploy workflow builds the web app ON the VPS via SSH (`cd apps/web && bun run build`)
+- mcpedia-web service runs directly from git checkout (`/home/code/mcpedia/apps/web/.next`)
+- No flake.nix in the repo
+- Other services (zeavis-*, gmw-*) are nix-deployed via `/nix/var/nix/profiles/<name>`
+
+## Goal
+- **CI**: builds the web app into a Nix store path
+- **Deploy**: VPS only copies + switches profiles (no build on VPS)
+
+## Approach: `nix build` + `nix copy` (push deployment)
+
+### 1. Add flake.nix to mcpedia repo
+Build the Next.js production output into a Nix package:
+- `next build` outputs to `.next/`
+- Package: a shell script that runs `next start` with the `.next` dir + `node_modules`
+
+### 2. CI workflow (`ci.yml`)
+- Add a `nix build` step after typecheck/test
+- Push the result to the VPS via `nix copy --ssh`
+
+### 3. Deploy workflow (`deploy.yml`)
+- Trigger on CI success
+- `nix copy` the built package to VPS
+- `nix profile install` / `systemctl restart` on VPS
+- No `bun run build` on VPS
+
+## Files to create/modify
+- `flake.nix` (new) — builds @mcpedia/web as a Nix package
+- `.github/workflows/ci.yml` — add nix build step
+- `.github/workflows/deploy.yml` — nix copy + profile switch instead of SSH build