diff --git a/.github/scripts/scan.js b/.github/scripts/scan.js
new file mode 100644
index 000000000..7b1924b3f
--- /dev/null
+++ b/.github/scripts/scan.js
@@ -0,0 +1,583 @@
+/**
+ * PolinRider / Famous Chollima Supply-Chain Malware Scanner
+ *
+ * Detects the specific injection pattern used in the PolinRider campaign
+ * attributed to North Korean APT (Void Dokkaebi / Famous Chollima / UNC5342).
+ *
+ * IOCs sourced from:
+ *  - Direct analysis of the injected tailwind.config.js sample
+ *  - Socket Security report (May 2026) on roberts/leads compromise
+ *  - PolinRider technical analysis report (Trend Micro / safedep.io)
+ *
+ * Zero external dependencies — runs on any Node.js >= 14.
+ */
+
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
+
+// ─── Configuration ────────────────────────────────────────────────────────────
+
+const CONFIG = {
+  // Maximum legitimate size for JS config files.
+  // Real tailwind/postcss/babel configs are rarely > 3 KB.
+  // Injected files jump to 5–8 KB instantly.
+  maxLegitConfigBytes: 3072,
+
+  // Minimum whitespace run on a single line that signals hidden payload.
+  // The campaign uses ~280–510 spaces to push payload off-screen.
+  minSuspiciousInlineSpaces: 100,
+
+  // Files that are high-value injection targets for this campaign.
+  targetedFilenames: [
+    "tailwind.config.js",
+    "tailwind.config.ts",
+    "tailwind.config.cjs",
+    "tailwind.js",
+    "postcss.config.js",
+    "postcss.config.mjs",
+    "postcss.config.cjs",
+    "babel.config.js",
+    "babel.config.cjs",
+    "next.config.js",
+    "next.config.mjs",
+    "next.config.cjs",
+    "astro.config.mjs",
+    "astro.config.js",
+    "vite.config.js",
+    "vite.config.ts",
+    "webpack.config.js",
+    "webpack.mix.js",
+  ],
+
+  // Files intentionally containing malware indicators for scanner logic/tests.
+  // These filenames are skipped before malware rules are evaluated.
+  ignoredFilenames: ["scan.js"],
+
+  // Filesystem paths that indicate active persistence mechanisms
+  persistenceArtifacts: [
+    "temp_auto_push.bat",
+    "temp_interactive_push.bat",
+    "branch_structure.json",
+    // Note: queue.bat and .plist are OS-level; checked separately
+  ],
+};
+
+// ─── IOC Definitions ──────────────────────────────────────────────────────────
+
+/**
+ * Each rule has:
+ *   id          – unique rule identifier for reporting
+ *   severity    – CRITICAL | HIGH | MEDIUM
+ *   description – human-readable explanation
+ *   test(content, filePath, lines) – returns array of match details or []
+ */
+const RULES = [
+  // ── Tier 1: Definitive campaign signatures ─────────────────────────────────
+
+  {
+    id: "POLINRIDER-001",
+    severity: "CRITICAL",
+    description:
+      "PolinRider string-shuffler variable _$_1e42 — present in every known sample of this campaign",
+    test(content) {
+      const matches = [];
+      const re = /_\$_1e42/g;
+      let m;
+      while ((m = re.exec(content)) !== null) {
+        matches.push(`offset ${m.index}`);
+      }
+      return matches;
+    },
+  },
+
+  {
+    id: "POLINRIDER-002",
+    severity: "CRITICAL",
+    description:
+      "PolinRider campaign marker global['!'] assignment — used to route C2 traffic",
+    test(content) {
+      const matches = [];
+      const re = /global\s*\[\s*['"]!\s*['"]\s*\]\s*=/g;
+      let m;
+      while ((m = re.exec(content)) !== null) {
+        const snippet = content
+          .slice(m.index, m.index + 40)
+          .replace(/\n/g, "\\n");
+        matches.push(`"${snippet}"`);
+      }
+      return matches;
+    },
+  },
+
+  {
+    id: "POLINRIDER-003",
+    severity: "CRITICAL",
+    description:
+      'PolinRider shuffler seed string "rmcej%otb%" — embedded in the string-decryption bootstrap of the specific variant targeting this repo',
+    test(content) {
+      return content.includes("rmcej%otb%") ? ["seed string found"] : [];
+    },
+  },
+
+  {
+    id: "POLINRIDER-004",
+    severity: "CRITICAL",
+    description:
+      "Known C2 IP addresses associated with PolinRider infrastructure",
+    test(content) {
+      const knownC2 = ["198.105.127.210", "166.88.54.158", "23.27.202.27"];
+      return knownC2.filter((ip) => content.includes(ip));
+    },
+  },
+
+  {
+    id: "POLINRIDER-005",
+    severity: "CRITICAL",
+    description:
+      "Known TRON blockchain wallet addresses used as dead-drop C2 resolvers",
+    test(content) {
+      const wallets = [
+        "TMfKQEd7TJJa5xNZJZ2Lep838vrzrs7mAP",
+        "TXfxHUet9pJVU1BgVkBAbrES4YUc1nGzcG",
+      ];
+      return wallets.filter((w) => content.includes(w));
+    },
+  },
+
+  {
+    id: "POLINRIDER-006",
+    severity: "CRITICAL",
+    description:
+      "Known Aptos blockchain addresses used as fallback dead-drop resolvers",
+    test(content) {
+      const addrs = [
+        "0xbe037400670fbf1c32364f762975908dc43eeb38759263e7dfcdabc76380811e",
+        "0x3f0e5781d0855fb460661ac63257376db1941b2bb522499e4757ecb3ebd5dce3",
+      ];
+      return addrs.filter((a) => content.includes(a));
+    },
+  },
+
+  {
+    id: "POLINRIDER-007",
+    severity: "CRITICAL",
+    description:
+      "Known XOR decryption keys used to decrypt the second-stage payload from BSC transactions",
+    test(content) {
+      const keys = ["2[gWfGj;<:-93Z^C", "m6:tTh^D)cBz?NM]"];
+      return keys.filter((k) => content.includes(k));
+    },
+  },
+
+  {
+    id: "POLINRIDER-008",
+    severity: "CRITICAL",
+    description:
+      "Known SHA-256 hash of compromised tailwind.js file (Socket Security, 2026-05-31)",
+    test(content) {
+      const knownHashes = new Set([
+        "96afdba882046385242cbed46871e41147c8055c5d9eff7460847b2c01a77dc3",
+        "522b28a2f78771715497ba53729d4ab9a50e982322c391379f3bddf7c8cb363f",
+      ]);
+      const hash = crypto.createHash("sha256").update(content).digest("hex");
+      return knownHashes.has(hash) ? [`SHA-256: ${hash}`] : [];
+    },
+  },
+
+  // ── Tier 2: Behavioral / structural indicators ─────────────────────────────
+
+  {
+    id: "POLINRIDER-009",
+    severity: "HIGH",
+    description:
+      "Blockchain RPC infrastructure contact — campaign uses TRON, Aptos, and BSC as dead-drop C2 resolvers",
+    test(content) {
+      const endpoints = [
+        "trongrid.io",
+        "aptoslabs.com",
+        "bsc-dataseed.binance.org",
+        "bsc-rpc.publicnode.com",
+        "eth_getTransactionByHash",
+      ];
+      return endpoints.filter((e) => content.includes(e));
+    },
+  },
+
+  {
+    id: "POLINRIDER-010",
+    severity: "HIGH",
+    description:
+      "Hidden process spawn with windowsHide:true — used by InvisibleFerret / BeaverTail stager to launch detached Node.js child processes invisibly",
+    test(content) {
+      return /windowsHide\s*:\s*true/.test(content)
+        ? ["windowsHide:true found"]
+        : [];
+    },
+  },
+
+  {
+    id: "POLINRIDER-011",
+    severity: "HIGH",
+    description:
+      "Duplicate createRequire injection at file top — campaign restores require() for ES module environments by prepending two identical import statements",
+    test(content) {
+      const matches =
+        content.match(/import\s*\{\s*createRequire\s*\}\s*from/g) || [];
+      return matches.length >= 2
+        ? [`Found ${matches.length} duplicate createRequire imports`]
+        : [];
+    },
+  },
+
+  {
+    id: "POLINRIDER-012",
+    severity: "HIGH",
+    description:
+      "Payload hidden after large horizontal whitespace (>100 spaces on one line) — evasion technique to hide code off-screen in editors and GitHub diff views",
+    test(content, _filePath, lines) {
+      const hits = [];
+      lines.forEach((line, i) => {
+        const spaceRun = line.match(/\s{100,}/);
+        if (spaceRun) {
+          hits.push(`line ${i + 1}: ${spaceRun[0].length} consecutive spaces`);
+        }
+      });
+      return hits;
+    },
+  },
+
+  {
+    id: "POLINRIDER-013",
+    severity: "HIGH",
+    description:
+      "Config file size anomaly — legitimate tailwind/postcss/babel configs are < 3 KB; injected files jump to 5–8 KB",
+    test(content, filePath) {
+      const bytes = Buffer.byteLength(content, "utf8");
+      const base = path.basename(filePath).toLowerCase();
+      const isTargeted = CONFIG.targetedFilenames.some(
+        (f) => f.toLowerCase() === base,
+      );
+      if (isTargeted && bytes > CONFIG.maxLegitConfigBytes) {
+        return [
+          `${bytes} bytes (threshold: ${CONFIG.maxLegitConfigBytes} bytes)`,
+        ];
+      }
+      return [];
+    },
+  },
+
+  {
+    id: "POLINRIDER-014",
+    severity: "HIGH",
+    description:
+      "Persistence artifact detected — files used by temp_auto_push.bat to rewrite git history and propagate infection to all branches",
+    test(_content, filePath) {
+      const base = path.basename(filePath);
+      return CONFIG.persistenceArtifacts.includes(base) ? [base] : [];
+    },
+  },
+
+  // ── Tier 3: Supporting behavioral indicators ───────────────────────────────
+
+  {
+    id: "POLINRIDER-015",
+    severity: "MEDIUM",
+    description:
+      "Campaign marker pattern — numeric string assigned to global['!'], used to select C2 tier (alpha/beta/fallback)",
+    test(content) {
+      const matches = [];
+      // Matches patterns like '8-3317', '9-0264-2', '8-3946-1', 'A4-1928'
+      const re =
+        /global\s*\[\s*['"]!\s*['"]\s*\]\s*=\s*['"]([A-Z]?\d[\d-]+)['"]/g;
+      let m;
+      while ((m = re.exec(content)) !== null) {
+        matches.push(`marker value: "${m[1]}"`);
+      }
+      return matches;
+    },
+  },
+
+  {
+    id: "POLINRIDER-016",
+    severity: "MEDIUM",
+    description:
+      "sfL obfuscation function — secondary string-shuffler present in multi-stage loader variant",
+    test(content) {
+      // sfL appears as a named function used to decode the larger payload blob
+      const occurrences = (content.match(/\bsfL\b/g) || []).length;
+      return occurrences >= 3 ? [`sfL referenced ${occurrences} times`] : [];
+    },
+  },
+
+  {
+    id: "POLINRIDER-017",
+    severity: "MEDIUM",
+    description:
+      "global require/module injection — bootloader dynamically restores Node.js internals to bypass ES module restrictions",
+    test(content) {
+      const hits = [];
+      if (/global\s*\[.*\]\s*=\s*require/.test(content))
+        hits.push("global[x] = require");
+      if (/global\s*\[.*module.*\]\s*=\s*module/.test(content))
+        hits.push("global[x] = module");
+      return hits;
+    },
+  },
+];
+
+// ─── Scanner Engine ────────────────────────────────────────────────────────────
+
+function scanFile(filePath) {
+  if (shouldIgnoreFile(filePath)) {
+    return { filePath, findings: [], skipped: true };
+  }
+
+  let content;
+  try {
+    content = fs.readFileSync(filePath, "utf8");
+  } catch (err) {
+    return { filePath, error: err.message, findings: [] };
+  }
+
+  const lines = content.split("\n");
+  const findings = [];
+
+  for (const rule of RULES) {
+    let matches;
+    try {
+      matches = rule.test(content, filePath, lines);
+    } catch (err) {
+      matches = [`[rule error: ${err.message}]`];
+    }
+
+    if (matches && matches.length > 0) {
+      findings.push({
+        id: rule.id,
+        severity: rule.severity,
+        description: rule.description,
+        matches,
+      });
+    }
+  }
+
+  return { filePath, findings };
+}
+
+function shouldIgnoreFile(filePath) {
+  const base = path.basename(filePath).toLowerCase();
+  return CONFIG.ignoredFilenames.some((f) => f.toLowerCase() === base);
+}
+
+function walkDir(dir, results = []) {
+  let entries;
+  try {
+    entries = fs.readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return results;
+  }
+
+  for (const entry of entries) {
+    if (entry.name === "node_modules" || entry.name === ".git") continue;
+
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      walkDir(full, results);
+    } else if (entry.isFile() && !shouldIgnoreFile(full)) {
+      const ext = path.extname(entry.name).toLowerCase();
+      const base = entry.name.toLowerCase();
+
+      // Scan all JS/TS config files + any file matching a targeted name
+      const isTargetedName = CONFIG.targetedFilenames.some(
+        (f) => f.toLowerCase() === base,
+      );
+      const isPersistenceArtifact = CONFIG.persistenceArtifacts.some(
+        (f) => f.toLowerCase() === base,
+      );
+      const isJsLike = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"].includes(
+        ext,
+      );
+
+      if (isTargetedName || isPersistenceArtifact || isJsLike) {
+        results.push(full);
+      }
+    }
+  }
+
+  return results;
+}
+
+// ─── Reporting ─────────────────────────────────────────────────────────────────
+
+const SEVERITY_RANK = { CRITICAL: 3, HIGH: 2, MEDIUM: 1 };
+const ANSI = {
+  reset: "\x1b[0m",
+  bold: "\x1b[1m",
+  red: "\x1b[31m",
+  yellow: "\x1b[33m",
+  cyan: "\x1b[36m",
+  green: "\x1b[32m",
+  dim: "\x1b[2m",
+};
+
+function colorSeverity(sev) {
+  if (sev === "CRITICAL") return `${ANSI.bold}${ANSI.red}${sev}${ANSI.reset}`;
+  if (sev === "HIGH") return `${ANSI.yellow}${sev}${ANSI.reset}`;
+  return `${ANSI.cyan}${sev}${ANSI.reset}`;
+}
+
+function printReport(allResults, { json = false, outputFile = null } = {}) {
+  const infected = allResults.filter(
+    (r) => r.findings && r.findings.length > 0,
+  );
+  const errors = allResults.filter((r) => r.error);
+
+  if (json) {
+    const report = {
+      scannedAt: new Date().toISOString(),
+      totalFilesScanned: allResults.length,
+      infectedFiles: infected.length,
+      results: infected,
+      errors,
+    };
+    const out = JSON.stringify(report, null, 2);
+    if (outputFile) {
+      fs.writeFileSync(outputFile, out);
+      console.log(`JSON report written to: ${outputFile}`);
+    } else {
+      console.log(out);
+    }
+    return infected.length > 0;
+  }
+
+  // Human-readable output
+  console.log(
+    `\n${ANSI.bold}╔══════════════════════════════════════════════════════════╗`,
+  );
+  console.log(`║   PolinRider / Famous Chollima Malware Scanner            ║`);
+  console.log(
+    `╚══════════════════════════════════════════════════════════╝${ANSI.reset}`,
+  );
+  console.log(
+    `${ANSI.dim}Scanned ${allResults.length} files · ${new Date().toISOString()}${ANSI.reset}\n`,
+  );
+
+  if (infected.length === 0) {
+    console.log(
+      `${ANSI.green}${ANSI.bold}✓ No infections detected.${ANSI.reset}\n`,
+    );
+  } else {
+    console.log(
+      `${ANSI.red}${ANSI.bold}✗ INFECTION DETECTED in ${infected.length} file(s)${ANSI.reset}\n`,
+    );
+
+    for (const result of infected) {
+      // Sort findings by severity descending
+      const sorted = [...result.findings].sort(
+        (a, b) => SEVERITY_RANK[b.severity] - SEVERITY_RANK[a.severity],
+      );
+      const topSev = sorted[0].severity;
+
+      console.log(
+        `  ${colorSeverity(topSev)} ${ANSI.bold}${result.filePath}${ANSI.reset}`,
+      );
+      for (const f of sorted) {
+        console.log(
+          `    ${ANSI.dim}[${f.id}]${ANSI.reset} ${colorSeverity(f.severity)} — ${f.description}`,
+        );
+        for (const m of f.matches) {
+          console.log(`      → ${m}`);
+        }
+      }
+      console.log();
+    }
+
+    console.log(`${ANSI.bold}Remediation steps:${ANSI.reset}`);
+    console.log(
+      `  1. Immediately isolate the affected machine from the network.`,
+    );
+    console.log(
+      `  2. Do NOT run npm install, npm build, or any script on this repo.`,
+    );
+    console.log(
+      `  3. Check for running node.exe / node processes with obfuscated args.`,
+    );
+    console.log(
+      `  4. Remove all code after the legitimate config closing block.`,
+    );
+    console.log(
+      `  5. Remove duplicate 'import { createRequire }' lines at file top.`,
+    );
+    console.log(
+      `  6. Recover the git repository from a clean local clone (see docs).`,
+    );
+    console.log(
+      `  7. Revoke ALL secrets, tokens, and credentials in .env and CI.`,
+    );
+    console.log(
+      `  8. See full remediation guide in the attached incident report.\n`,
+    );
+  }
+
+  if (errors.length > 0) {
+    console.log(`${ANSI.yellow}Scan errors (${errors.length}):${ANSI.reset}`);
+    for (const e of errors) {
+      console.log(`  ${e.filePath}: ${e.error}`);
+    }
+    console.log();
+  }
+
+  return infected.length > 0;
+}
+
+// ─── CLI Entry Point ───────────────────────────────────────────────────────────
+
+function main() {
+  const args = process.argv.slice(2);
+  const jsonFlag = args.includes("--json");
+  const outputFileIdx = args.indexOf("--output");
+  const outputFile = outputFileIdx !== -1 ? args[outputFileIdx + 1] : null;
+
+  // Positional args after flags are scan targets
+  const targets = args.filter(
+    (a) => !a.startsWith("--") && args[args.indexOf(a) - 1] !== "--output",
+  );
+
+  if (targets.length === 0) {
+    console.error(
+      "Usage: scan.js [--json] [--output report.json] <path> [path...]",
+    );
+    console.error(
+      "  path can be a file or directory (directories are walked recursively)",
+    );
+    process.exit(1);
+  }
+
+  const filesToScan = [];
+  for (const target of targets) {
+    if (!fs.existsSync(target)) {
+      console.error(`Path not found: ${target}`);
+      process.exit(1);
+    }
+    const stat = fs.statSync(target);
+    if (stat.isDirectory()) {
+      const found = walkDir(target);
+      filesToScan.push(...found);
+    } else {
+      filesToScan.push(target);
+    }
+  }
+
+  // Deduplicate
+  const unique = [...new Set(filesToScan)];
+  const allResults = unique.map(scanFile);
+
+  const infected = printReport(allResults, { json: jsonFlag, outputFile });
+
+  // Exit code 1 if any infection found — used by CI to block deployments
+  process.exit(infected ? 1 : 0);
+}
+
+main();
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index dbf44509b..e46409ba6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,18 +6,6 @@ on:
       - main
       - dev
       - staging
-    paths:
-      - "apps/edr-freight-api/**"
-      - "apps/edr-freight-web/**"
-      - "apps/edr-passenger-api/**"
-      - "apps/edr-passenger-web/**"
-      - "packages/**"
-      - "infrastructure/docker/Dockerfile.web"
-      - "infrastructure/nginx/**"
-      - "docker-compose.yaml"
-      - "pnpm-lock.yaml"
-      - "scripts/deploy/**"
-      - ".github/workflows/deploy.yml"
   workflow_dispatch:
 
 concurrency:
@@ -50,6 +38,9 @@ jobs:
           - project: edr-passenger
             build_env_file: passenger-web.build.env
             service: passenger-backoffice
+          - project: edr-payment
+            build_env_file: payment-web.build.env
+            service: payment-api
     env:
       PROJECT: ${{ matrix.project }}
       BRANCH: ${{ github.ref_name }}
diff --git a/.github/workflows/polinrider-scan.yml b/.github/workflows/polinrider-scan.yml
new file mode 100644
index 000000000..594f181d1
--- /dev/null
+++ b/.github/workflows/polinrider-scan.yml
@@ -0,0 +1,243 @@
+name: PolinRider Malware Scan
+
+# ── Triggers ──────────────────────────────────────────────────────────────────
+# Runs on every push and every PR targeting main/master/develop.
+# Also available as a manual trigger (workflow_dispatch) and on a nightly
+# schedule so dormant infections in older branches are caught too.
+on:
+  push:
+    branches: ["**"]
+  pull_request:
+    branches: ["**"]
+  schedule:
+    # Nightly full-repo scan at 02:00 UTC
+    - cron: "0 2 * * *"
+  workflow_dispatch:
+
+# ── Permissions ───────────────────────────────────────────────────────────────
+permissions:
+  contents: read # checkout
+  security-events: write # upload SARIF to GitHub Security tab
+  actions: read
+  checks: write # annotate PRs with scan findings
+
+# ── Deployment gate ───────────────────────────────────────────────────────────
+# All other jobs (build, test, deploy) should list this job under `needs:`.
+# If this job fails (exit code 1 from the scanner), the whole workflow stops.
+jobs:
+  polinrider-scan:
+    name: "PolinRider / Famous Chollima Scan"
+    runs-on: ubuntu-latest
+    # Prevent CI from being disabled by any workflow override
+    if: always()
+
+    steps:
+      # ── 1. Checkout full history ─────────────────────────────────────────────
+      # Full depth so we can inspect recent commits for temp_auto_push.bat traces
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # ── 2. Detect suspicious force-push patterns in git history ──────────────
+      - name: Check git history for force-push and timestamp manipulation
+        id: git-check
+        shell: bash
+        run: |
+          echo "=== Checking for suspicious git history patterns ==="
+
+          # Check for .gitignore entries hiding known malware artifacts
+          GITIGNORE_HITS=0
+          if [ -f .gitignore ]; then
+            for pattern in "branch_structure.json" "temp_auto_push.bat" "temp_interactive_push.bat"; do
+              if grep -qF "$pattern" .gitignore 2>/dev/null; then
+                echo "::warning file=.gitignore::SUSPICIOUS: .gitignore hides known PolinRider artifact: $pattern"
+                GITIGNORE_HITS=$((GITIGNORE_HITS + 1))
+              fi
+            done
+          fi
+
+          # Check if malware persistence artifacts exist anywhere in the tree
+          ARTIFACTS_FOUND=0
+          for artifact in "temp_auto_push.bat" "temp_interactive_push.bat" "branch_structure.json"; do
+            FOUND=$(find . -name "$artifact" -not -path "./.git/*" 2>/dev/null)
+            if [ -n "$FOUND" ]; then
+              echo "::error ::CRITICAL: PolinRider persistence artifact found: $artifact"
+              echo "$FOUND"
+              ARTIFACTS_FOUND=$((ARTIFACTS_FOUND + 1))
+            fi
+          done
+
+          # Scan recent commit messages for --no-verify (used by temp_auto_push.bat)
+          NO_VERIFY_COMMITS=$(git log --oneline -50 --format="%H %s" 2>/dev/null | grep -i "no.verify\|force.*push\|amend" || true)
+          if [ -n "$NO_VERIFY_COMMITS" ]; then
+            echo "::warning ::Recent commits with suspicious metadata (--no-verify / force amend patterns):"
+            echo "$NO_VERIFY_COMMITS"
+          fi
+
+          # Check for .woff2 files with unusually large sizes (>50KB is suspicious)
+          find . -name "*.woff2" -not -path "./.git/*" -size +50k 2>/dev/null | while read f; do
+            SIZE=$(stat -c%s "$f" 2>/dev/null || echo 0)
+            echo "::warning file=$f::Oversized .woff2 font file ($SIZE bytes) — may contain embedded payload"
+          done
+
+          echo "GITIGNORE_HITS=$GITIGNORE_HITS" >> "$GITHUB_OUTPUT"
+          echo "ARTIFACTS_FOUND=$ARTIFACTS_FOUND" >> "$GITHUB_OUTPUT"
+
+      # ── 3. Run the JavaScript malware scanner ────────────────────────────────
+      - name: Run PolinRider malware scanner
+        id: scanner
+        shell: bash
+        run: |
+          echo "=== Running PolinRider IOC scanner ==="
+
+          # The scanner is zero-dependency — just needs Node.js (always present on ubuntu-latest)
+          node .github/scripts/scan.js \
+            --json \
+            --output scan-report.json \
+            .
+
+          SCANNER_EXIT=$?
+          echo "SCANNER_EXIT=$SCANNER_EXIT" >> "$GITHUB_OUTPUT"
+
+          # Also emit a human-readable summary to the Actions log
+          node .github/scripts/scan.js . || true
+
+          exit $SCANNER_EXIT
+
+      # ── 4. Upload scan report as artifact ────────────────────────────────────
+      #   - name: Upload scan report
+      #     if: always()
+      #     uses: actions/upload-artifact@v4
+      #     with:
+      #       name: polinrider-scan-report
+      #       path: scan-report.json
+      #       retention-days: 90
+
+      #   # ── 5. Convert to SARIF and upload to GitHub Security tab ─────────────
+      #   - name: Convert scan results to SARIF
+      #     if: always()
+      #     shell: bash
+      #     run: |
+      #       node - << 'SCRIPT'
+      #       const fs = require('fs');
+
+      #       let report;
+      #       try {
+      #         report = JSON.parse(fs.readFileSync('scan-report.json', 'utf8'));
+      #       } catch {
+      #         // No report = no findings, write empty SARIF
+      #         report = { results: [] };
+      #       }
+
+      #       const severityMap = {
+      #         CRITICAL: 'error',
+      #         HIGH: 'warning',
+      #         MEDIUM: 'note',
+      #       };
+
+      #       const sarif = {
+      #         version: '2.1.0',
+      #         $schema: 'https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.5.json',
+      #         runs: [{
+      #           tool: {
+      #             driver: {
+      #               name: 'PolinRider Malware Scanner',
+      #               version: '1.0.0',
+      #               informationUri: 'https://github.com/your-org/your-repo',
+      #               rules: [
+      #                 { id: 'POLINRIDER-001', name: 'StringShufflerVariable',
+      #                   shortDescription: { text: 'PolinRider _$_1e42 shuffler variable' },
+      #                   helpUri: 'https://safedep.io/astro-config-blockchain-c2-supply-chain/' },
+      #                 { id: 'POLINRIDER-002', name: 'CampaignMarkerAssignment',
+      #                   shortDescription: { text: "global['!'] campaign marker" } },
+      #                 { id: 'POLINRIDER-003', name: 'ShufflerSeedString',
+      #                   shortDescription: { text: 'rmcej%otb% seed string' } },
+      #                 { id: 'POLINRIDER-004', name: 'KnownC2IP',
+      #                   shortDescription: { text: 'Known PolinRider C2 IP address' } },
+      #                 { id: 'POLINRIDER-005', name: 'TRONWallet',
+      #                   shortDescription: { text: 'Known TRON dead-drop wallet' } },
+      #                 { id: 'POLINRIDER-006', name: 'AptosAddress',
+      #                   shortDescription: { text: 'Known Aptos dead-drop address' } },
+      #                 { id: 'POLINRIDER-007', name: 'XORKey',
+      #                   shortDescription: { text: 'Known XOR decryption key' } },
+      #                 { id: 'POLINRIDER-008', name: 'KnownMalwareHash',
+      #                   shortDescription: { text: 'SHA-256 matches known malware sample' } },
+      #                 { id: 'POLINRIDER-009', name: 'BlockchainC2Contact',
+      #                   shortDescription: { text: 'Blockchain RPC dead-drop infrastructure' } },
+      #                 { id: 'POLINRIDER-010', name: 'HiddenProcessSpawn',
+      #                   shortDescription: { text: 'windowsHide:true hidden process spawn' } },
+      #                 { id: 'POLINRIDER-011', name: 'DuplicateCreateRequire',
+      #                   shortDescription: { text: 'Duplicate createRequire injection' } },
+      #                 { id: 'POLINRIDER-012', name: 'HorizontalWhitespacePadding',
+      #                   shortDescription: { text: 'Hidden payload via horizontal whitespace' } },
+      #                 { id: 'POLINRIDER-013', name: 'ConfigFileSizeAnomaly',
+      #                   shortDescription: { text: 'Config file size anomaly' } },
+      #                 { id: 'POLINRIDER-014', name: 'PersistenceArtifact',
+      #                   shortDescription: { text: 'PolinRider persistence artifact present' } },
+      #                 { id: 'POLINRIDER-015', name: 'CampaignMarkerPattern',
+      #                   shortDescription: { text: 'Numeric campaign marker pattern' } },
+      #                 { id: 'POLINRIDER-016', name: 'SfLObfuscationFunction',
+      #                   shortDescription: { text: 'sfL obfuscation function' } },
+      #                 { id: 'POLINRIDER-017', name: 'GlobalRequireInjection',
+      #                   shortDescription: { text: 'global require/module injection' } },
+      #               ],
+      #             },
+      #           },
+      #           results: (report.results || []).flatMap(file =>
+      #             (file.findings || []).map(finding => ({
+      #               ruleId: finding.id,
+      #               level: severityMap[finding.severity] || 'warning',
+      #               message: { text: finding.description + ' — ' + finding.matches.join('; ') },
+      #               locations: [{
+      #                 physicalLocation: {
+      #                   artifactLocation: { uri: file.filePath.replace(/^\.\//,''), uriBaseId: '%SRCROOT%' },
+      #                   region: { startLine: 1 },
+      #                 },
+      #               }],
+      #             }))
+      #           ),
+      #         }],
+      #       };
+
+      #       fs.writeFileSync('scan-results.sarif', JSON.stringify(sarif, null, 2));
+      #       console.log('SARIF written.');
+      #       SCRIPT
+
+      #   - name: Upload SARIF to GitHub Security tab
+      #     if: always()
+      #     uses: github/codeql-action/upload-sarif@v3
+      #     with:
+      #       sarif_file: scan-results.sarif
+      #       category: polinrider-malware-scan
+
+      # ── 6. Block deployment if infected ──────────────────────────────────────
+      - name: Enforce clean-scan gate
+        if: steps.scanner.outputs.SCANNER_EXIT == '1' || steps.git-check.outputs.ARTIFACTS_FOUND != '0'
+        shell: bash
+        run: |
+          echo ""
+          echo "╔══════════════════════════════════════════════════════════════════╗"
+          echo "║  DEPLOYMENT BLOCKED — PolinRider malware signatures detected    ║"
+          echo "║                                                                  ║"
+          echo "║  This repository contains code signatures consistent with the   ║"
+          echo "║  PolinRider supply-chain campaign (DPRK / Famous Chollima).     ║"
+          echo "║                                                                  ║"
+          echo "║  DO NOT run npm install, build, or deploy until remediated.     ║"
+          echo "║                                                                  ║"
+          echo "║  See scan-report.json artifact for full details.                ║"
+          echo "╚══════════════════════════════════════════════════════════════════╝"
+          exit 1
+
+  # ── Dependent jobs — add `needs: polinrider-scan` to block on clean scan ─────
+  # Example: your existing build/deploy jobs should look like this:
+  #
+  # build:
+  #   needs: polinrider-scan
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     ...
+  #
+  # deploy:
+  #   needs: [polinrider-scan, build]
+  #   ...
diff --git a/.gitignore b/.gitignore
index 9f6cafc6d..bb9b43556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,6 @@ coverage/
 .idea/
 .vscode/
 .npmrc
-branch_structure.json
-temp_auto_push.bat
-temp_interactive_push.bat
 
 # emacs cache files
 *~
diff --git a/CLAUDE.md b/CLAUDE.md
index c06000dac..d67e6c3d5 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -12,6 +12,7 @@ Monorepo for the Ethio Djibouti Railway (EDR) digital platform. Contains the Fre
 | `edr-freight-web/portal`       | `@edr/freight-portal`       | React frontend for freight customer/portal users   | 5173 |
 | `edr-freight-web/backoffice`   | `@edr/freight-backoffice`   | React frontend for freight backoffice employees    | 5183 |
 | `edr-passenger-api`            | `@edr/passenger-api`        | NestJS API for passenger management                | 3002 |
+| `edr-payment-api`              | `@edr/payment-api`          | NestJS payment microservice (intents, webhooks)    | 3003 |
 | `edr-passenger-web/portal`     | `@edr/passenger-portal`     | React frontend for passenger customer/portal users | 5174 |
 | `edr-passenger-web/backoffice` | `@edr/passenger-backoffice` | React frontend for passenger backoffice employees  | 5184 |
 
@@ -73,6 +74,7 @@ The `@CurrentUser`, `@Roles`, and `@Public` decorators in `@edr/api-common` are
 - `edr-freight-web/portal`: 5173
 - `edr-freight-web/backoffice`: 5183
 - `edr-passenger-api`: 3002
+- `edr-payment-api`: 3003
 - `edr-passenger-web/portal`: 5174
 - `edr-passenger-web/backoffice`: 5184
 
@@ -80,6 +82,7 @@ The `@CurrentUser`, `@Roles`, and `@Public` decorators in `@edr/api-common` are
 
 - `postgres-freight` (port 5433): database `edr_freight` — freight API only.
 - `postgres-passenger` (port 5434): database `edr_passenger` — passenger API only.
+- `edr_payment` schema — lives in the same Postgres database as the domain system (whatever the passenger `DATABASE_URL` points at) but is owned exclusively by `apps/edr-payment-api`. Dedicated DB user, no cross-schema FKs, domain apps have no grants on it (see `docs/payment-service/`).
 - Each app owns its own DB. No cross-database joins; cross-domain data flows through API calls or message queues.
 
 ## Adding a new module to a NestJS app
diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index 00ca421d1..2818dcd97 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -61,15 +61,16 @@ The sync script validates this and fails if missing.
 
 ### Build env files (optional)
 
-Used for build-time variables (example: Vite API URLs), with `export` syntax:
+Used for additional build-time variables (example: Vite API URL for freight web), with `export` syntax:
 
 ```bash
 export FREIGHT_VITE_API_URL=https://freight-api.example.com/api
-export PASSENGER_VITE_API_URL=https://passenger-api.example.com
 ```
 
 These are injected into `GITHUB_ENV` during workflow execution.
 
+> **Passenger web:** `NEXT_PUBLIC_API_URL` does **not** need a separate build env file. Place it directly in the service runtime env file (`passenger-portal.env` / `passenger-backoffice.env`) and the sync script will forward it to the build automatically.
+
 ## Docker Compose Port Mapping
 
 `docker-compose.yaml` uses per-service env variables for host/container port mappings:
@@ -83,6 +84,51 @@ These are injected into `GITHUB_ENV` during workflow execution.
 
 `scripts/deploy/sync-env-from-server.sh` extracts `PORT` from each synced `.env` and exports the corresponding `*_PORT` variable to `GITHUB_ENV`.
 
+## Passenger Web Docker Configuration
+
+The passenger web apps (portal and backoffice) are deployed as **Next.js applications** using a dedicated Dockerfile:
+
+- Dockerfile: `infrastructure/docker/Dockerfile.passenger-web`
+- Apps: `apps/edr-passenger-web/portal` and `apps/edr-passenger-web/backoffice`
+
+### Key differences from freight-web
+
+| Aspect | Freight Web | Passenger Web |
+| --- | --- | --- |
+| Framework | Vite (SPA) | Next.js (SSR/SSG) |
+| Deployment | Static export + nginx | Node.js server |
+| Dockerfile | `Dockerfile.web` | `Dockerfile.passenger-web` |
+| Final port (container) | 80 (nginx) | driven by `PORT` in service `.env` |
+| Build arg | `TURBO_FILTER` | `APP_PACKAGE` + `APP_PATH` + `NEXT_PUBLIC_API_URL` |
+
+### Build arguments
+
+The Dockerfile accepts the following build args:
+
+- `APP_PACKAGE`: Turbo package filter (e.g., `@edr/passenger-portal`)
+- `APP_PATH`: App directory path (e.g., `apps/edr-passenger-web/portal`)
+- `NEXT_PUBLIC_API_URL`: API URL visible to browser — sourced from `NEXT_PUBLIC_API_URL` in the service `.env` file
+
+### Port mapping
+
+Both host and container ports are driven by `PORT` in the service env file. The sync script reads `PORT`, exports `PASSENGER_PORTAL_PORT` / `PASSENGER_BACKOFFICE_PORT` to `GITHUB_ENV`, and `docker-compose.yaml` uses those variables for both sides of the mapping:
+
+```
+${PASSENGER_PORTAL_PORT:-5174}:${PASSENGER_PORTAL_PORT:-5174}
+```
+
+This ensures `docker ps` shows `0.0.0.0:<port>-><port>/tcp` with matching ports.
+
+### Runtime
+
+The final image runs:
+
+```bash
+npx next start
+```
+
+Next.js reads `PORT` from the runtime environment (supplied via `env_file` in docker-compose) to determine which port to listen on.
+
 ## GitHub Actions Deployment Flow
 
 Workflow file: `.github/workflows/deploy.yml`
diff --git a/README.md b/README.md
index 4d7bd604b..125561b9d 100644
--- a/README.md
+++ b/README.md
@@ -438,7 +438,7 @@ The API uses two authentication schemes:
 | **Routes** | `/routes` | JWT/IAM | Reusable route templates with ordered stops |
 | **Schedules** | `/schedules` | JWT/IAM | Trip schedules, fare rules, status updates |
 | **Fleet** | `/fleet` | JWT/IAM | Train services, coaches, seat configurations |
-| **Seat Classes** | `/seat-classes` | Public/JWT/IAM | Seat class management and configuration |
+| **Seat Classes** | `/seat-classes` or `/classes` | Public/JWT/IAM | Seat class management and configuration |
 | **Segment Seats** | `/segments/seats` | Public/JWT | Segment-based seat availability and booking |
 | **Agents** | `/agents` | IAM | Agent booking, shifts, commissions, reconciliation |
 | **Fraud Detection** | `/fraud` | IAM | Fraud alerts, rules management, user blocking |
diff --git a/apps/edr-passenger-api/.env.example b/apps/edr-passenger-api/.env.example
index 241c12d63..1a9c71990 100644
--- a/apps/edr-passenger-api/.env.example
+++ b/apps/edr-passenger-api/.env.example
@@ -1,6 +1,6 @@
 # App
 NODE_ENV=development
-PORT=3002
+PORT=4000
 
 # Database (Prisma)
 DATABASE_URL=postgresql://edr:edr_secret@localhost:5432/edr_passenger?schema=edr_passenger
@@ -65,13 +65,25 @@ CARD_WEBHOOK_SECRET=
 CARD_WEBHOOK_URL=
 CARD_RETURN_URL=
 
-# Waafi (Djibouti Mobile Money)
-WAAFI_BASE_URL=https://api.waafipay.net
+# Waafi (Djibouti Mobile Money — Hosted Payment Page)
+# Sandbox: https://sandbox.waafipay.net  |  Production: https://api.waafipay.net
+WAAFI_BASE_URL=https://sandbox.waafipay.net
 WAAFI_MERCHANT_UID=
-WAAFI_API_USER_ID=
-WAAFI_API_KEY=
+WAAFI_STORE_ID=
+WAAFI_HPP_KEY=
+# HMAC secret returned once by WEBHOOK_REGISTER — verifies inbound webhooks
+WAAFI_WEBHOOK_SECRET=
+WAAFI_PAYMENT_METHOD=MWALLET_ACCOUNT
+# Waafi has no ETB; overrides booking currency (USD/DJF/SLSH)
+WAAFI_CURRENCY=DJF
+WAAFI_HPP_SUCCESS_URL=
+WAAFI_HPP_FAILURE_URL=
+# 1 = POST, 2 = GET, 4 = Result Token
+WAAFI_HPP_RESP_FORMAT=1
+# Registered webhook URL (registration done out-of-band)
 WAAFI_NOTIFY_URL=
-WAAFI_RETURN_URL=
+# DEV ONLY — disable TLS cert verification (sandbox serves a *.waafi.com cert). Never true in prod.
+WAAFI_INSECURE_TLS=false
 
 # Payment Configuration
 PAYMENT_PROVIDERS_ENABLED=TELEBIRR,CBE_BIRR,EBIRR,CARD,WALLET,WAAFI
@@ -104,3 +116,12 @@ FAYDA_CLAIMS_LOCALES=en am
 FAYDA_SESSION_TTL_MINUTES=10
 
 GITHUB_PACKAGE_TOKEN=
+
+# --- Payment event consumer (RabbitMQ) -------------------------------------------------------
+# Consumes payment.succeeded / payment.failed events from the payment microservice. Separate
+# from any RABBITMQ_URL used by the IAM/notification modules so the two connections are
+# independent. Points at the dedicated `payment` vhost on the (shared) broker.
+# Local dev broker (docker): amqp://edr:edr_secret@localhost:5672/payment
+PAYMENT_RABBITMQ_URL=amqp://edr:edr_secret@localhost:5672/payment
+# Max unacknowledged payment events this consumer holds at once.
+PAYMENT_EVENTS_PREFETCH=10
diff --git a/apps/edr-passenger-api/package.json b/apps/edr-passenger-api/package.json
index 07a03fc2c..4ff9ba2c6 100644
--- a/apps/edr-passenger-api/package.json
+++ b/apps/edr-passenger-api/package.json
@@ -12,18 +12,17 @@
     "test:e2e": "jest --config ./test/jest-e2e.json",
     "type-check": "tsc --noEmit",
     "prisma:generate": "prisma generate",
-    "prisma:migrate": "prisma migrate dev",
-    "prisma:seed": "ts-node prisma/seed-complete.ts",
+    "prisma:migrate": "prisma migrate deploy",
+    "prisma:migrate:dev": "prisma migrate dev",
+    "prisma:seed": "ts-node prisma/seed.ts",
     "prisma:seed-full": "ts-node prisma/seed.ts",
     "prisma:backfill": "ts-node prisma/backfill-fields.ts",
     "prisma:verify": "ts-node prisma/verify-backfill.ts"
   },
-  "prisma": {
-    "seed": "ts-node prisma/seed.ts"
-  },
+
   "dependencies": {
-    "@edr/payment-providers": "workspace:*",
     "@edr/types": "workspace:*",
+    "@golevelup/nestjs-rabbitmq": "^5.5.0",
     "@nestjs/axios": "^4.0.1",
     "@nestjs/common": "^11.0.0",
     "@nestjs/config": "^4.0.4",
@@ -70,6 +69,9 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
   },
+  "prisma": {
+    "schema": "prisma/schema.prisma"
+  },
   "jest": {
     "moduleFileExtensions": [
       "js",
diff --git a/apps/edr-passenger-api/prisma/migrations/20260524080651_add_nationality_and_waafi/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260524080651_add_nationality_and_waafi/migration.sql
deleted file mode 100644
index d5b4c9fa2..000000000
--- a/apps/edr-passenger-api/prisma/migrations/20260524080651_add_nationality_and_waafi/migration.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- AlterEnum
-ALTER TYPE "PaymentMethodType" ADD VALUE 'WAAFI';
-
--- AlterTable
-ALTER TABLE "FareRule" ADD COLUMN     "nationality" TEXT;
diff --git a/apps/edr-passenger-api/prisma/migrations/20260524091255_add_guest_booking_support/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260524091255_add_guest_booking_support/migration.sql
deleted file mode 100644
index 1698c0c23..000000000
--- a/apps/edr-passenger-api/prisma/migrations/20260524091255_add_guest_booking_support/migration.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- AlterTable
-ALTER TABLE "Booking" ADD COLUMN     "contactEmail" TEXT,
-ADD COLUMN     "contactPhone" TEXT;
-
--- CreateTable
-CREATE TABLE "SavedPassengerProfile" (
-    "id" TEXT NOT NULL,
-    "userId" TEXT,
-    "deviceId" TEXT,
-    "passengerName" TEXT NOT NULL,
-    "dateOfBirth" TIMESTAMP(3) NOT NULL,
-    "idDocumentType" "IdDocumentType" NOT NULL,
-    "passportNumber" TEXT,
-    "passportCountry" TEXT,
-    "nationality" TEXT,
-    "phone" TEXT,
-    "email" TEXT,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "SavedPassengerProfile_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE INDEX "SavedPassengerProfile_userId_idx" ON "SavedPassengerProfile"("userId");
-
--- CreateIndex
-CREATE INDEX "SavedPassengerProfile_deviceId_idx" ON "SavedPassengerProfile"("deviceId");
diff --git a/apps/edr-passenger-api/prisma/migrations/20260525134854_add_fayda_oidc_verification/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260525134854_add_fayda_oidc_verification/migration.sql
deleted file mode 100644
index da38b0502..000000000
--- a/apps/edr-passenger-api/prisma/migrations/20260525134854_add_fayda_oidc_verification/migration.sql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  Warnings:
-
-  - A unique constraint covering the columns `[faydaSub]` on the table `User` will be added. If there are existing duplicate values, this will fail.
-
-*/
--- AlterTable
-ALTER TABLE "passenger"."BookingSeat" ADD COLUMN     "faydaSub" TEXT,
-ADD COLUMN     "faydaVerifiedAt" TIMESTAMP(3),
-ADD COLUMN     "faydaVerifiedName" TEXT;
-
--- AlterTable
-ALTER TABLE "passenger"."User" ADD COLUMN     "faydaSub" TEXT,
-ADD COLUMN     "faydaVerified" BOOLEAN NOT NULL DEFAULT false,
-ADD COLUMN     "faydaVerifiedAt" TIMESTAMP(3);
-
--- CreateTable
-CREATE TABLE "passenger"."FaydaVerificationSession" (
-    "id" TEXT NOT NULL,
-    "state" TEXT NOT NULL,
-    "codeVerifier" TEXT NOT NULL,
-    "purpose" TEXT NOT NULL DEFAULT 'PURCHASE',
-    "saveToAccount" BOOLEAN NOT NULL DEFAULT false,
-    "status" TEXT NOT NULL DEFAULT 'PENDING',
-    "errorCode" TEXT,
-    "errorDescription" TEXT,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "expiresAt" TIMESTAMP(3) NOT NULL,
-    "completedAt" TIMESTAMP(3),
-    "userId" TEXT,
-    "bookingId" TEXT,
-
-    CONSTRAINT "FaydaVerificationSession_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "FaydaVerificationSession_state_key" ON "passenger"."FaydaVerificationSession"("state");
-
--- CreateIndex
-CREATE INDEX "FaydaVerificationSession_userId_idx" ON "passenger"."FaydaVerificationSession"("userId");
-
--- CreateIndex
-CREATE INDEX "FaydaVerificationSession_bookingId_idx" ON "passenger"."FaydaVerificationSession"("bookingId");
-
--- CreateIndex
-CREATE INDEX "FaydaVerificationSession_state_idx" ON "passenger"."FaydaVerificationSession"("state");
-
--- CreateIndex
-CREATE INDEX "FaydaVerificationSession_expiresAt_idx" ON "passenger"."FaydaVerificationSession"("expiresAt");
-
--- CreateIndex
-CREATE UNIQUE INDEX "User_faydaSub_key" ON "passenger"."User"("faydaSub");
-
--- AddForeignKey
-ALTER TABLE "passenger"."FaydaVerificationSession" ADD CONSTRAINT "FaydaVerificationSession_userId_fkey" FOREIGN KEY ("userId") REFERENCES "passenger"."User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/apps/edr-passenger-api/prisma/migrations/20260525202029_remover_userid_from_paymentmethod/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260525202029_remover_userid_from_paymentmethod/migration.sql
deleted file mode 100644
index 0b22437b5..000000000
--- a/apps/edr-passenger-api/prisma/migrations/20260525202029_remover_userid_from_paymentmethod/migration.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `maskedHint` on the `PaymentMethod` table. All the data in the column will be lost.
-  - You are about to drop the column `userId` on the `PaymentMethod` table. All the data in the column will be lost.
-  - A unique constraint covering the columns `[type]` on the table `PaymentMethod` will be added. If there are existing duplicate values, this will fail.
-  - Added the required column `updatedAt` to the `PaymentMethod` table without a default value. This is not possible if the table is not empty.
-
-*/
--- CreateEnum
-CREATE TYPE "PaymentRegion" AS ENUM ('ETHIOPIA', 'DJIBOUTI', 'INTERNATIONAL', 'GLOBAL');
-
--- DropIndex
-DROP INDEX "PaymentMethod_userId_isDefault_idx";
-
--- AlterTable
-ALTER TABLE "PaymentMethod" DROP COLUMN "maskedHint",
-DROP COLUMN "userId",
-ADD COLUMN     "currency" TEXT NOT NULL DEFAULT 'ETB',
-ADD COLUMN     "enabled" BOOLEAN NOT NULL DEFAULT true,
-ADD COLUMN     "region" "PaymentRegion" NOT NULL DEFAULT 'GLOBAL',
-ADD COLUMN     "sortOrder" INTEGER NOT NULL DEFAULT 0,
-ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL;
-
--- CreateIndex
-CREATE UNIQUE INDEX "PaymentMethod_type_key" ON "PaymentMethod"("type");
diff --git a/apps/edr-passenger-api/prisma/migrations/20260527080312_add_platform_and_authcode/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260527080312_add_platform_and_authcode/migration.sql
deleted file mode 100644
index 64c577ff5..000000000
--- a/apps/edr-passenger-api/prisma/migrations/20260527080312_add_platform_and_authcode/migration.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- AlterTable
-ALTER TABLE "FaydaVerificationSession" ADD COLUMN     "authCode" TEXT,
-ADD COLUMN     "platform" TEXT NOT NULL DEFAULT 'WEB';
diff --git a/apps/edr-passenger-api/prisma/migrations/20260530200034_add_route_relation_to_schedule/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260530200034_add_route_relation_to_schedule/migration.sql
deleted file mode 100644
index ed8665647..000000000
--- a/apps/edr-passenger-api/prisma/migrations/20260530200034_add_route_relation_to_schedule/migration.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- AddForeignKey
-ALTER TABLE "TrainSchedule" ADD CONSTRAINT "TrainSchedule_routeId_fkey" FOREIGN KEY ("routeId") REFERENCES "Route"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/apps/edr-passenger-api/prisma/migrations/20260523064555_initia/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260605195213_init/migration.sql
similarity index 89%
rename from apps/edr-passenger-api/prisma/migrations/20260523064555_initia/migration.sql
rename to apps/edr-passenger-api/prisma/migrations/20260605195213_init/migration.sql
index 2883715d8..0f8484179 100644
--- a/apps/edr-passenger-api/prisma/migrations/20260523064555_initia/migration.sql
+++ b/apps/edr-passenger-api/prisma/migrations/20260605195213_init/migration.sql
@@ -23,7 +23,10 @@ CREATE TYPE "Currency" AS ENUM ('ETB', 'DJF', 'USD');
 CREATE TYPE "BookingStatus" AS ENUM ('DRAFT', 'PENDING_PAYMENT', 'CONFIRMED', 'CANCELLED', 'COMPLETED', 'NO_SHOW', 'REFUNDED');
 
 -- CreateEnum
-CREATE TYPE "PaymentMethodType" AS ENUM ('TELEBIRR', 'CBE_BIRR', 'EBIRR', 'CARD', 'WALLET');
+CREATE TYPE "PaymentRegion" AS ENUM ('ETHIOPIA', 'DJIBOUTI', 'INTERNATIONAL', 'GLOBAL');
+
+-- CreateEnum
+CREATE TYPE "PaymentMethodType" AS ENUM ('TELEBIRR', 'CBE_BIRR', 'EBIRR', 'CARD', 'WALLET', 'WAAFI');
 
 -- CreateEnum
 CREATE TYPE "PaymentIntentStatus" AS ENUM ('REQUIRES_ACTION', 'PROCESSING', 'SUCCEEDED', 'FAILED', 'CANCELLED', 'REFUNDED');
@@ -55,12 +58,25 @@ CREATE TYPE "FoodOrderStatus" AS ENUM ('PENDING', 'PREPARING', 'READY', 'DELIVER
 -- CreateEnum
 CREATE TYPE "DevicePlatform" AS ENUM ('IOS', 'ANDROID', 'WEB');
 
+-- CreateTable
+CREATE TABLE "CoachType" (
+    "id" TEXT NOT NULL,
+    "code" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "type" TEXT NOT NULL DEFAULT 'passenger',
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "CoachType_pkey" PRIMARY KEY ("id")
+);
+
 -- CreateTable
 CREATE TABLE "SeatClass" (
     "id" TEXT NOT NULL,
+    "coachTypeId" TEXT NOT NULL,
     "name" TEXT NOT NULL,
     "description" TEXT,
-    "basePrice" INTEGER NOT NULL,
+    "baseFareMinor" INTEGER NOT NULL,
     "isActive" BOOLEAN NOT NULL DEFAULT true,
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" TIMESTAMP(3) NOT NULL,
@@ -86,6 +102,9 @@ CREATE TABLE "User" (
     "lastLoginAt" TIMESTAMP(3),
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" TIMESTAMP(3) NOT NULL,
+    "faydaVerified" BOOLEAN NOT NULL DEFAULT false,
+    "faydaVerifiedAt" TIMESTAMP(3),
+    "faydaSub" TEXT,
 
     CONSTRAINT "User_pkey" PRIMARY KEY ("id")
 );
@@ -211,16 +230,11 @@ CREATE TABLE "TripLiveStatus" (
 -- CreateTable
 CREATE TABLE "Coach" (
     "id" TEXT NOT NULL,
-    "coachNumber" TEXT NOT NULL,
-    "label" TEXT NOT NULL,
-    "seatClassId" TEXT NOT NULL,
-    "coachType" TEXT,
-    "mode" TEXT NOT NULL DEFAULT 'seat',
-    "seatArrangement" TEXT,
-    "bedArrangement" TEXT,
-    "amenities" JSONB,
-    "totalUnits" INTEGER NOT NULL DEFAULT 0,
-    "isActive" BOOLEAN NOT NULL DEFAULT true,
+    "coachTypeId" TEXT NOT NULL,
+    "number" TEXT NOT NULL,
+    "arrangement" TEXT NOT NULL DEFAULT '2+2',
+    "capacity" INTEGER NOT NULL DEFAULT 0,
+    "status" TEXT NOT NULL DEFAULT 'ACTIVE',
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" TIMESTAMP(3) NOT NULL,
 
@@ -243,10 +257,9 @@ CREATE TABLE "CoachAssignment" (
 CREATE TABLE "Seat" (
     "id" TEXT NOT NULL,
     "coachId" TEXT NOT NULL,
+    "seatNumber" TEXT NOT NULL,
     "row" INTEGER NOT NULL,
     "col" TEXT NOT NULL,
-    "label" TEXT NOT NULL,
-    "seatNumber" TEXT,
     "kind" "SeatKind" NOT NULL DEFAULT 'STANDARD',
     "status" "SeatStatus" NOT NULL DEFAULT 'AVAILABLE',
     "heldUntil" TIMESTAMP(3),
@@ -254,7 +267,6 @@ CREATE TABLE "Seat" (
     "isAisle" BOOLEAN NOT NULL DEFAULT false,
     "bedPosition" TEXT,
     "premiumFeeMinor" INTEGER NOT NULL DEFAULT 0,
-    "eligibility" TEXT,
 
     CONSTRAINT "Seat_pkey" PRIMARY KEY ("id")
 );
@@ -278,6 +290,7 @@ CREATE TABLE "FareRule" (
     "id" TEXT NOT NULL,
     "tripId" TEXT,
     "route" TEXT,
+    "nationality" TEXT,
     "seatClassId" TEXT NOT NULL,
     "baseFareMinor" INTEGER NOT NULL,
     "currency" TEXT NOT NULL DEFAULT 'ETB',
@@ -303,6 +316,8 @@ CREATE TABLE "Booking" (
     "displayCurrency" "Currency",
     "displayTotalMinor" INTEGER,
     "bookingType" TEXT NOT NULL DEFAULT 'ONE_WAY',
+    "contactEmail" TEXT,
+    "contactPhone" TEXT,
     "userAgent" TEXT,
     "source" TEXT NOT NULL DEFAULT 'WEB',
     "promoCode" TEXT,
@@ -327,6 +342,9 @@ CREATE TABLE "BookingSeat" (
     "passportCountry" TEXT,
     "verifaydaVerified" BOOLEAN NOT NULL DEFAULT false,
     "verifaydaData" JSONB,
+    "faydaVerifiedAt" TIMESTAMP(3),
+    "faydaSub" TEXT,
+    "faydaVerifiedName" TEXT,
     "seatLabelSnapshot" TEXT,
     "fareMinor" INTEGER,
     "displayCurrency" "Currency",
@@ -338,13 +356,16 @@ CREATE TABLE "BookingSeat" (
 -- CreateTable
 CREATE TABLE "PaymentMethod" (
     "id" TEXT NOT NULL,
-    "userId" TEXT NOT NULL,
     "type" "PaymentMethodType" NOT NULL,
     "displayName" TEXT NOT NULL,
-    "maskedHint" TEXT,
+    "region" "PaymentRegion" NOT NULL DEFAULT 'GLOBAL',
+    "currency" TEXT NOT NULL DEFAULT 'ETB',
     "providerId" TEXT,
     "isDefault" BOOLEAN NOT NULL DEFAULT false,
+    "enabled" BOOLEAN NOT NULL DEFAULT true,
+    "sortOrder" INTEGER NOT NULL DEFAULT 0,
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
 
     CONSTRAINT "PaymentMethod_pkey" PRIMARY KEY ("id")
 );
@@ -423,6 +444,16 @@ CREATE TABLE "Ticket" (
     CONSTRAINT "Ticket_pkey" PRIMARY KEY ("id")
 );
 
+-- CreateTable
+CREATE TABLE "TicketSeat" (
+    "id" TEXT NOT NULL,
+    "ticketId" TEXT NOT NULL,
+    "seatId" TEXT NOT NULL,
+    "seatIndex" INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT "TicketSeat_pkey" PRIMARY KEY ("id")
+);
+
 -- CreateTable
 CREATE TABLE "LoyaltyAccount" (
     "id" TEXT NOT NULL,
@@ -1016,8 +1047,51 @@ CREATE TABLE "VerifaydaVerification" (
     CONSTRAINT "VerifaydaVerification_pkey" PRIMARY KEY ("id")
 );
 
+-- CreateTable
+CREATE TABLE "SavedPassengerProfile" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT,
+    "deviceId" TEXT,
+    "passengerName" TEXT NOT NULL,
+    "dateOfBirth" TIMESTAMP(3) NOT NULL,
+    "idDocumentType" "IdDocumentType" NOT NULL,
+    "passportNumber" TEXT,
+    "passportCountry" TEXT,
+    "nationality" TEXT,
+    "phone" TEXT,
+    "email" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "SavedPassengerProfile_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "FaydaVerificationSession" (
+    "id" TEXT NOT NULL,
+    "state" TEXT NOT NULL,
+    "codeVerifier" TEXT NOT NULL,
+    "purpose" TEXT NOT NULL DEFAULT 'PURCHASE',
+    "platform" TEXT NOT NULL DEFAULT 'WEB',
+    "saveToAccount" BOOLEAN NOT NULL DEFAULT false,
+    "status" TEXT NOT NULL DEFAULT 'PENDING',
+    "errorCode" TEXT,
+    "errorDescription" TEXT,
+    "authCode" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "expiresAt" TIMESTAMP(3) NOT NULL,
+    "completedAt" TIMESTAMP(3),
+    "userId" TEXT,
+    "bookingId" TEXT,
+
+    CONSTRAINT "FaydaVerificationSession_pkey" PRIMARY KEY ("id")
+);
+
 -- CreateIndex
-CREATE UNIQUE INDEX "SeatClass_name_key" ON "SeatClass"("name");
+CREATE INDEX "SeatClass_coachTypeId_idx" ON "SeatClass"("coachTypeId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "SeatClass_coachTypeId_name_key" ON "SeatClass"("coachTypeId", "name");
 
 -- CreateIndex
 CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
@@ -1025,6 +1099,9 @@ CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
 -- CreateIndex
 CREATE UNIQUE INDEX "User_phone_key" ON "User"("phone");
 
+-- CreateIndex
+CREATE UNIQUE INDEX "User_faydaSub_key" ON "User"("faydaSub");
+
 -- CreateIndex
 CREATE UNIQUE INDEX "Session_token_key" ON "Session"("token");
 
@@ -1053,7 +1130,10 @@ CREATE UNIQUE INDEX "TripStopTime_scheduleId_sequence_key" ON "TripStopTime"("sc
 CREATE UNIQUE INDEX "TripLiveStatus_scheduleId_key" ON "TripLiveStatus"("scheduleId");
 
 -- CreateIndex
-CREATE UNIQUE INDEX "Coach_coachNumber_key" ON "Coach"("coachNumber");
+CREATE UNIQUE INDEX "Coach_number_key" ON "Coach"("number");
+
+-- CreateIndex
+CREATE INDEX "Coach_coachTypeId_idx" ON "Coach"("coachTypeId");
 
 -- CreateIndex
 CREATE INDEX "CoachAssignment_scheduleId_idx" ON "CoachAssignment"("scheduleId");
@@ -1062,11 +1142,14 @@ CREATE INDEX "CoachAssignment_scheduleId_idx" ON "CoachAssignment"("scheduleId")
 CREATE UNIQUE INDEX "CoachAssignment_scheduleId_positionNumber_key" ON "CoachAssignment"("scheduleId", "positionNumber");
 
 -- CreateIndex
-CREATE UNIQUE INDEX "Seat_coachId_row_col_key" ON "Seat"("coachId", "row", "col");
+CREATE INDEX "Seat_coachId_idx" ON "Seat"("coachId");
 
 -- CreateIndex
 CREATE UNIQUE INDEX "Seat_coachId_seatNumber_key" ON "Seat"("coachId", "seatNumber");
 
+-- CreateIndex
+CREATE UNIQUE INDEX "Seat_coachId_row_col_key" ON "Seat"("coachId", "row", "col");
+
 -- CreateIndex
 CREATE INDEX "SeatHold_expiresAt_idx" ON "SeatHold"("expiresAt");
 
@@ -1077,7 +1160,7 @@ CREATE UNIQUE INDEX "Booking_bookingRef_key" ON "Booking"("bookingRef");
 CREATE INDEX "Booking_passengerId_status_idx" ON "Booking"("passengerId", "status");
 
 -- CreateIndex
-CREATE INDEX "PaymentMethod_userId_isDefault_idx" ON "PaymentMethod"("userId", "isDefault");
+CREATE UNIQUE INDEX "PaymentMethod_type_key" ON "PaymentMethod"("type");
 
 -- CreateIndex
 CREATE UNIQUE INDEX "PaymentIntent_bookingId_key" ON "PaymentIntent"("bookingId");
@@ -1100,6 +1183,12 @@ CREATE UNIQUE INDEX "PaymentWebhookEvent_provider_externalEventId_key" ON "Payme
 -- CreateIndex
 CREATE UNIQUE INDEX "Ticket_bookingId_key" ON "Ticket"("bookingId");
 
+-- CreateIndex
+CREATE INDEX "TicketSeat_ticketId_idx" ON "TicketSeat"("ticketId");
+
+-- CreateIndex
+CREATE INDEX "TicketSeat_seatId_idx" ON "TicketSeat"("seatId");
+
 -- CreateIndex
 CREATE UNIQUE INDEX "LoyaltyAccount_passengerId_key" ON "LoyaltyAccount"("passengerId");
 
@@ -1202,6 +1291,30 @@ CREATE INDEX "VerifaydaVerification_nationalId_idx" ON "VerifaydaVerification"("
 -- CreateIndex
 CREATE INDEX "VerifaydaVerification_bookingId_idx" ON "VerifaydaVerification"("bookingId");
 
+-- CreateIndex
+CREATE INDEX "SavedPassengerProfile_userId_idx" ON "SavedPassengerProfile"("userId");
+
+-- CreateIndex
+CREATE INDEX "SavedPassengerProfile_deviceId_idx" ON "SavedPassengerProfile"("deviceId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "FaydaVerificationSession_state_key" ON "FaydaVerificationSession"("state");
+
+-- CreateIndex
+CREATE INDEX "FaydaVerificationSession_userId_idx" ON "FaydaVerificationSession"("userId");
+
+-- CreateIndex
+CREATE INDEX "FaydaVerificationSession_bookingId_idx" ON "FaydaVerificationSession"("bookingId");
+
+-- CreateIndex
+CREATE INDEX "FaydaVerificationSession_state_idx" ON "FaydaVerificationSession"("state");
+
+-- CreateIndex
+CREATE INDEX "FaydaVerificationSession_expiresAt_idx" ON "FaydaVerificationSession"("expiresAt");
+
+-- AddForeignKey
+ALTER TABLE "SeatClass" ADD CONSTRAINT "SeatClass_coachTypeId_fkey" FOREIGN KEY ("coachTypeId") REFERENCES "CoachType"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "Session" ADD CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
@@ -1214,6 +1327,9 @@ ALTER TABLE "TravelerProfile" ADD CONSTRAINT "TravelerProfile_passengerId_fkey"
 -- AddForeignKey
 ALTER TABLE "TrainSchedule" ADD CONSTRAINT "TrainSchedule_trainId_fkey" FOREIGN KEY ("trainId") REFERENCES "Train"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "TrainSchedule" ADD CONSTRAINT "TrainSchedule_routeId_fkey" FOREIGN KEY ("routeId") REFERENCES "Route"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "TrainSchedule" ADD CONSTRAINT "TrainSchedule_originStationId_fkey" FOREIGN KEY ("originStationId") REFERENCES "Station"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
@@ -1230,7 +1346,7 @@ ALTER TABLE "TripStopTime" ADD CONSTRAINT "TripStopTime_stationId_fkey" FOREIGN
 ALTER TABLE "TripLiveStatus" ADD CONSTRAINT "TripLiveStatus_scheduleId_fkey" FOREIGN KEY ("scheduleId") REFERENCES "TrainSchedule"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "Coach" ADD CONSTRAINT "Coach_seatClassId_fkey" FOREIGN KEY ("seatClassId") REFERENCES "SeatClass"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "Coach" ADD CONSTRAINT "Coach_coachTypeId_fkey" FOREIGN KEY ("coachTypeId") REFERENCES "CoachType"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "CoachAssignment" ADD CONSTRAINT "CoachAssignment_scheduleId_fkey" FOREIGN KEY ("scheduleId") REFERENCES "TrainSchedule"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
@@ -1265,6 +1381,12 @@ ALTER TABLE "PaymentRefund" ADD CONSTRAINT "PaymentRefund_paymentIntentId_fkey"
 -- AddForeignKey
 ALTER TABLE "Ticket" ADD CONSTRAINT "Ticket_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "TicketSeat" ADD CONSTRAINT "TicketSeat_ticketId_fkey" FOREIGN KEY ("ticketId") REFERENCES "Ticket"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "TicketSeat" ADD CONSTRAINT "TicketSeat_seatId_fkey" FOREIGN KEY ("seatId") REFERENCES "Seat"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "LoyaltyAccount" ADD CONSTRAINT "LoyaltyAccount_passengerId_fkey" FOREIGN KEY ("passengerId") REFERENCES "Passenger"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
@@ -1363,3 +1485,6 @@ ALTER TABLE "SeatBlock" ADD CONSTRAINT "SeatBlock_seatId_fkey" FOREIGN KEY ("sea
 
 -- AddForeignKey
 ALTER TABLE "FraudAlert" ADD CONSTRAINT "FraudAlert_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "FaydaVerificationSession" ADD CONSTRAINT "FaydaVerificationSession_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/apps/edr-passenger-api/prisma/migrations/20260607140721_add_segment_fare_rule/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260607140721_add_segment_fare_rule/migration.sql
new file mode 100644
index 000000000..525b6572e
--- /dev/null
+++ b/apps/edr-passenger-api/prisma/migrations/20260607140721_add_segment_fare_rule/migration.sql
@@ -0,0 +1,28 @@
+-- CreateTable
+CREATE TABLE "SegmentFareRule" (
+    "id" TEXT NOT NULL,
+    "routeId" TEXT NOT NULL,
+    "originStopSequence" INTEGER NOT NULL,
+    "destinationStopSequence" INTEGER NOT NULL,
+    "seatClassId" TEXT NOT NULL,
+    "baseFareMinor" INTEGER NOT NULL,
+    "nationality" TEXT,
+    "currency" TEXT NOT NULL DEFAULT 'ETB',
+    "validFrom" TIMESTAMP(3) NOT NULL,
+    "validUntil" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "SegmentFareRule_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "SegmentFareRule_routeId_seatClassId_idx" ON "SegmentFareRule"("routeId", "seatClassId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "SegmentFareRule_routeId_originStopSequence_destinationStopS_key" ON "SegmentFareRule"("routeId", "originStopSequence", "destinationStopSequence", "seatClassId", "nationality");
+
+-- AddForeignKey
+ALTER TABLE "SegmentFareRule" ADD CONSTRAINT "SegmentFareRule_routeId_fkey" FOREIGN KEY ("routeId") REFERENCES "Route"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "SegmentFareRule" ADD CONSTRAINT "SegmentFareRule_seatClassId_fkey" FOREIGN KEY ("seatClassId") REFERENCES "SeatClass"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/apps/edr-passenger-api/prisma/migrations/add_guest_booking_support.sql b/apps/edr-passenger-api/prisma/migrations/add_guest_booking_support.sql
deleted file mode 100644
index fc3d83a8d..000000000
--- a/apps/edr-passenger-api/prisma/migrations/add_guest_booking_support.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- Add contact fields to Booking table
-ALTER TABLE "passenger"."Booking" 
-ADD COLUMN "contactEmail" TEXT,
-ADD COLUMN "contactPhone" TEXT;
-
--- Create SavedPassengerProfile table
-CREATE TABLE "passenger"."SavedPassengerProfile" (
-    "id" TEXT NOT NULL,
-    "userId" TEXT,
-    "deviceId" TEXT,
-    "passengerName" TEXT NOT NULL,
-    "dateOfBirth" TIMESTAMP(3) NOT NULL,
-    "idDocumentType" "passenger"."IdDocumentType" NOT NULL,
-    "passportNumber" TEXT,
-    "passportCountry" TEXT,
-    "nationality" TEXT,
-    "phone" TEXT,
-    "email" TEXT,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "SavedPassengerProfile_pkey" PRIMARY KEY ("id")
-);
-
--- Create indexes
-CREATE INDEX "SavedPassengerProfile_userId_idx" ON "passenger"."SavedPassengerProfile"("userId");
-CREATE INDEX "SavedPassengerProfile_deviceId_idx" ON "passenger"."SavedPassengerProfile"("deviceId");
-
--- Add comment
-COMMENT ON TABLE "passenger"."SavedPassengerProfile" IS 'Stores passenger details for quick rebooking (by userId or deviceId)';
diff --git a/apps/edr-passenger-api/prisma/schema.prisma b/apps/edr-passenger-api/prisma/schema.prisma
index cee8dfee2..34fe198d2 100644
--- a/apps/edr-passenger-api/prisma/schema.prisma
+++ b/apps/edr-passenger-api/prisma/schema.prisma
@@ -70,17 +70,34 @@ enum Currency {
   @@schema("passenger")
 }
 
-model SeatClass {
+model CoachType {
   id          String   @id @default(uuid())
-  name        String   @unique
-  description String?
-  basePrice   Int
-  isActive    Boolean  @default(true)
+  code        String
+  name        String
+  type        String   @default("passenger") // 'passenger', 'sleeper', 'dining', 'baggage'
   createdAt   DateTime @default(now())
   updatedAt   DateTime @updatedAt
   coaches     Coach[]
+  seatClasses SeatClass[]
+
+  @@schema("passenger")
+}
+
+model SeatClass {
+  id          String   @id @default(uuid())
+  coachTypeId String
+  name        String
+  description String?
+  baseFareMinor Int
+  isActive    Boolean  @default(true)
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+  coachType   CoachType @relation(fields: [coachTypeId], references: [id])
   fareRules   FareRule[]
   routeFareRules RouteFareRule[]
+  segmentFares SegmentFareRule[]
+  @@unique([coachTypeId, name])
+  @@index([coachTypeId])
 
   @@schema("passenger")
 }
@@ -385,21 +402,17 @@ model TripLiveStatus {
 
 model Coach {
   id              String            @id @default(uuid())
-  coachNumber     String            @unique
-  label           String
-  seatClassId     String
-  coachType       String?
-  mode            String            @default("seat")  // 'seat', 'bed', 'convertible'
-  seatArrangement String?
-  bedArrangement  String?
-  amenities       Json?
-  totalUnits      Int               @default(0)
-  isActive        Boolean           @default(true)
+  coachTypeId     String
+  number          String            @unique
+  arrangement     String            @default("2+2") // e.g., '2+2', '3+2', '2+2+2'
+  capacity        Int               @default(0) // Total seats/beds
+  status          String            @default("ACTIVE") // 'ACTIVE', 'MAINTENANCE', 'INACTIVE'
   createdAt       DateTime          @default(now())
   updatedAt       DateTime          @updatedAt
-  seatClass   SeatClass         @relation(fields: [seatClassId], references: [id])
+  coachType   CoachType         @relation(fields: [coachTypeId], references: [id])
   seats       Seat[]
   assignments CoachAssignment[]
+  @@index([coachTypeId])
 
   @@schema("passenger")
 }
@@ -422,10 +435,9 @@ model CoachAssignment {
 model Seat {
   id              String     @id @default(uuid())
   coachId         String
+  seatNumber      String     // Auto-generated: e.g., '1', '2', '3' (unique per coach)
   row             Int
   col             String
-  label           String
-  seatNumber      String?
   kind            SeatKind   @default(STANDARD)
   status          SeatStatus @default(AVAILABLE)
   heldUntil       DateTime?
@@ -433,12 +445,13 @@ model Seat {
   isAisle         Boolean    @default(false)
   bedPosition     String?    // 'lower', 'middle', 'upper'
   premiumFeeMinor Int        @default(0)
-  eligibility     String?
   coach        Coach         @relation(fields: [coachId], references: [id])
   bookingSeats BookingSeat[]
   blocks       SeatBlock[]
-  @@unique([coachId, row, col])
+  ticketSeats  TicketSeat[]
   @@unique([coachId, seatNumber])
+  @@unique([coachId, row, col])
+  @@index([coachId])
 
   @@schema("passenger")
 }
@@ -627,6 +640,20 @@ model Ticket {
   validatorId String?
   booking Booking @relation(fields: [bookingId], references: [id])
   validationLogs GateValidationLog[]
+  seats TicketSeat[]
+
+  @@schema("passenger")
+}
+
+model TicketSeat {
+  id        String   @id @default(uuid())
+  ticketId  String
+  seatId    String
+  seatIndex Int      @default(0)
+  ticket    Ticket   @relation(fields: [ticketId], references: [id], onDelete: Cascade)
+  seat      Seat     @relation(fields: [seatId], references: [id])
+  @@index([ticketId])
+  @@index([seatId])
 
   @@schema("passenger")
 }
@@ -963,6 +990,7 @@ model Route {
   createdAt   DateTime @default(now())
   stops       RouteStop[]
   fareRules   RouteFareRule[]
+  segmentFares SegmentFareRule[]
   schedules   TrainSchedule[]
 
   @@schema("passenger")
@@ -1002,6 +1030,26 @@ model RouteFareRule {
   @@schema("passenger")
 }
 
+model SegmentFareRule {
+  id              String    @id @default(uuid())
+  routeId         String
+  originStopSequence Int
+  destinationStopSequence Int
+  seatClassId     String
+  baseFareMinor   Int
+  nationality     String?   // Optional: Ethiopian, Djiboutian, Other
+  currency        String    @default("ETB")
+  validFrom       DateTime
+  validUntil      DateTime?
+  createdAt       DateTime  @default(now())
+  route           Route     @relation(fields: [routeId], references: [id], onDelete: Cascade)
+  seatClass       SeatClass @relation(fields: [seatClassId], references: [id])
+  @@unique([routeId, originStopSequence, destinationStopSequence, seatClassId, nationality])
+  @@index([routeId, seatClassId])
+
+  @@schema("passenger")
+}
+
 model Agent {
   id              String   @id @default(uuid())
   userId          String   @unique
diff --git a/apps/edr-passenger-api/prisma/seed-complete.ts b/apps/edr-passenger-api/prisma/seed-complete.ts
deleted file mode 100644
index f9cc064be..000000000
--- a/apps/edr-passenger-api/prisma/seed-complete.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-import { PrismaClient, SeatKind } from '@prisma/client';
-import * as bcrypt from 'bcrypt';
-
-const prisma = new PrismaClient();
-
-async function main() {
-  console.log('🌱 Starting complete seed...\n');
-
-  // 1. STATIONS
-  console.log('📍 Seeding stations...');
-  const stationData = [
-    { code: 'SBT', name: 'Sebeta', city: 'Sebeta', countryCode: 'ET', lat: 8.9167, lng: 38.6167 },
-    { code: 'LBU', name: 'Labu', city: 'Labu', countryCode: 'ET', lat: 8.8500, lng: 38.7000 },
-    { code: 'IND', name: 'Indode', city: 'Indode', countryCode: 'ET', lat: 8.7800, lng: 38.8200 },
-    { code: 'BSH', name: 'Bishoftu', city: 'Bishoftu', countryCode: 'ET', lat: 8.7500, lng: 38.9833 },
-    { code: 'MJO', name: 'Mojo', city: 'Mojo', countryCode: 'ET', lat: 8.6000, lng: 39.1200 },
-    { code: 'ADM', name: 'Adama', city: 'Adama', countryCode: 'ET', lat: 8.5400, lng: 39.2675 },
-    { code: 'DDW', name: 'Diredawa', city: 'Diredawa', countryCode: 'ET', lat: 9.5931, lng: 41.8661 },
-    { code: 'NGD', name: 'Nagad', city: 'Nagad', countryCode: 'DJ', timezone: 'Africa/Djibouti', lat: 11.5720, lng: 43.1456 },
-  ];
-  
-  const stations = [];
-  for (const s of stationData) {
-    stations.push(await prisma.station.upsert({ where: { code: s.code }, update: {}, create: s }));
-  }
-  console.log(`✅ ${stations.length} stations\n`);
-
-  // 2. SEAT CLASSES
-  console.log('💺 Seeding seat classes...');
-  const scEconomy = await prisma.seatClass.upsert({
-    where: { name: 'Economy Regular' },
-    update: {},
-    create: { name: 'Economy Regular', description: 'Standard economy', basePrice: 25000, isActive: true },
-  });
-  const scBed = await prisma.seatClass.upsert({
-    where: { name: 'Economy Bed' },
-    update: {},
-    create: { name: 'Economy Bed', description: 'Economy bed', basePrice: 35000, isActive: true },
-  });
-  console.log(`✅ 2 seat classes\n`);
-
-  // 3. ROUTES
-  console.log('🛤️  Seeding routes...');
-  const route1 = await prisma.route.upsert({
-    where: { code: 'SBT-NGD' },
-    update: {},
-    create: { code: 'SBT-NGD', name: 'Sebeta-Nagad Express', effectiveFrom: new Date('2026-01-01'), active: true },
-  });
-  
-  await prisma.routeStop.createMany({
-    data: [
-      { routeId: route1.id, stationId: stations[0].id, sequence: 1, distanceKm: 0 },
-      { routeId: route1.id, stationId: stations[1].id, sequence: 2, distanceKm: 15 },
-      { routeId: route1.id, stationId: stations[2].id, sequence: 3, distanceKm: 28 },
-      { routeId: route1.id, stationId: stations[3].id, sequence: 4, distanceKm: 45 },
-      { routeId: route1.id, stationId: stations[4].id, sequence: 5, distanceKm: 73 },
-      { routeId: route1.id, stationId: stations[5].id, sequence: 6, distanceKm: 99 },
-      { routeId: route1.id, stationId: stations[6].id, sequence: 7, distanceKm: 378 },
-      { routeId: route1.id, stationId: stations[7].id, sequence: 8, distanceKm: 756 },
-    ],
-    skipDuplicates: true,
-  });
-
-  await prisma.routeFareRule.createMany({
-    data: [
-      { routeId: route1.id, seatClassId: scEconomy.id, passengerCategory: 'ADULT', baseFareMinor: 65000, validFrom: new Date('2026-01-01') },
-      { routeId: route1.id, seatClassId: scEconomy.id, passengerCategory: 'CHILD', baseFareMinor: 65000, validFrom: new Date('2026-01-01') },
-      { routeId: route1.id, seatClassId: scBed.id, passengerCategory: 'ADULT', baseFareMinor: 91000, validFrom: new Date('2026-01-01') },
-      { routeId: route1.id, seatClassId: scBed.id, passengerCategory: 'CHILD', baseFareMinor: 91000, validFrom: new Date('2026-01-01') },
-    ],
-    skipDuplicates: true,
-  });
-  console.log(`✅ 1 route with stops and fares\n`);
-
-  // 4. TRAINS
-  console.log('🚂 Seeding trains...');
-  const train = await prisma.train.upsert({
-    where: { number: '301' },
-    update: {},
-    create: { number: '301', name: 'Express 301', description: 'Main Express' },
-  });
-  console.log(`✅ 1 train\n`);
-
-  // 5. COACHES & SEATS
-  console.log('🚃 Seeding coaches...');
-  const coach1 = await prisma.coach.upsert({
-    where: { coachNumber: 'C-A1' },
-    update: {},
-    create: { coachNumber: 'C-A1', label: 'A', seatClassId: scEconomy.id, mode: 'seat', totalUnits: 20 },
-  });
-
-  const existingSeats = await prisma.seat.count({ where: { coachId: coach1.id } });
-  if (existingSeats === 0) {
-    const seats = [];
-    for (let row = 1; row <= 5; row++) {
-      for (const col of ['A', 'B', 'C', 'D']) {
-        seats.push({
-          coachId: coach1.id,
-          row,
-          col,
-          label: `${row}${col}`,
-          seatNumber: `A${row}${col}`,
-          kind: 'STANDARD' as SeatKind,
-        });
-      }
-    }
-    await prisma.seat.createMany({ data: seats });
-  }
-  console.log(`✅ 1 coach with 20 seats\n`);
-
-  // 6. SCHEDULE
-  console.log('📅 Seeding schedule...');
-  const existingSchedules = await prisma.trainSchedule.findMany({ where: { trainId: train.id }, select: { id: true } });
-  if (existingSchedules.length > 0) {
-    const scheduleIds = existingSchedules.map(s => s.id);
-    const bookingIds = (
-      await prisma.booking.findMany({ where: { scheduleId: { in: scheduleIds } }, select: { id: true } })
-    ).map(b => b.id);
-    // Delete booking children in FK-safe order before deleting the bookings themselves
-    await prisma.foodOrderItem.deleteMany({ where: { order: { bookingId: { in: bookingIds } } } });
-    await prisma.foodOrder.deleteMany({ where: { bookingId: { in: bookingIds } } });
-    await prisma.paymentIntent.deleteMany({ where: { bookingId: { in: bookingIds } } });
-    await prisma.ticket.deleteMany({ where: { bookingId: { in: bookingIds } } });
-    await prisma.agentBooking.deleteMany({ where: { bookingId: { in: bookingIds } } });
-    await prisma.bookingModification.deleteMany({ where: { bookingId: { in: bookingIds } } });
-    await prisma.bookingCancellation.deleteMany({ where: { bookingId: { in: bookingIds } } });
-    await prisma.baggageBooking.deleteMany({ where: { bookingId: { in: bookingIds } } });
-    await prisma.bookingSeat.deleteMany({ where: { bookingId: { in: bookingIds } } });
-    await prisma.booking.deleteMany({ where: { scheduleId: { in: scheduleIds } } });
-    await prisma.fareRule.deleteMany({ where: { tripId: { in: scheduleIds } } });
-    await prisma.tripStopTime.deleteMany({ where: { scheduleId: { in: scheduleIds } } });
-    await prisma.coachAssignment.deleteMany({ where: { scheduleId: { in: scheduleIds } } });
-    await prisma.trainSchedule.deleteMany({ where: { trainId: train.id } });
-  }
-  
-  const schedule = await prisma.trainSchedule.create({
-    data: {
-      trainId: train.id,
-      routeId: route1.id,
-      originStationId: stations[0].id,
-      destinationStationId: stations[7].id,
-      departureAt: new Date('2026-06-15T06:00:00Z'),
-      arrivalAt: new Date('2026-06-15T22:00:00Z'),
-      durationMinutes: 960,
-      stopsCount: 8,
-    },
-  });
-
-  await prisma.coachAssignment.create({
-    data: { scheduleId: schedule.id, coachId: coach1.id, positionNumber: 1 },
-  });
-
-  await prisma.tripStopTime.createMany({
-    data: [
-      { scheduleId: schedule.id, stationId: stations[0].id, sequence: 1, plannedDepartureAt: new Date('2026-06-15T06:00:00Z'), status: 'UPCOMING' },
-      { scheduleId: schedule.id, stationId: stations[1].id, sequence: 2, plannedArrivalAt: new Date('2026-06-15T07:00:00Z'), plannedDepartureAt: new Date('2026-06-15T07:05:00Z'), status: 'UPCOMING' },
-      { scheduleId: schedule.id, stationId: stations[2].id, sequence: 3, plannedArrivalAt: new Date('2026-06-15T08:00:00Z'), plannedDepartureAt: new Date('2026-06-15T08:05:00Z'), status: 'UPCOMING' },
-      { scheduleId: schedule.id, stationId: stations[3].id, sequence: 4, plannedArrivalAt: new Date('2026-06-15T09:00:00Z'), plannedDepartureAt: new Date('2026-06-15T09:10:00Z'), status: 'UPCOMING' },
-      { scheduleId: schedule.id, stationId: stations[4].id, sequence: 5, plannedArrivalAt: new Date('2026-06-15T10:00:00Z'), plannedDepartureAt: new Date('2026-06-15T10:10:00Z'), status: 'UPCOMING' },
-      { scheduleId: schedule.id, stationId: stations[5].id, sequence: 6, plannedArrivalAt: new Date('2026-06-15T11:00:00Z'), plannedDepartureAt: new Date('2026-06-15T11:15:00Z'), status: 'UPCOMING' },
-      { scheduleId: schedule.id, stationId: stations[6].id, sequence: 7, plannedArrivalAt: new Date('2026-06-15T15:00:00Z'), plannedDepartureAt: new Date('2026-06-15T15:20:00Z'), status: 'UPCOMING' },
-      { scheduleId: schedule.id, stationId: stations[7].id, sequence: 8, plannedArrivalAt: new Date('2026-06-15T22:00:00Z'), status: 'UPCOMING' },
-    ],
-  });
-  console.log(`✅ 1 schedule with stops\n`);
-
-  // 7. USERS
-  console.log('👥 Seeding users...');
-  const adminHash = await bcrypt.hash('admin123', 10);
-  const userHash = await bcrypt.hash('password123', 10);
-
-  await prisma.user.upsert({
-    where: { email: 'admin@edr-platform.com' },
-    update: {},
-    create: { fullName: 'Admin', email: 'admin@edr-platform.com', phone: '+251900000000', passwordHash: adminHash, role: 'ADMIN' },
-  });
-
-  const user = await prisma.user.upsert({
-    where: { email: 'abebe@email.com' },
-    update: {},
-    create: { fullName: 'Abebe Kebede', email: 'abebe@email.com', phone: '+251912345678', passwordHash: userHash, nationality: 'Ethiopian' },
-  });
-
-  let passenger = await prisma.passenger.findUnique({ where: { userId: user.id } });
-  if (!passenger) {
-    passenger = await prisma.passenger.create({ data: { userId: user.id } });
-    await prisma.loyaltyAccount.create({ data: { passengerId: passenger.id, pointsBalance: 1000, tier: 'BRONZE' } });
-    await prisma.walletAccount.create({ data: { passengerId: passenger.id, balanceMinor: 100000 } });
-  }
-  console.log(`✅ 2 users\n`);
-
-  // 8. SUPPORTING DATA
-  console.log('📦 Seeding supporting data...');
-  
-  await prisma.paymentMethod.upsert({
-    where: { type: 'TELEBIRR' },
-    update: {},
-    create: { type: 'TELEBIRR', displayName: 'Telebirr', region: 'ETHIOPIA', currency: 'ETB', enabled: true, sortOrder: 1 },
-  });
-
-  await prisma.currencyExchangeRate.deleteMany({});
-  await prisma.currencyExchangeRate.createMany({
-    data: [
-      { fromCurrency: 'ETB', toCurrency: 'ETB', rate: 1.0, effectiveDate: new Date() },
-      { fromCurrency: 'ETB', toCurrency: 'USD', rate: 0.018, effectiveDate: new Date() },
-      { fromCurrency: 'ETB', toCurrency: 'DJF', rate: 3.2, effectiveDate: new Date() },
-    ],
-  });
-  console.log(`✅ Payment methods and currencies\n`);
-
-  console.log('✅ SEED COMPLETE!\n');
-  console.log('📋 Summary:');
-  console.log('  - 8 Stations');
-  console.log('  - 2 Seat Classes');
-  console.log('  - 1 Route with 8 stops');
-  console.log('  - 1 Train with 1 schedule');
-  console.log('  - 1 Coach with 20 seats');
-  console.log('  - 2 Users (Admin + Passenger)');
-  console.log('\n🔑 Credentials:');
-  console.log('  Admin: admin@edr-platform.com / admin123');
-  console.log('  User: abebe@email.com / password123');
-}
-
-main()
-  .catch((e) => {
-    console.error('❌ Error:', e);
-    process.exit(1);
-  })
-  .finally(async () => {
-    await prisma.$disconnect();
-  });
diff --git a/apps/edr-passenger-api/prisma/seed.ts b/apps/edr-passenger-api/prisma/seed.ts
index 8a9707c8e..17283e15b 100644
--- a/apps/edr-passenger-api/prisma/seed.ts
+++ b/apps/edr-passenger-api/prisma/seed.ts
@@ -1,831 +1,614 @@
 import { PrismaClient } from '@prisma/client';
 import * as bcrypt from 'bcrypt';
+import { randomUUID as uuidv4 } from 'crypto';
 
 const prisma = new PrismaClient();
 
-// ============================================================================
-// SECTION 1: STATIONS (18 STATIONS)
-// ============================================================================
-async function seedStations() {
-  console.log('📍 Seeding 18 stations...');
-  
-  const stations = [
-    { code: 'SBT', name: 'Sebeta', city: 'Sebeta', countryCode: 'ET', lat: 8.9167, lng: 38.6167 },
-    { code: 'LBU', name: 'Labu', city: 'Labu', countryCode: 'ET', lat: 8.8500, lng: 38.7000 },
-    { code: 'IND', name: 'Indode', city: 'Indode', countryCode: 'ET', lat: 8.7800, lng: 38.8200 },
-    { code: 'BSH', name: 'Bishoftu', city: 'Bishoftu', countryCode: 'ET', lat: 8.7500, lng: 38.9833 },
-    { code: 'MJO', name: 'Mojo', city: 'Mojo', countryCode: 'ET', lat: 8.6000, lng: 39.1200 },
-    { code: 'ADM', name: 'Adama', city: 'Adama', countryCode: 'ET', lat: 8.5400, lng: 39.2675 },
-    { code: 'FTO', name: 'Feto', city: 'Feto', countryCode: 'ET', lat: 8.4500, lng: 39.4000 },
-    { code: 'MTH', name: 'Metahara', city: 'Metahara', countryCode: 'ET', lat: 8.9000, lng: 39.9167 },
-    { code: 'MSO', name: 'Mieso', city: 'Mieso', countryCode: 'ET', lat: 9.2400, lng: 40.7500 },
-    { code: 'BKE', name: 'Bike', city: 'Bike', countryCode: 'ET', lat: 9.4200, lng: 41.2000 },
-    { code: 'DDW', name: 'Diredawa', city: 'Diredawa', countryCode: 'ET', lat: 9.5931, lng: 41.8661 },
-    { code: 'ARW', name: 'Arawa', city: 'Arawa', countryCode: 'ET', lat: 10.2000, lng: 42.1500 },
-    { code: 'ADG', name: 'Adigala', city: 'Adigala', countryCode: 'ET', lat: 10.8500, lng: 42.4000 },
-    { code: 'AYS', name: 'Aysha', city: 'Aysha', countryCode: 'ET', lat: 11.5500, lng: 42.7167 },
-    { code: 'DWL', name: 'Dawanle', city: 'Dawanle', countryCode: 'DJ', lat: 11.4000, lng: 42.9500 },
-    { code: 'ALI', name: 'Alisabieh', city: 'Alisabieh', countryCode: 'DJ', lat: 11.1667, lng: 42.7167 },
-    { code: 'HOL', name: 'Holhol', city: 'Holhol', countryCode: 'DJ', lat: 11.3500, lng: 43.0500 },
-    { code: 'NGD', name: 'Nagad', city: 'Nagad', countryCode: 'DJ', timezone: 'Africa/Djibouti', lat: 11.5720, lng: 43.1456 },
-  ];
+const EDR_ROUTE_ID = uuidv4();
+const TRAIN_ID = uuidv4();
 
-  const created = [];
-  for (const station of stations) {
-    const s = await prisma.station.upsert({
-      where: { code: station.code },
-      update: {},
-      create: station,
-    });
-    created.push(s);
-  }
-
-  console.log(`  ✅ Created ${created.length} stations`);
-  return created;
-}
-
-// ============================================================================
-// SECTION 2: SEAT CLASSES
-// ============================================================================
-async function seedSeatClasses() {
-  console.log('💺 Seeding seat classes...');
-  
-  const classes = [
-    { name: 'Economy Regular', description: 'Standard economy seating', basePrice: 25000 },
-    { name: 'Economy Bed', description: 'Economy bed lower berth', basePrice: 35000 },
-    { name: 'VIP Bed', description: 'First class VIP bed', basePrice: 55000 },
-  ];
-
-  const created = [];
-  for (const cls of classes) {
-    const c = await prisma.seatClass.upsert({
-      where: { name: cls.name },
-      update: {},
-      create: { ...cls, isActive: true },
-    });
-    created.push(c);
-  }
-
-  console.log(`  ✅ Created ${created.length} seat classes`);
-  return created;
-}
-
-// ============================================================================
-// SECTION 3: TRAINS
-// ============================================================================
-async function seedTrains() {
-  console.log('🚂 Seeding trains...');
-  
-  const trains = [
-    { number: '301', name: 'Express 301', description: 'Sebeta-Nagad Express' },
-    { number: '302', name: 'Express 302', description: 'Nagad-Sebeta Express' },
-    { number: '303', name: 'Local 303', description: 'Regional Service' },
-  ];
-
-  const created = [];
-  for (const train of trains) {
-    const t = await prisma.train.upsert({
-      where: { number: train.number },
-      update: {},
-      create: train,
-    });
-    created.push(t);
-  }
-
-  console.log(`  ✅ Created ${created.length} trains`);
-  return created;
-}
-
-// ============================================================================
-// SECTION 4: COACHES & SEATS
-// ============================================================================
-async function seedCoachesAndSeats(seatClasses: any[]) {
-  console.log('🚃 Seeding coaches and seats...');
-  
-  const [scEconomy, scEconomyBed, scVip] = seatClasses;
-  
-  const coachConfigs = [
-    { coachNumber: 'C-A1', label: 'A', seatClassId: scEconomy.id, mode: 'seat', totalUnits: 60 },
-    { coachNumber: 'C-B1', label: 'B', seatClassId: scEconomyBed.id, mode: 'bed', totalUnits: 40 },
-    { coachNumber: 'C-C1', label: 'C', seatClassId: scVip.id, mode: 'bed', totalUnits: 20 },
-    { coachNumber: 'C-A2', label: 'A', seatClassId: scEconomy.id, mode: 'seat', totalUnits: 60 },
-    { coachNumber: 'C-B2', label: 'B', seatClassId: scEconomyBed.id, mode: 'bed', totalUnits: 40 },
-    { coachNumber: 'C-C2', label: 'C', seatClassId: scVip.id, mode: 'bed', totalUnits: 20 },
-  ];
-
-  const coaches = [];
-  for (const config of coachConfigs) {
-    const coach = await prisma.coach.upsert({
-      where: { coachNumber: config.coachNumber },
-      update: {},
-      create: config,
-    });
-    coaches.push(coach);
-
-    // Create seats for this coach
-    const existingSeats = await prisma.seat.count({ where: { coachId: coach.id } });
-    if (existingSeats === 0) {
-      const seats = [];
-      const rows = Math.ceil(config.totalUnits / 4);
-      for (let row = 1; row <= rows; row++) {
-        for (const col of ['A', 'B', 'C', 'D']) {
-          if (seats.length >= config.totalUnits) break;
-          seats.push({
-            coachId: coach.id,
-            row,
-            col,
-            label: `${row}${col}`,
-            seatNumber: `${config.label}${row}${col}`,
-            kind: row === 1 && col === 'A' ? 'ACCESSIBLE' : 'STANDARD',
-          });
-        }
-      }
-      await prisma.seat.createMany({ data: seats as any });
-    }
-  }
-
-  console.log(`  ✅ Created ${coaches.length} coaches with seats`);
-  return coaches;
-}
-
-// ============================================================================
-// SECTION 5: SCHEDULES (15+ SEGMENTS)
-// ============================================================================
-async function seedSchedules(trains: any[], stations: any[], routes: any[]) {
-  console.log('📅 Seeding schedules with 15+ segments...');
-  
-  const [train301, train302, train303] = trains;
-  const [sebeta, labu, indode, bishoftu, mojo, adama, feto, metahara, mieso, bike, diredawa, arawa, adigala, aysha, dawanle, alisabieh, holhol, nagad] = stations;
-  const [fullRoute, regionalRoute] = routes;
-
-  // Clean up existing schedules
-  const existingScheduleIds = (await prisma.trainSchedule.findMany({
-    where: { trainId: { in: [train301.id, train302.id, train303.id] } },
-    select: { id: true },
-  })).map((s: { id: string }) => s.id);
-
-  if (existingScheduleIds.length > 0) {
-    // Delete in correct order to avoid foreign key constraints
-    await prisma.bookingSeat.deleteMany({ 
-      where: { 
-        booking: { 
-          scheduleId: { in: existingScheduleIds } 
-        } 
-      } 
-    });
-    await prisma.booking.deleteMany({ where: { scheduleId: { in: existingScheduleIds } } });
-    await prisma.fareRule.deleteMany({ where: { tripId: { in: existingScheduleIds } } });
-    await prisma.tripStopTime.deleteMany({ where: { scheduleId: { in: existingScheduleIds } } });
-    await prisma.coachAssignment.deleteMany({ where: { scheduleId: { in: existingScheduleIds } } });
-    await prisma.trainSchedule.deleteMany({ where: { id: { in: existingScheduleIds } } });
-  }
-
-  const schedules = [
-    // Full route: Sebeta to Nagad (18 stations)
-    {
-      trainId: train301.id,
-      routeId: fullRoute.id,
-      originStationId: sebeta.id,
-      destinationStationId: nagad.id,
-      departureAt: new Date('2026-06-15T06:00:00Z'),
-      arrivalAt: new Date('2026-06-15T22:00:00Z'),
-      durationMinutes: 960,
-      stopsCount: 18,
-    },
-    // Return route: Nagad to Sebeta
-    {
-      trainId: train302.id,
-      routeId: fullRoute.id,
-      originStationId: nagad.id,
-      destinationStationId: sebeta.id,
-      departureAt: new Date('2026-06-16T07:00:00Z'),
-      arrivalAt: new Date('2026-06-16T23:30:00Z'),
-      durationMinutes: 990,
-      stopsCount: 18,
-    },
-    // Regional service: Sebeta to Diredawa
-    {
-      trainId: train303.id,
-      routeId: regionalRoute.id,
-      originStationId: sebeta.id,
-      destinationStationId: diredawa.id,
-      departureAt: new Date('2026-06-17T08:00:00Z'),
-      arrivalAt: new Date('2026-06-17T18:00:00Z'),
-      durationMinutes: 600,
-      stopsCount: 11,
-    },
-    // Additional schedules for next day
-    {
-      trainId: train301.id,
-      routeId: fullRoute.id,
-      originStationId: sebeta.id,
-      destinationStationId: nagad.id,
-      departureAt: new Date('2026-06-18T06:30:00Z'),
-      arrivalAt: new Date('2026-06-18T22:45:00Z'),
-      durationMinutes: 975,
-      stopsCount: 18,
-    },
-    {
-      trainId: train302.id,
-      routeId: fullRoute.id,
-      originStationId: nagad.id,
-      destinationStationId: sebeta.id,
-      departureAt: new Date('2026-06-19T07:15:00Z'),
-      arrivalAt: new Date('2026-06-19T23:45:00Z'),
-      durationMinutes: 990,
-      stopsCount: 18,
-    },
-  ];
-
-  const created = [];
-  for (const schedule of schedules) {
-    const s = await prisma.trainSchedule.create({ data: schedule });
-    created.push(s);
-  }
-
-  console.log(`  ✅ Created ${created.length} schedules`);
-  return created;
-}
-
-// ============================================================================
-// SECTION 6: COACH ASSIGNMENTS
-// ============================================================================
-async function seedCoachAssignments(schedules: any[], coaches: any[]) {
-  console.log('🔗 Seeding coach assignments...');
-  
-  const [coachA1, coachB1, coachC1, coachA2, coachB2, coachC2] = coaches;
-  const [schedule1, schedule2, schedule3] = schedules;
-
-  const assignments = [
-    { scheduleId: schedule1.id, coachId: coachA1.id, positionNumber: 1 },
-    { scheduleId: schedule1.id, coachId: coachB1.id, positionNumber: 2 },
-    { scheduleId: schedule1.id, coachId: coachC1.id, positionNumber: 3 },
-    { scheduleId: schedule2.id, coachId: coachA2.id, positionNumber: 1 },
-    { scheduleId: schedule2.id, coachId: coachB2.id, positionNumber: 2 },
-    { scheduleId: schedule2.id, coachId: coachC2.id, positionNumber: 3 },
-    { scheduleId: schedule3.id, coachId: coachA1.id, positionNumber: 1 },
-    { scheduleId: schedule3.id, coachId: coachB1.id, positionNumber: 2 },
-    { scheduleId: schedule3.id, coachId: coachC1.id, positionNumber: 3 },
-  ];
-
-  await prisma.coachAssignment.createMany({ data: assignments, skipDuplicates: true });
-  console.log(`  ✅ Created ${assignments.length} coach assignments`);
-}
-
-// ============================================================================
-// SECTION 7: STOP TIMES (ALL 18 STATIONS)
-// ============================================================================
-async function seedStopTimes(schedules: any[], stations: any[]) {
-  console.log('⏱️  Seeding stop times for all stations...');
-  
-  const [sebeta, labu, indode, bishoftu, mojo, adama, feto, metahara, mieso, bike, diredawa, arawa, adigala, aysha, dawanle, alisabieh, holhol, nagad] = stations;
-  const [schedule1, schedule2, schedule3] = schedules;
-
-  // Full route stop times (Sebeta to Nagad)
-  const fullRouteStops = [
-    { scheduleId: schedule1.id, stationId: sebeta.id, sequence: 1, plannedDepartureAt: new Date('2026-06-15T06:00:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: labu.id, sequence: 2, plannedArrivalAt: new Date('2026-06-15T06:30:00Z'), plannedDepartureAt: new Date('2026-06-15T06:35:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: indode.id, sequence: 3, plannedArrivalAt: new Date('2026-06-15T07:00:00Z'), plannedDepartureAt: new Date('2026-06-15T07:05:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: bishoftu.id, sequence: 4, plannedArrivalAt: new Date('2026-06-15T07:30:00Z'), plannedDepartureAt: new Date('2026-06-15T07:40:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: mojo.id, sequence: 5, plannedArrivalAt: new Date('2026-06-15T08:15:00Z'), plannedDepartureAt: new Date('2026-06-15T08:25:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: adama.id, sequence: 6, plannedArrivalAt: new Date('2026-06-15T09:00:00Z'), plannedDepartureAt: new Date('2026-06-15T09:15:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: feto.id, sequence: 7, plannedArrivalAt: new Date('2026-06-15T09:45:00Z'), plannedDepartureAt: new Date('2026-06-15T09:50:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: metahara.id, sequence: 8, plannedArrivalAt: new Date('2026-06-15T10:30:00Z'), plannedDepartureAt: new Date('2026-06-15T10:45:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: mieso.id, sequence: 9, plannedArrivalAt: new Date('2026-06-15T12:00:00Z'), plannedDepartureAt: new Date('2026-06-15T12:10:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: bike.id, sequence: 10, plannedArrivalAt: new Date('2026-06-15T13:30:00Z'), plannedDepartureAt: new Date('2026-06-15T13:40:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: diredawa.id, sequence: 11, plannedArrivalAt: new Date('2026-06-15T15:00:00Z'), plannedDepartureAt: new Date('2026-06-15T15:20:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: arawa.id, sequence: 12, plannedArrivalAt: new Date('2026-06-15T16:30:00Z'), plannedDepartureAt: new Date('2026-06-15T16:35:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: adigala.id, sequence: 13, plannedArrivalAt: new Date('2026-06-15T17:45:00Z'), plannedDepartureAt: new Date('2026-06-15T17:50:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: aysha.id, sequence: 14, plannedArrivalAt: new Date('2026-06-15T18:30:00Z'), plannedDepartureAt: new Date('2026-06-15T18:40:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: dawanle.id, sequence: 15, plannedArrivalAt: new Date('2026-06-15T19:15:00Z'), plannedDepartureAt: new Date('2026-06-15T19:20:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: alisabieh.id, sequence: 16, plannedArrivalAt: new Date('2026-06-15T20:00:00Z'), plannedDepartureAt: new Date('2026-06-15T20:05:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: holhol.id, sequence: 17, plannedArrivalAt: new Date('2026-06-15T21:00:00Z'), plannedDepartureAt: new Date('2026-06-15T21:05:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule1.id, stationId: nagad.id, sequence: 18, plannedArrivalAt: new Date('2026-06-15T22:00:00Z'), status: 'UPCOMING' as const },
-  ];
-
-  // Regional route stop times (Sebeta to Diredawa)
-  const regionalStops = [
-    { scheduleId: schedule3.id, stationId: sebeta.id, sequence: 1, plannedDepartureAt: new Date('2026-06-17T08:00:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: labu.id, sequence: 2, plannedArrivalAt: new Date('2026-06-17T08:30:00Z'), plannedDepartureAt: new Date('2026-06-17T08:35:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: indode.id, sequence: 3, plannedArrivalAt: new Date('2026-06-17T09:00:00Z'), plannedDepartureAt: new Date('2026-06-17T09:05:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: bishoftu.id, sequence: 4, plannedArrivalAt: new Date('2026-06-17T09:30:00Z'), plannedDepartureAt: new Date('2026-06-17T09:40:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: mojo.id, sequence: 5, plannedArrivalAt: new Date('2026-06-17T10:15:00Z'), plannedDepartureAt: new Date('2026-06-17T10:25:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: adama.id, sequence: 6, plannedArrivalAt: new Date('2026-06-17T11:00:00Z'), plannedDepartureAt: new Date('2026-06-17T11:15:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: feto.id, sequence: 7, plannedArrivalAt: new Date('2026-06-17T11:45:00Z'), plannedDepartureAt: new Date('2026-06-17T11:50:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: metahara.id, sequence: 8, plannedArrivalAt: new Date('2026-06-17T12:30:00Z'), plannedDepartureAt: new Date('2026-06-17T12:45:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: mieso.id, sequence: 9, plannedArrivalAt: new Date('2026-06-17T14:00:00Z'), plannedDepartureAt: new Date('2026-06-17T14:10:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: bike.id, sequence: 10, plannedArrivalAt: new Date('2026-06-17T15:30:00Z'), plannedDepartureAt: new Date('2026-06-17T15:40:00Z'), status: 'UPCOMING' as const },
-    { scheduleId: schedule3.id, stationId: diredawa.id, sequence: 11, plannedArrivalAt: new Date('2026-06-17T18:00:00Z'), status: 'UPCOMING' as const },
-  ];
-
-  const allStops = [...fullRouteStops, ...regionalStops];
-  await prisma.tripStopTime.createMany({ data: allStops });
-  console.log(`  ✅ Created ${allStops.length} stop times`);
-}
-
-// ============================================================================
-// SECTION 8: FARE RULES (COMPREHENSIVE SEGMENTS)
-// ============================================================================
-async function seedFareRules(schedules: any[], seatClasses: any[]) {
-  console.log('💰 Seeding comprehensive fare rules...');
-  
-  const [scEconomy, scEconomyBed, scVip] = seatClasses;
-
-  // Segment-based fare rules (15+ segments)
-  const segmentRules = [
-    // Short segments (1-3 stations)
-    { route: 'SBT-LBU', seatClassId: scEconomy.id, baseFareMinor: 5000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'LBU-IND', seatClassId: scEconomy.id, baseFareMinor: 4500, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'IND-BSH', seatClassId: scEconomy.id, baseFareMinor: 5500, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'BSH-MJO', seatClassId: scEconomy.id, baseFareMinor: 6000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'MJO-ADM', seatClassId: scEconomy.id, baseFareMinor: 7000, validFrom: new Date('2026-01-01'), refundable: true },
-    
-    // Medium segments (3-6 stations)
-    { route: 'SBT-BSH', seatClassId: scEconomy.id, baseFareMinor: 12000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'SBT-ADM', seatClassId: scEconomy.id, baseFareMinor: 18000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'ADM-MTH', seatClassId: scEconomy.id, baseFareMinor: 8500, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'MTH-MSO', seatClassId: scEconomy.id, baseFareMinor: 9500, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'MSO-BKE', seatClassId: scEconomy.id, baseFareMinor: 8000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'BKE-DDW', seatClassId: scEconomy.id, baseFareMinor: 7500, validFrom: new Date('2026-01-01'), refundable: true },
-    
-    // Long segments (6+ stations)
-    { route: 'SBT-DDW', seatClassId: scEconomy.id, baseFareMinor: 35000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'DDW-AYS', seatClassId: scEconomy.id, baseFareMinor: 15000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'AYS-NGD', seatClassId: scEconomy.id, baseFareMinor: 18000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'SBT-NGD', seatClassId: scEconomy.id, baseFareMinor: 65000, validFrom: new Date('2026-01-01'), refundable: true },
-    
-    // Cross-border segments
-    { route: 'DDW-DWL', seatClassId: scEconomy.id, baseFareMinor: 22000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'DWL-ALI', seatClassId: scEconomy.id, baseFareMinor: 12000, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'ALI-HOL', seatClassId: scEconomy.id, baseFareMinor: 8500, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'HOL-NGD', seatClassId: scEconomy.id, baseFareMinor: 6000, validFrom: new Date('2026-01-01'), refundable: true },
-  ];
-
-  // Add Economy Bed prices (40% higher)
-  const bedRules = segmentRules.map(rule => ({
-    ...rule,
-    seatClassId: scEconomyBed.id,
-    baseFareMinor: Math.round(rule.baseFareMinor * 1.4),
-  }));
-
-  // Add VIP prices (80% higher)
-  const vipRules = segmentRules.map(rule => ({
-    ...rule,
-    seatClassId: scVip.id,
-    baseFareMinor: Math.round(rule.baseFareMinor * 1.8),
-  }));
-
-  const allRules = [...segmentRules, ...bedRules, ...vipRules];
-  await prisma.fareRule.createMany({ data: allRules, skipDuplicates: true });
-
-  // Nationality-specific discounts
-  const nationalityRules = [
-    // Ethiopian nationals - 10% discount on domestic routes
-    { route: 'SBT-DDW', nationality: 'Ethiopian', seatClassId: scEconomy.id, baseFareMinor: 31500, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'SBT-ADM', nationality: 'Ethiopian', seatClassId: scEconomy.id, baseFareMinor: 16200, validFrom: new Date('2026-01-01'), refundable: true },
-    
-    // Djiboutian nationals - 5% discount on cross-border routes
-    { route: 'DDW-NGD', nationality: 'Djiboutian', seatClassId: scEconomy.id, baseFareMinor: 42750, validFrom: new Date('2026-01-01'), refundable: true },
-    { route: 'SBT-NGD', nationality: 'Djiboutian', seatClassId: scEconomy.id, baseFareMinor: 61750, validFrom: new Date('2026-01-01'), refundable: true },
-  ];
-  
-  await prisma.fareRule.createMany({ data: nationalityRules, skipDuplicates: true });
-
-  console.log(`  ✅ Created ${allRules.length + nationalityRules.length} fare rules`);
-}
-
-// ============================================================================
-// SECTION 9: USERS & PASSENGERS
-// ============================================================================
-async function seedUsers() {
-  console.log('👥 Seeding users...');
-  
-  const hash = await bcrypt.hash('password123', 10);
+async function seedSystemUsers() {
+  console.log('👥 Seeding system users...');
   const adminHash = await bcrypt.hash('admin123', 10);
+  const passengerHash = await bcrypt.hash('password123', 10);
   const agentHash = await bcrypt.hash('agent123', 10);
+  const supervisorHash = await bcrypt.hash('supervisor123', 10);
+  const staffHash = await bcrypt.hash('staff123', 10);
 
-  // Admin
-  await prisma.user.upsert({
+  const admin = await prisma.user.upsert({
     where: { email: 'admin@edr-platform.com' },
     update: { passwordHash: adminHash, role: 'ADMIN' },
     create: {
-      fullName: 'EDR Admin',
+      fullName: 'System Admin',
       email: 'admin@edr-platform.com',
       phone: '+251900000000',
       passwordHash: adminHash,
       role: 'ADMIN',
     },
   });
+  console.log('  ✅ Admin: admin@edr-platform.com / admin123');
 
-  // Ethiopian Passenger
-  const ethiopianUser = await prisma.user.upsert({
-    where: { email: 'abebe@email.com' },
-    update: {},
+  const passenger = await prisma.user.upsert({
+    where: { email: 'kelemu@email.com' },
+    update: { passwordHash: passengerHash },
     create: {
-      fullName: 'Abebe Kebede',
-      email: 'abebe@email.com',
-      phone: '+251912345678',
-      passwordHash: hash,
+      fullName: 'Kelemu Kebede',
+      email: 'kelemu@email.com',
+      phone: '+251911234567',
+      passwordHash: passengerHash,
+      role: 'PASSENGER',
       nationality: 'Ethiopian',
-      nationalId: 'ET123456789',
+      faydaVerified: true,
     },
   });
 
-  let ethiopianPassenger = await prisma.passenger.findUnique({ where: { userId: ethiopianUser.id } });
-  if (!ethiopianPassenger) {
-    ethiopianPassenger = await prisma.passenger.create({ data: { userId: ethiopianUser.id } });
-    await prisma.loyaltyAccount.create({ data: { passengerId: ethiopianPassenger.id, pointsBalance: 2450, tier: 'SILVER' } });
-    await prisma.walletAccount.create({ data: { passengerId: ethiopianPassenger.id, balanceMinor: 125000 } });
+  let passengerRecord = await prisma.passenger.findUnique({ where: { userId: passenger.id } });
+  if (!passengerRecord) {
+    passengerRecord = await prisma.passenger.create({ data: { userId: passenger.id } });
+    await prisma.loyaltyAccount.create({
+      data: { passengerId: passengerRecord.id, pointsBalance: 1500, lifetimePoints: 3000, tier: 'SILVER' },
+    });
+    await prisma.walletAccount.create({
+      data: { passengerId: passengerRecord.id, balanceMinor: 50000 },
+    });
   }
   await prisma.userPreferences.upsert({
-    where: { userId: ethiopianUser.id },
+    where: { userId: passenger.id },
     update: {},
-    create: { userId: ethiopianUser.id, language: 'en' },
+    create: { userId: passenger.id, language: 'en' },
   });
+  console.log('  ✅ Passenger: kelemu@email.com / password123');
 
-  // Djiboutian Passenger
-  const djiboutianUser = await prisma.user.upsert({
-    where: { email: 'ahmed@email.com' },
-    update: {},
-    create: {
-      fullName: 'Ahmed Hassan',
-      email: 'ahmed@email.com',
-      phone: '+25377123456',
-      passwordHash: hash,
-      nationality: 'Djiboutian',
-      passportNumber: 'DJ1234567',
-    },
-  });
-
-  let djiboutianPassenger = await prisma.passenger.findUnique({ where: { userId: djiboutianUser.id } });
-  if (!djiboutianPassenger) {
-    djiboutianPassenger = await prisma.passenger.create({ data: { userId: djiboutianUser.id } });
-    await prisma.loyaltyAccount.create({ data: { passengerId: djiboutianPassenger.id, pointsBalance: 1200, tier: 'BRONZE' } });
-    await prisma.walletAccount.create({ data: { passengerId: djiboutianPassenger.id, balanceMinor: 85000 } });
-  }
-  await prisma.userPreferences.upsert({
-    where: { userId: djiboutianUser.id },
-    update: {},
-    create: { userId: djiboutianUser.id, language: 'fr' },
-  });
-
-  // Agent
-  const agentUser = await prisma.user.upsert({
+  const agent = await prisma.user.upsert({
     where: { email: 'agent@edr-platform.com' },
     update: { passwordHash: agentHash, role: 'AGENT' },
     create: {
-      fullName: 'Agent Abebe',
+      fullName: 'Booking Agent',
       email: 'agent@edr-platform.com',
       phone: '+251911111111',
       passwordHash: agentHash,
       role: 'AGENT',
     },
   });
-
-  const stations = await prisma.station.findMany();
   await prisma.agent.upsert({
-    where: { userId: agentUser.id },
+    where: { userId: agent.id },
     update: {},
+    create: { userId: agent.id, agentCode: 'AG0001', commissionRate: 5 },
+  });
+  console.log('  ✅ Agent: agent@edr-platform.com / agent123');
+
+  const supervisor = await prisma.user.upsert({
+    where: { email: 'supervisor@edr-platform.com' },
+    update: { passwordHash: supervisorHash, role: 'SUPERVISOR' },
     create: {
-      userId: agentUser.id,
-      agentCode: 'AG001',
-      stationId: stations[0].id,
-      commissionRate: 5,
-      active: true,
+      fullName: 'System Supervisor',
+      email: 'supervisor@edr-platform.com',
+      phone: '+251922222222',
+      passwordHash: supervisorHash,
+      role: 'SUPERVISOR',
     },
   });
+  console.log('  ✅ Supervisor: supervisor@edr-platform.com / supervisor123');
 
-  console.log(`  ✅ Created 4 users (Admin, Ethiopian, Djiboutian, Agent)`);
+  const staff = await prisma.user.upsert({
+    where: { email: 'staff@edr-platform.com' },
+    update: { passwordHash: staffHash, role: 'STAFF' },
+    create: {
+      fullName: 'Support Staff',
+      email: 'staff@edr-platform.com',
+      phone: '+251933333333',
+      passwordHash: staffHash,
+      role: 'STAFF',
+    },
+  });
+  console.log('  ✅ Staff: staff@edr-platform.com / staff123');
 }
 
-// ============================================================================
-// SECTION 10: ROUTES
-// ============================================================================
-async function seedRoutes(stations: any[], seatClasses: any[]) {
-  console.log('🛤️  Seeding routes...');
-  
-  const [sebeta, labu, indode, bishoftu, mojo, adama, feto, metahara, mieso, bike, diredawa, arawa, adigala, aysha, dawanle, alisabieh, holhol, nagad] = stations;
-  const [scEconomy, scEconomyBed, scVip] = seatClasses;
-
-  // Route 1: Full Line (Sebeta to Nagad)
-  const fullRoute = await prisma.route.upsert({
-    where: { code: 'SBT-NGD-FULL' },
-    update: {},
-    create: {
-      code: 'SBT-NGD-FULL',
-      name: 'Sebeta - Nagad Express',
-      description: 'Complete Ethio-Djibouti Railway route from Sebeta to Nagad',
-      effectiveFrom: new Date('2026-01-01'),
-      active: true,
-    },
-  });
-
-  // Create stops for full route
-  const fullRouteStops = [
-    { routeId: fullRoute.id, stationId: sebeta.id, sequence: 1, distanceKm: 0 },
-    { routeId: fullRoute.id, stationId: labu.id, sequence: 2, distanceKm: 15 },
-    { routeId: fullRoute.id, stationId: indode.id, sequence: 3, distanceKm: 28 },
-    { routeId: fullRoute.id, stationId: bishoftu.id, sequence: 4, distanceKm: 45 },
-    { routeId: fullRoute.id, stationId: mojo.id, sequence: 5, distanceKm: 73 },
-    { routeId: fullRoute.id, stationId: adama.id, sequence: 6, distanceKm: 99 },
-    { routeId: fullRoute.id, stationId: feto.id, sequence: 7, distanceKm: 125 },
-    { routeId: fullRoute.id, stationId: metahara.id, sequence: 8, distanceKm: 168 },
-    { routeId: fullRoute.id, stationId: mieso.id, sequence: 9, distanceKm: 245 },
-    { routeId: fullRoute.id, stationId: bike.id, sequence: 10, distanceKm: 312 },
-    { routeId: fullRoute.id, stationId: diredawa.id, sequence: 11, distanceKm: 378 },
-    { routeId: fullRoute.id, stationId: arawa.id, sequence: 12, distanceKm: 445 },
-    { routeId: fullRoute.id, stationId: adigala.id, sequence: 13, distanceKm: 512 },
-    { routeId: fullRoute.id, stationId: aysha.id, sequence: 14, distanceKm: 578 },
-    { routeId: fullRoute.id, stationId: dawanle.id, sequence: 15, distanceKm: 625 },
-    { routeId: fullRoute.id, stationId: alisabieh.id, sequence: 16, distanceKm: 672 },
-    { routeId: fullRoute.id, stationId: holhol.id, sequence: 17, distanceKm: 718 },
-    { routeId: fullRoute.id, stationId: nagad.id, sequence: 18, distanceKm: 756 },
+async function seedStations() {
+  console.log('\n📍 Seeding 15 stations (Ethio-Djibouti Railway)...');
+  const stations = [
+    { code: 'SBT', name: 'Sebeta', city: 'Sebeta', countryCode: 'ET', lat: 8.9520, lng: 38.6150 },
+    { code: 'LEB', name: 'Lebu', city: 'Lebu', countryCode: 'ET', lat: 8.8890, lng: 38.5320 },
+    { code: 'BSH', name: 'Bishoftu', city: 'Bishoftu', countryCode: 'ET', lat: 8.7650, lng: 39.0240 },
+    { code: 'MOJ', name: 'Mojo', city: 'Mojo', countryCode: 'ET', lat: 8.6780, lng: 39.2130 },
+    { code: 'ADM', name: 'Adama', city: 'Adama', countryCode: 'ET', lat: 8.5420, lng: 39.2780 },
+    { code: 'MTE', name: 'Metehara', city: 'Metehara', countryCode: 'ET', lat: 8.7890, lng: 39.8920 },
+    { code: 'MIS', name: 'Mieso', city: 'Mieso', countryCode: 'ET', lat: 8.9120, lng: 40.3450 },
+    { code: 'BIK', name: 'Bike', city: 'Bike', countryCode: 'ET', lat: 9.1230, lng: 40.8670 },
+    { code: 'DRE', name: 'Dire Dawa', city: 'Dire Dawa', countryCode: 'ET', lat: 9.5915, lng: 41.8578 },
+    { code: 'ADG', name: 'Adigala', city: 'Adigala', countryCode: 'ET', lat: 9.7340, lng: 42.2150 },
+    { code: 'AYS', name: 'Aysha', city: 'Aysha', countryCode: 'ET', lat: 10.0120, lng: 42.5670 },
+    { code: 'DAW', name: 'Dawanle', city: 'Dawanle', countryCode: 'ET', lat: 10.2340, lng: 42.8340 },
+    { code: 'ALS', name: 'Alisabieh', city: 'Alisabieh', countryCode: 'DJ', lat: 10.8950, lng: 42.9560 },
+    { code: 'HOL', name: 'Holhol', city: 'Holhol', countryCode: 'DJ', lat: 11.1230, lng: 43.0450 },
+    { code: 'NAG', name: 'Nagad', city: 'Nagad', countryCode: 'DJ', lat: 11.3780, lng: 43.1200 },
   ];
-  await prisma.routeStop.createMany({ data: fullRouteStops, skipDuplicates: true });
 
-  // Fare rules for full route
-  const fullRouteFares = [
-    { routeId: fullRoute.id, seatClassId: scEconomy.id, passengerCategory: 'ADULT' as const, baseFareMinor: 65000, validFrom: new Date('2026-01-01') },
-    { routeId: fullRoute.id, seatClassId: scEconomy.id, passengerCategory: 'CHILD' as const, baseFareMinor: 65000, validFrom: new Date('2026-01-01') },
-    { routeId: fullRoute.id, seatClassId: scEconomyBed.id, passengerCategory: 'ADULT' as const, baseFareMinor: 91000, validFrom: new Date('2026-01-01') },
-    { routeId: fullRoute.id, seatClassId: scEconomyBed.id, passengerCategory: 'CHILD' as const, baseFareMinor: 91000, validFrom: new Date('2026-01-01') },
-    { routeId: fullRoute.id, seatClassId: scVip.id, passengerCategory: 'ADULT' as const, baseFareMinor: 117000, validFrom: new Date('2026-01-01') },
-    { routeId: fullRoute.id, seatClassId: scVip.id, passengerCategory: 'CHILD' as const, baseFareMinor: 117000, validFrom: new Date('2026-01-01') },
-  ];
-  await prisma.routeFareRule.createMany({ data: fullRouteFares, skipDuplicates: true });
-
-  // Route 2: Regional (Sebeta to Diredawa)
-  const regionalRoute = await prisma.route.upsert({
-    where: { code: 'SBT-DDW-REG' },
-    update: {},
-    create: {
-      code: 'SBT-DDW-REG',
-      name: 'Sebeta - Diredawa Regional',
-      description: 'Regional service from Sebeta to Diredawa',
-      effectiveFrom: new Date('2026-01-01'),
-      active: true,
-    },
-  });
-
-  const regionalStops = [
-    { routeId: regionalRoute.id, stationId: sebeta.id, sequence: 1, distanceKm: 0 },
-    { routeId: regionalRoute.id, stationId: labu.id, sequence: 2, distanceKm: 15 },
-    { routeId: regionalRoute.id, stationId: indode.id, sequence: 3, distanceKm: 28 },
-    { routeId: regionalRoute.id, stationId: bishoftu.id, sequence: 4, distanceKm: 45 },
-    { routeId: regionalRoute.id, stationId: mojo.id, sequence: 5, distanceKm: 73 },
-    { routeId: regionalRoute.id, stationId: adama.id, sequence: 6, distanceKm: 99 },
-    { routeId: regionalRoute.id, stationId: feto.id, sequence: 7, distanceKm: 125 },
-    { routeId: regionalRoute.id, stationId: metahara.id, sequence: 8, distanceKm: 168 },
-    { routeId: regionalRoute.id, stationId: mieso.id, sequence: 9, distanceKm: 245 },
-    { routeId: regionalRoute.id, stationId: bike.id, sequence: 10, distanceKm: 312 },
-    { routeId: regionalRoute.id, stationId: diredawa.id, sequence: 11, distanceKm: 378 },
-  ];
-  await prisma.routeStop.createMany({ data: regionalStops, skipDuplicates: true });
-
-  const regionalFares = [
-    { routeId: regionalRoute.id, seatClassId: scEconomy.id, passengerCategory: 'ADULT' as const, baseFareMinor: 35000, validFrom: new Date('2026-01-01') },
-    { routeId: regionalRoute.id, seatClassId: scEconomy.id, passengerCategory: 'CHILD' as const, baseFareMinor: 35000, validFrom: new Date('2026-01-01') },
-    { routeId: regionalRoute.id, seatClassId: scEconomyBed.id, passengerCategory: 'ADULT' as const, baseFareMinor: 49000, validFrom: new Date('2026-01-01') },
-    { routeId: regionalRoute.id, seatClassId: scEconomyBed.id, passengerCategory: 'CHILD' as const, baseFareMinor: 49000, validFrom: new Date('2026-01-01') },
-    { routeId: regionalRoute.id, seatClassId: scVip.id, passengerCategory: 'ADULT' as const, baseFareMinor: 63000, validFrom: new Date('2026-01-01') },
-    { routeId: regionalRoute.id, seatClassId: scVip.id, passengerCategory: 'CHILD' as const, baseFareMinor: 63000, validFrom: new Date('2026-01-01') },
-  ];
-  await prisma.routeFareRule.createMany({ data: regionalFares, skipDuplicates: true });
-
-  // Route 3: Short Distance (Sebeta to Adama)
-  const shortRoute = await prisma.route.upsert({
-    where: { code: 'SBT-ADM-SHORT' },
-    update: {},
-    create: {
-      code: 'SBT-ADM-SHORT',
-      name: 'Sebeta - Adama Commuter',
-      description: 'Short distance commuter service',
-      effectiveFrom: new Date('2026-01-01'),
-      active: true,
-    },
-  });
-
-  const shortStops = [
-    { routeId: shortRoute.id, stationId: sebeta.id, sequence: 1, distanceKm: 0 },
-    { routeId: shortRoute.id, stationId: labu.id, sequence: 2, distanceKm: 15 },
-    { routeId: shortRoute.id, stationId: indode.id, sequence: 3, distanceKm: 28 },
-    { routeId: shortRoute.id, stationId: bishoftu.id, sequence: 4, distanceKm: 45 },
-    { routeId: shortRoute.id, stationId: mojo.id, sequence: 5, distanceKm: 73 },
-    { routeId: shortRoute.id, stationId: adama.id, sequence: 6, distanceKm: 99 },
-  ];
-  await prisma.routeStop.createMany({ data: shortStops, skipDuplicates: true });
-
-  const shortFares = [
-    { routeId: shortRoute.id, seatClassId: scEconomy.id, passengerCategory: 'ADULT' as const, baseFareMinor: 18000, validFrom: new Date('2026-01-01') },
-    { routeId: shortRoute.id, seatClassId: scEconomy.id, passengerCategory: 'CHILD' as const, baseFareMinor: 18000, validFrom: new Date('2026-01-01') },
-    { routeId: shortRoute.id, seatClassId: scEconomyBed.id, passengerCategory: 'ADULT' as const, baseFareMinor: 25200, validFrom: new Date('2026-01-01') },
-    { routeId: shortRoute.id, seatClassId: scEconomyBed.id, passengerCategory: 'CHILD' as const, baseFareMinor: 25200, validFrom: new Date('2026-01-01') },
-    { routeId: shortRoute.id, seatClassId: scVip.id, passengerCategory: 'ADULT' as const, baseFareMinor: 32400, validFrom: new Date('2026-01-01') },
-    { routeId: shortRoute.id, seatClassId: scVip.id, passengerCategory: 'CHILD' as const, baseFareMinor: 32400, validFrom: new Date('2026-01-01') },
-  ];
-  await prisma.routeFareRule.createMany({ data: shortFares, skipDuplicates: true });
-
-  // Route 4: Cross-Border (Diredawa to Nagad)
-  const crossBorderRoute = await prisma.route.upsert({
-    where: { code: 'DDW-NGD-INTL' },
-    update: {},
-    create: {
-      code: 'DDW-NGD-INTL',
-      name: 'Diredawa - Nagad International',
-      description: 'Cross-border service from Ethiopia to Djibouti',
-      effectiveFrom: new Date('2026-01-01'),
-      active: true,
-    },
-  });
-
-  const crossBorderStops = [
-    { routeId: crossBorderRoute.id, stationId: diredawa.id, sequence: 1, distanceKm: 0 },
-    { routeId: crossBorderRoute.id, stationId: arawa.id, sequence: 2, distanceKm: 67 },
-    { routeId: crossBorderRoute.id, stationId: adigala.id, sequence: 3, distanceKm: 134 },
-    { routeId: crossBorderRoute.id, stationId: aysha.id, sequence: 4, distanceKm: 200 },
-    { routeId: crossBorderRoute.id, stationId: dawanle.id, sequence: 5, distanceKm: 247 },
-    { routeId: crossBorderRoute.id, stationId: alisabieh.id, sequence: 6, distanceKm: 294 },
-    { routeId: crossBorderRoute.id, stationId: holhol.id, sequence: 7, distanceKm: 340 },
-    { routeId: crossBorderRoute.id, stationId: nagad.id, sequence: 8, distanceKm: 378 },
-  ];
-  await prisma.routeStop.createMany({ data: crossBorderStops, skipDuplicates: true });
-
-  const crossBorderFares = [
-    { routeId: crossBorderRoute.id, seatClassId: scEconomy.id, passengerCategory: 'ADULT' as const, baseFareMinor: 45000, validFrom: new Date('2026-01-01') },
-    { routeId: crossBorderRoute.id, seatClassId: scEconomy.id, passengerCategory: 'CHILD' as const, baseFareMinor: 45000, validFrom: new Date('2026-01-01') },
-    { routeId: crossBorderRoute.id, seatClassId: scEconomyBed.id, passengerCategory: 'ADULT' as const, baseFareMinor: 63000, validFrom: new Date('2026-01-01') },
-    { routeId: crossBorderRoute.id, seatClassId: scEconomyBed.id, passengerCategory: 'CHILD' as const, baseFareMinor: 63000, validFrom: new Date('2026-01-01') },
-    { routeId: crossBorderRoute.id, seatClassId: scVip.id, passengerCategory: 'ADULT' as const, baseFareMinor: 81000, validFrom: new Date('2026-01-01') },
-    { routeId: crossBorderRoute.id, seatClassId: scVip.id, passengerCategory: 'CHILD' as const, baseFareMinor: 81000, validFrom: new Date('2026-01-01') },
-  ];
-  await prisma.routeFareRule.createMany({ data: crossBorderFares, skipDuplicates: true });
-
-  console.log(`  ✅ Created 4 routes with stops and fare rules`);
-  return [fullRoute, regionalRoute, shortRoute, crossBorderRoute];
+  for (const station of stations) {
+    await prisma.station.upsert({
+      where: { code: station.code },
+      update: {},
+      create: {
+        id: uuidv4(),
+        ...station,
+      },
+    });
+  }
+  console.log(`  ✅ ${stations.length} stations created`);
+  return stations;
 }
 
-// ============================================================================
-// SECTION 11: SUPPORTING DATA
-// ============================================================================
-async function seedSupportingData(seatClasses: any[]) {
-  console.log('📦 Seeding supporting data...');
-  
-  // Baggage Allowance
-  await prisma.baggageAllowance.deleteMany({});
-  await prisma.baggageAllowance.createMany({
-    data: [
-      { seatClassId: seatClasses[0].id, maxWeightKg: 20, maxPiecesCount: 2, excessFeePerKg: 500 },
-      { seatClassId: seatClasses[1].id, maxWeightKg: 25, maxPiecesCount: 2, excessFeePerKg: 450 },
-      { seatClassId: seatClasses[2].id, maxWeightKg: 30, maxPiecesCount: 3, excessFeePerKg: 400 },
-    ],
-  });
+async function seedCoachTypesAndClasses() {
+  console.log('\n🚂 Seeding coach types and seat classes...');
+  const coachTypes = [
+    { code: 'HSC', name: 'Hard Seat Coach', type: 'Economy Regular' },
+    { code: 'HBC', name: 'Hard Bed Coach', type: 'Economy Bed' },
+    { code: 'SBC', name: 'Soft Bed Coach', type: 'VIP Bed' },
+  ];
 
-  // Supported Payment Methods (platform-wide catalog)
-  const paymentMethods = [
-    { type: 'TELEBIRR', displayName: 'Telebirr', region: 'ETHIOPIA', currency: 'ETB', sortOrder: 1, isDefault: true },
-    { type: 'CBE_BIRR', displayName: 'CBE Birr', region: 'ETHIOPIA', currency: 'ETB', sortOrder: 2 },
-    { type: 'EBIRR', displayName: 'E-Birr', region: 'ETHIOPIA', currency: 'ETB', sortOrder: 3 },
-    { type: 'WAAFI', displayName: 'Waafi', region: 'DJIBOUTI', currency: 'DJF', sortOrder: 4 },
-    { type: 'CARD', displayName: 'Credit / Debit Card', region: 'INTERNATIONAL', currency: 'USD', sortOrder: 5 },
-    { type: 'WALLET', displayName: 'EDR Wallet', region: 'GLOBAL', currency: 'ETB', sortOrder: 6 },
-  ] as const;
-  for (const pm of paymentMethods) {
-    await prisma.paymentMethod.upsert({
-      where: { type: pm.type as any },
-      update: { displayName: pm.displayName, region: pm.region as any, currency: pm.currency, sortOrder: pm.sortOrder, enabled: true },
-      create: { ...pm, region: pm.region as any, type: pm.type as any },
+  for (const ct of coachTypes) {
+    await prisma.coachType.upsert({
+      where: { id: ct.code },
+      update: {},
+      create: { ...ct, id: ct.code },
     });
   }
 
-  // Notification Templates
-  await prisma.notificationTemplate.upsert({
-    where: { code: 'BOOKING_CONFIRMED' },
-    update: {},
-    create: {
-      code: 'BOOKING_CONFIRMED',
-      channel: 'EMAIL',
-      subject: 'Booking Confirmed',
-      bodyTemplate: 'Your booking {{bookingRef}} is confirmed for {{tripDate}}.',
-      active: true,
-    },
-  });
+  const seatClasses = [
+    { name: 'VIP Bed Lower', coachCode: 'SBC', baseFareMinor: 900 },
+    { name: 'VIP Bed Upper', coachCode: 'SBC', baseFareMinor: 800 },
+    { name: 'Economy Bed Upper', coachCode: 'HBC', baseFareMinor: 600 },
+    { name: 'Economy Bed Middle', coachCode: 'HBC', baseFareMinor: 550 },
+    { name: 'Economy Bed Lower', coachCode: 'HBC', baseFareMinor: 500 },
+    { name: 'Economy Regular', coachCode: 'HSC', baseFareMinor: 250 },
+  ];
 
-  await prisma.notificationTemplate.upsert({
-    where: { code: 'booking.created' },
-    update: {},
-    create: {
-      code: 'booking.created',
-      channel: 'EMAIL',
-      subject: 'Booking Created',
-      bodyTemplate: 'Your booking {{bookingRef}} has been created successfully.',
-      active: true,
-    },
-  });
-
-  await prisma.notificationTemplate.upsert({
-    where: { code: 'PAYMENT_SUCCESS' },
-    update: {},
-    create: {
-      code: 'PAYMENT_SUCCESS',
-      channel: 'SMS',
-      bodyTemplate: 'Payment successful for {{bookingRef}}. Amount: {{amount}} ETB',
-      active: true,
-    },
-  });
-
-  // Promotions
-  await prisma.promotion.upsert({
-    where: { code: 'WEEKEND15' },
-    update: {},
-    create: {
-      title: 'Weekend Sale',
-      subtitle: '15% off all trips',
-      code: 'WEEKEND15',
-      percentOff: 15,
-      validUntil: new Date('2026-12-31'),
-      ctaLabel: 'Book Now',
-      active: true,
-    },
-  });
-
-  // Currency Exchange Rates
-  await prisma.currencyExchangeRate.deleteMany({});
-  await prisma.currencyExchangeRate.createMany({
-    data: [
-      { fromCurrency: 'ETB', toCurrency: 'ETB', rate: 1.0, effectiveDate: new Date() },
-      { fromCurrency: 'ETB', toCurrency: 'USD', rate: 0.018, effectiveDate: new Date() },
-      { fromCurrency: 'ETB', toCurrency: 'DJF', rate: 3.2, effectiveDate: new Date() },
-      { fromCurrency: 'DJF', toCurrency: 'ETB', rate: 0.3125, effectiveDate: new Date() },
-      { fromCurrency: 'DJF', toCurrency: 'DJF', rate: 1.0, effectiveDate: new Date() },
-    ],
-  });
-
-  // Fraud Rules
-  await prisma.fraudRule.upsert({
-    where: { type: 'VELOCITY' },
-    update: {},
-    create: {
-      type: 'VELOCITY',
-      enabled: true,
-      threshold: 3,
-      config: { windowMinutes: 60, action: 'FLAG' },
-    },
-  });
-
-  console.log(`  ✅ Created supporting data`);
+  for (const sc of seatClasses) {
+    const ct = await prisma.coachType.findUnique({ where: { id: sc.coachCode } });
+    await prisma.seatClass.upsert({
+      where: { coachTypeId_name: { coachTypeId: ct!.id, name: sc.name } },
+      update: {},
+      create: { coachTypeId: ct!.id, name: sc.name, baseFareMinor: sc.baseFareMinor },
+    });
+  }
+  console.log(`  ✅ ${coachTypes.length} coach types, ${seatClasses.length} seat classes created`);
+}
+
+async function seedRoute() {
+  console.log('\n🛣️ Seeding route and stops...');
+  const firstStation = await prisma.station.findUnique({ where: { code: 'SBT' } });
+  const lastStation = await prisma.station.findUnique({ where: { code: 'NAG' } });
+
+  const route = await prisma.route.upsert({
+    where: { code: 'EDR-101' },
+    update: {},
+    create: {
+      code: 'EDR-101',
+      name: 'Sebeta - Dire Dawa',
+      description: 'Outbound local route from Sebeta to Dire Dawa',
+      effectiveFrom: new Date('2026-01-01'),
+      effectiveUntil: new Date('2034-12-31'),
+      active: true,
+    },
+  });
+
+  const stationCodes = ['SBT', 'LEB', 'BSH', 'MOJ', 'ADM', 'MTE', 'MIS', 'BIK', 'DRE'];
+  for (let i = 0; i < stationCodes.length; i++) {
+    const station = await prisma.station.findUnique({ where: { code: stationCodes[i] } });
+    await prisma.routeStop.upsert({
+      where: { routeId_sequence: { routeId: route.id, sequence: i + 1 } },
+      update: {},
+      create: { routeId: route.id, stationId: station!.id, sequence: i + 1, distanceKm: i * 85 },
+    });
+  }
+  console.log(`  ✅ Route with ${stationCodes.length} stops created`);
+}
+
+async function seedCoaches() {
+  console.log('\n🚃 Seeding coaches and seats...');
+  const ecoCoachType = await prisma.coachType.findUnique({ where: { id: 'HSC' } });
+  const ecoBedCoachType = await prisma.coachType.findUnique({ where: { id: 'HBC' } });
+  const vipBedCoachType = await prisma.coachType.findUnique({ where: { id: 'SBC' } });
+
+  const coaches = [
+    { number: 'HSC-0001', coachTypeId: ecoCoachType!.id, arrangement: '3+2', capacity: 40 },
+    { number: 'HBC-0001', coachTypeId: ecoBedCoachType!.id, arrangement: '3+0', capacity: 66 },
+    { number: 'SBC-0001', coachTypeId: vipBedCoachType!.id, arrangement: '2+0', capacity: 120 },
+  ];
+
+  let totalSeats = 0;
+  for (const coach of coaches) {
+    const c = await prisma.coach.upsert({
+      where: { number: coach.number },
+      update: {},
+      create: coach,
+    });
+
+    // Idempotently reconcile the coach's seats. Upsert keyed on the
+    // @@unique([coachId, row, col]) constraint so a re-seed updates existing
+    // rows in place instead of deleting them. Deleting Seats fails with a P2003
+    // FK violation once BookingSeat/SeatBlock/TicketSeat rows reference them.
+    let seatIndex = 1;
+    for (let row = 1; row <= Math.ceil(coach.capacity / 2); row++) {
+      for (const col of ['A', 'B', 'C', 'D']) {
+        if (seatIndex > coach.capacity) break;
+        let bedPosition: string | null = null;
+        if (c.coachTypeId === ecoBedCoachType!.id || c.coachTypeId === vipBedCoachType!.id) {
+          if (row % 3 === 1) bedPosition = 'upper';
+          else if (row % 3 === 2) bedPosition = 'middle';
+          else bedPosition = 'lower';
+        }
+
+        const seatData = {
+          seatNumber: seatIndex.toString(),
+          isWindow: col === 'A' || col === 'D',
+          isAisle: col === 'B' || col === 'C',
+          bedPosition,
+        };
+
+        await prisma.seat.upsert({
+          where: { coachId_row_col: { coachId: c.id, row, col } },
+          update: seatData,
+          create: { coachId: c.id, row, col, ...seatData },
+        });
+        seatIndex++;
+      }
+    }
+    totalSeats += coach.capacity;
+  }
+  console.log(`  ✅ ${coaches.length} coaches with ${totalSeats} seats created`);
+}
+
+async function seedTrips() {
+  console.log('\n🚆 Seeding train service, schedule, and trips...');
+  const train = await prisma.train.upsert({
+    where: { number: 'EDR-001' },
+    update: {},
+    create: { id: TRAIN_ID, number: 'EDR-001', name: 'Djibouti Express' },
+  });
+
+  const route = await prisma.route.findUnique({ where: { code: 'EDR-101' } });
+  const firstStation = await prisma.station.findUnique({ where: { code: 'SBT' } });
+  const lastStation = await prisma.station.findUnique({ where: { code: 'DRE' } });
+  const coaches = await prisma.coach.findMany();
+
+  const now = new Date();
+  const schedules = [];
+  
+  for (let d = 0; d < 30; d++) {
+    const tripDate = new Date(now);
+    tripDate.setDate(tripDate.getDate() + d);
+    tripDate.setHours(8, 0, 0, 0);
+
+    const departureAt = new Date(tripDate);
+    const arrivalAt = new Date(departureAt.getTime() + 4 * 24 * 60 * 60 * 1000);
+
+    schedules.push({
+      trainId: train.id,
+      routeId: route!.id,
+      originStationId: firstStation!.id,
+      destinationStationId: lastStation!.id,
+      departureAt,
+      arrivalAt,
+      durationMinutes: 4 * 24 * 60,
+      stopsCount: 15,
+    });
+  }
+  
+  const createdSchedules = await Promise.all(
+    schedules.map(s => prisma.trainSchedule.create({ data: s }))
+  );
+
+  // Create TripStopTimes for each schedule
+  const routeStops = await prisma.routeStop.findMany({
+    where: { routeId: route!.id },
+    orderBy: { sequence: 'asc' },
+    include: { route: true },
+  });
+
+  for (const schedule of createdSchedules) {
+    const stopTimes = [];
+    for (const routeStop of routeStops) {
+      const minutesFromStart = (routeStop.sequence - 1) * 480; // 8 hours per stop
+      const plannedDepartureAt = new Date(schedule.departureAt.getTime() + minutesFromStart * 60_000);
+      const plannedArrivalAt = new Date(plannedDepartureAt.getTime() + 30 * 60_000); // 30 min stop
+      
+      stopTimes.push({
+        scheduleId: schedule.id,
+        stationId: routeStop.stationId,
+        sequence: routeStop.sequence,
+        plannedArrivalAt,
+        plannedDepartureAt,
+      });
+    }
+    
+    await Promise.all(
+      stopTimes.map(st => prisma.tripStopTime.create({ data: st }))
+    );
+  }
+
+  const coachAssignments = [];
+  const liveStatuses = [];
+  
+  for (const schedule of createdSchedules) {
+    for (let p = 0; p < coaches.length; p++) {
+      coachAssignments.push({
+        scheduleId: schedule.id,
+        coachId: coaches[p].id,
+        positionNumber: p + 1,
+      });
+    }
+    liveStatuses.push({
+      scheduleId: schedule.id,
+      state: 'scheduled',
+      progressPercent: 0,
+    });
+  }
+  
+  await Promise.all([
+    ...coachAssignments.map(ca => prisma.coachAssignment.create({ data: ca })),
+    ...liveStatuses.map(ls => prisma.tripLiveStatus.create({ data: ls })),
+  ]);
+  
+  console.log(`  ✅ Train with ${createdSchedules.length} upcoming trips created`);
+}
+
+async function seedFareRules() {
+  console.log('\n💰 Seeding fare rules...');
+  const route = await prisma.route.findUnique({ where: { code: 'EDR-101' } });
+  const seatClasses = await prisma.seatClass.findMany();
+  const validFrom = new Date('2024-01-01');
+
+  const fareRules = [];
+  for (const sc of seatClasses) {
+    fareRules.push({
+      routeId: route!.id,
+      seatClassId: sc.id,
+      passengerCategory: 'ADULT' as const,
+      baseFareMinor: sc.baseFareMinor,
+      currency: 'ETB',
+      validFrom,
+    });
+    fareRules.push({
+      routeId: route!.id,
+      seatClassId: sc.id,
+      passengerCategory: 'CHILD' as const,
+      baseFareMinor: Math.floor(sc.baseFareMinor * 0.5),
+      discountPercent: 50,
+      currency: 'ETB',
+      validFrom,
+    });
+  }
+  
+  await Promise.all(
+    fareRules.map(fr => prisma.routeFareRule.create({ data: fr }))
+  );
+  console.log(`  ✅ ${fareRules.length} fare rules for ADULT/CHILD categories created`);
+}
+
+async function seedCurrency() {
+  console.log('\n💱 Seeding currency exchange rates...');
+  const rates = [
+    { from: 'ETB', to: 'DJF', rate: 3.25 },
+    { from: 'ETB', to: 'USD', rate: 0.018 },
+    { from: 'DJF', to: 'ETB', rate: 0.3077 },
+    { from: 'USD', to: 'ETB', rate: 55.56 },
+  ];
+
+  for (const r of rates) {
+    await prisma.currencyExchangeRate.upsert({
+      where: {
+        fromCurrency_toCurrency_effectiveDate: {
+          fromCurrency: r.from as any,
+          toCurrency: r.to as any,
+          effectiveDate: new Date('2024-01-01'),
+        },
+      },
+      update: { rate: r.rate },
+      create: {
+        fromCurrency: r.from as any,
+        toCurrency: r.to as any,
+        rate: r.rate,
+        effectiveDate: new Date('2024-01-01'),
+      },
+    });
+  }
+  console.log(`  ✅ 4 currency exchange rates created`);
+}
+
+async function seedPaymentMethods() {
+  console.log('\n💳 Seeding payment methods...');
+  const methods = [
+    { type: 'TELEBIRR', displayName: 'Telebirr', region: 'ETHIOPIA' },
+    { type: 'CBE_BIRR', displayName: 'CBE Birr', region: 'ETHIOPIA' },
+    { type: 'EBIRR', displayName: 'eBirr', region: 'ETHIOPIA' },
+    { type: 'CARD', displayName: 'Credit/Debit Card', region: 'GLOBAL' },
+    { type: 'WALLET', displayName: 'Wallet', region: 'GLOBAL' },
+  ];
+
+  for (const m of methods) {
+    await prisma.paymentMethod.upsert({
+      where: { type: m.type as any },
+      update: {},
+      create: { ...m, type: m.type as any, region: m.region as any },
+    });
+  }
+  console.log(`  ✅ ${methods.length} payment methods created`);
+}
+
+async function seedNotificationTemplates() {
+  console.log('\n🔔 Seeding notification templates...');
+  const templates = [
+    { id: uuidv4(), code: 'BOOKING_CONFIRMED', channel: 'EMAIL', subject: 'Booking Confirmed', bodyTemplate: 'Your booking {{bookingRef}} is confirmed' },
+    { id: uuidv4(), code: 'PAYMENT_RECEIVED', channel: 'SMS', bodyTemplate: 'Payment received for {{bookingRef}}' },
+    { id: uuidv4(), code: 'TRIP_DEPARTURE', channel: 'PUSH', bodyTemplate: 'Your trip departs in {{minutes}} minutes' },
+    { id: uuidv4(), code: 'TRIP_DELAY', channel: 'EMAIL', subject: 'Trip Delayed', bodyTemplate: 'Your trip is delayed by {{delayMinutes}} minutes' },
+    { id: uuidv4(), code: 'PROMOTION', channel: 'PUSH', bodyTemplate: 'Get {{percentOff}}% off on {{route}}' },
+  ];
+
+  for (const t of templates) {
+    await prisma.notificationTemplate.upsert({
+      where: { code: t.code },
+      update: {},
+      create: t,
+    });
+  }
+  console.log(`  ✅ ${templates.length} notification templates created`);
+}
+
+async function seedMenuAndFood() {
+  console.log('\n🍽️ Seeding menu categories and items...');
+  const beverages = await prisma.menuCategory.upsert({
+    where: { id: uuidv4() },
+    update: {},
+    create: { id: uuidv4(), name: 'Beverages' },
+  });
+  const snacks = await prisma.menuCategory.upsert({
+    where: { id: uuidv4() },
+    update: {},
+    create: { id: uuidv4(), name: 'Snacks' },
+  });
+
+  const schedule = await prisma.trainSchedule.findFirst();
+  if (schedule) {
+    const coffeeId = uuidv4();
+    const juiceId = uuidv4();
+    const sandwichId = uuidv4();
+    
+    await prisma.menuItem.create({
+      data: { id: coffeeId, scheduleId: schedule.id, categoryId: beverages.id, name: 'Ethiopian Coffee', priceMinor: 5000 },
+    }).catch(() => {}); // ignore if exists
+    await prisma.menuItem.create({
+      data: { id: juiceId, scheduleId: schedule.id, categoryId: beverages.id, name: 'Fresh Juice', priceMinor: 3500 },
+    }).catch(() => {}); // ignore if exists
+    await prisma.menuItem.create({
+      data: { id: sandwichId, scheduleId: schedule.id, categoryId: snacks.id, name: 'Sandwich', priceMinor: 8000 },
+    }).catch(() => {}); // ignore if exists
+  }
+  console.log(`  ✅ Menu categories and items created`);
+}
+
+async function seedPromotions() {
+  console.log('\n🎉 Seeding promotions...');
+  const promos = [
+    { id: uuidv4(), title: 'Early Bird Discount', code: 'EARLY20', percentOff: 20, validUntil: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000) },
+    { id: uuidv4(), title: 'Student Discount', code: 'STUDENT15', percentOff: 15, validUntil: new Date(Date.now() + 60 * 24 * 60 * 60 * 1000) },
+    { id: uuidv4(), title: 'Group Booking', code: 'GROUP10', amountOffMinor: 10000, validUntil: new Date(Date.now() + 90 * 24 * 60 * 60 * 1000) },
+  ];
+
+  for (const p of promos) {
+    await prisma.promotion.upsert({
+      where: { code: p.code },
+      update: {},
+      create: p,
+    });
+  }
+  console.log(`  ✅ ${promos.length} promotions created`);
+}
+
+async function seedFAQ() {
+  console.log('\n❓ Seeding FAQ...');
+  const generalId = uuidv4();
+  const bookingId = uuidv4();
+  const general = await prisma.faqCategory.upsert({
+    where: { id: generalId },
+    update: {},
+    create: { id: generalId, title: 'General', iconKey: 'help' },
+  });
+  const booking = await prisma.faqCategory.upsert({
+    where: { id: bookingId },
+    update: {},
+    create: { id: bookingId, title: 'Booking', iconKey: 'book' },
+  });
+
+  await prisma.faqArticle.upsert({
+    where: { id: uuidv4() },
+    update: {},
+    create: { id: uuidv4(), categoryId: general.id, question: 'What is EDR?', answerMarkdown: 'Ethio-Djibouti Railway' },
+  });
+  await prisma.faqArticle.upsert({
+    where: { id: uuidv4() },
+    update: {},
+    create: { id: uuidv4(), categoryId: booking.id, question: 'How to book?', answerMarkdown: 'Use the booking system' },
+  });
+  console.log(`  ✅ FAQ categories and articles created`);
+}
+
+async function seedFraudRules() {
+  console.log('\n🔐 Seeding fraud detection rules...');
+  const rules = [
+    { type: 'RAPID_BOOKINGS', threshold: 10, enabled: true },
+    { type: 'HIGH_VALUE_BOOKING', threshold: 500000, enabled: true },
+    { type: 'UNUSUAL_DEVICE', threshold: 0.8, enabled: true },
+  ];
+
+  for (const r of rules) {
+    await prisma.fraudRule.upsert({
+      where: { type: r.type },
+      update: {},
+      create: r,
+    });
+  }
+  console.log(`  ✅ ${rules.length} fraud detection rules created`);
+}
+
+// Run a seed step in isolation: if it throws (FK conflict, duplicate row,
+// missing record, etc.) log the error and keep going so the rest of the seed —
+// and the API startup that follows it — are never blocked by one bad step.
+async function runStep(name: string, step: () => Promise<unknown>): Promise<boolean> {
+  try {
+    await step();
+    return true;
+  } catch (e) {
+    console.error(`⚠️  Seed step "${name}" failed — skipping and continuing:`, e);
+    return false;
+  }
 }
 
-// ============================================================================
-// MAIN SEED FUNCTION
-// ============================================================================
 async function main() {
-  console.log('🌱 Starting comprehensive modular seed with 18 stations...\n');
+  console.log('🌱 Comprehensive EDR Seed Starting...\n');
 
-  const stations = await seedStations();
-  const seatClasses = await seedSeatClasses();
-  const trains = await seedTrains();
-  const coaches = await seedCoachesAndSeats(seatClasses);
-  const routes = await seedRoutes(stations, seatClasses);
-  const schedules = await seedSchedules(trains, stations, routes);
-  await seedCoachAssignments(schedules, coaches);
-  await seedStopTimes(schedules, stations);
-  await seedFareRules(schedules, seatClasses);
-  await seedUsers();
-  await seedSupportingData(seatClasses);
+  const steps: Array<[string, () => Promise<unknown>]> = [
+    ['system users', seedSystemUsers],
+    ['stations', seedStations],
+    ['coach types & classes', seedCoachTypesAndClasses],
+    ['route', seedRoute],
+    ['coaches', seedCoaches],
+    ['trips', seedTrips],
+    ['fare rules', seedFareRules],
+    ['currency', seedCurrency],
+    ['payment methods', seedPaymentMethods],
+    ['notification templates', seedNotificationTemplates],
+    ['menu & food', seedMenuAndFood],
+    ['promotions', seedPromotions],
+    ['FAQ', seedFAQ],
+    ['fraud rules', seedFraudRules],
+  ];
 
-  console.log('\n✅ Comprehensive seed complete!\n');
-  console.log('📋 Seed Summary:');
-  console.log('  - 18 Stations: SBT, LBU, IND, BSH, MJO, ADM, FTO, MTH, MSO, BKE, DDW, ARW, ADG, AYS, DWL, ALI, HOL, NGD');
-  console.log('  - 3 Seat Classes (Economy Regular, Economy Bed, VIP Bed)');
-  console.log('  - 3 Trains (Express 301, Express 302, Local 303)');
-  console.log('  - 6 Physical Coaches with seats');
-  console.log('  - 5 Train Schedules covering full and regional routes');
-  console.log('  - 4 Routes with stops and fare rules');
-  console.log('  - 15+ Fare Segments with nationality-based pricing');
-  console.log('  - 4 Users: Admin, Ethiopian Passenger, Djiboutian Passenger, Agent');
-  console.log('  - Currency rates: ETB, USD, DJF');
-  console.log('\n🔑 Login Credentials:');
-  console.log('  Admin:              admin@edr-platform.com / admin123');
-  console.log('  Ethiopian Passenger: abebe@email.com / password123');
-  console.log('  Djiboutian Passenger: ahmed@email.com / password123');
-  console.log('  Agent:              agent@edr-platform.com / agent123');
-  console.log('\n💰 Booking Flow Ready:');
-  console.log('  - Search: 18 stations with multiple route combinations');
-  console.log('  - Select: 3 seat classes with dynamic pricing');
-  console.log('  - Book: Complete passenger details and payment');
-  console.log('  - Pay: Multiple payment methods (Telebirr, CBE, Card, Wallet)');
-  console.log('  - Ticket: QR code generation and validation');
-  console.log('\n🚂 Sample Routes:');
-  console.log('  - Full Route: Sebeta → Nagad (18 stations, 756 km)');
-  console.log('  - Regional: Sebeta → Diredawa (11 stations, 378 km)');
-  console.log('  - Short: Sebeta → Adama (6 stations, 99 km)');
-  console.log('  - Cross-border: Diredawa → Nagad (8 stations, 378 km)');
+  let failed = 0;
+  for (const [name, step] of steps) {
+    if (!(await runStep(name, step))) failed++;
+  }
+
+  if (failed > 0) {
+    console.warn(`\n⚠️  Seed finished with ${failed}/${steps.length} step(s) failed (see logs above).\n`);
+  } else {
+    console.log('\n✅ Seed complete!\n');
+  }
+  console.log('🔑 System Users:');
+  console.log('  Admin:       admin@edr-platform.com / admin123');
+  console.log('  Passenger:   kelemu@email.com / password123');
+  console.log('  Agent:       agent@edr-platform.com / agent123');
+  console.log('  Supervisor:  supervisor@edr-platform.com / supervisor123');
+  console.log('  Staff:       staff@edr-platform.com / staff123');
 }
 
 main()
   .catch((e) => {
-    console.error('❌ Seed failed:', e);
-    process.exit(1);
+    // Intentionally do NOT process.exit(1): the docker entrypoint runs under
+    // `set -e`, so a non-zero exit here would abort container startup and the
+    // API would never boot. Log and exit cleanly instead.
+    console.error('❌ Seed crashed unexpectedly — continuing so the API can start:', e);
   })
   .finally(async () => {
     await prisma.$disconnect();
diff --git a/apps/edr-passenger-api/src/app.module.ts b/apps/edr-passenger-api/src/app.module.ts
index 1bbc56aaa..b747b77c1 100644
--- a/apps/edr-passenger-api/src/app.module.ts
+++ b/apps/edr-passenger-api/src/app.module.ts
@@ -1,7 +1,7 @@
 import { Module, NestModule, MiddlewareConsumer } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
-// import { EventEmitterModule } from '@nestjs/event-emitter';
+import { EventEmitterModule } from '@nestjs/event-emitter';
 import { PrismaModule } from './common/prisma.module';
 import { I18nModule } from './common/i18n/i18n.module';
 import { IamModule } from './common/iam.module';
@@ -14,6 +14,7 @@ import ebirrConfig from './config/ebirr.config';
 import cardConfig from './config/card.config';
 import waafiConfig from './config/waafi.config';
 import faydaConfig from './config/fayda.config';
+import rabbitmqConfig from './config/rabbitmq.config';
 import { AuthModule } from './modules/auth/auth.module';
 import { StationsModule } from './modules/stations/stations.module';
 import { FleetModule } from './modules/fleet/fleet.module';
@@ -52,6 +53,7 @@ import { VerifaydaModule } from './modules/verifayda/verifayda.module';
         cardConfig,
         waafiConfig,
         faydaConfig,
+        rabbitmqConfig,
       ],
     }),
     ScheduleModule.forRoot(),
diff --git a/apps/edr-passenger-api/src/common/filters/http-exception.filter.ts b/apps/edr-passenger-api/src/common/filters/http-exception.filter.ts
index f02ce4abf..e50172db9 100644
--- a/apps/edr-passenger-api/src/common/filters/http-exception.filter.ts
+++ b/apps/edr-passenger-api/src/common/filters/http-exception.filter.ts
@@ -12,6 +12,12 @@ export class HttpExceptionFilter implements ExceptionFilter {
   private readonly logger = new Logger(HttpExceptionFilter.name);
 
   catch(exception: unknown, host: ArgumentsHost): void {
+    // Global filter — also reached by non-HTTP (e.g. RabbitMQ) handlers. switchToHttp() would
+    // yield no response object there, so re-throw and let the transport (golevelup) handle it
+    // (nack/dead-letter) instead of crashing on response.status().
+    if (host.getType() !== 'http') {
+      throw exception;
+    }
     const ctx = host.switchToHttp();
     const response = ctx.getResponse();
     const request = ctx.getRequest();
diff --git a/apps/edr-passenger-api/src/common/guards/service-auth.guard.ts b/apps/edr-passenger-api/src/common/guards/service-auth.guard.ts
new file mode 100644
index 000000000..b47876d4c
--- /dev/null
+++ b/apps/edr-passenger-api/src/common/guards/service-auth.guard.ts
@@ -0,0 +1,54 @@
+import {
+  CanActivate,
+  ExecutionContext,
+  Injectable,
+  Logger,
+  UnauthorizedException,
+} from "@nestjs/common";
+import { timingSafeEqual } from "node:crypto";
+import { Request } from "express";
+
+/**
+ * Shared-secret guard for endpoints only the payment microservice may call
+ * (e.g. /internal/payments/mark-paid). The secret is the same SERVICE_AUTH_TOKEN the
+ * payment service enforces on its own internal surface. A forged mark-paid must not be able
+ * to confirm a booking without a real payment.
+ * TODO: integrate @tria-plc IAM / mTLS as the long-term mechanism.
+ */
+@Injectable()
+export class ServiceAuthGuard implements CanActivate {
+  private readonly logger = new Logger(ServiceAuthGuard.name);
+  private readonly token = process.env.SERVICE_AUTH_TOKEN ?? "";
+  private warned = false;
+
+  constructor() {
+    if (!this.token && process.env.NODE_ENV === "production") {
+      throw new Error("SERVICE_AUTH_TOKEN must be set in production");
+    }
+  }
+
+  canActivate(context: ExecutionContext): boolean {
+    if (!this.token) {
+      if (!this.warned) {
+        this.logger.warn(
+          "SERVICE_AUTH_TOKEN unset — internal endpoints are UNGUARDED (dev only)",
+        );
+        this.warned = true;
+      }
+      return true;
+    }
+
+    const request = context.switchToHttp().getRequest<Request>();
+    const header = request.headers["x-service-token"];
+    const bearer = request.headers.authorization?.replace(/^Bearer\s+/i, "");
+    const presented =
+      (Array.isArray(header) ? header[0] : header) ?? bearer ?? "";
+
+    const expected = Buffer.from(this.token);
+    const actual = Buffer.from(presented);
+    const valid =
+      expected.length === actual.length && timingSafeEqual(expected, actual);
+    if (!valid) throw new UnauthorizedException("Invalid service token");
+    return true;
+  }
+}
diff --git a/apps/edr-passenger-api/src/common/interceptors/response-transform.interceptor.ts b/apps/edr-passenger-api/src/common/interceptors/response-transform.interceptor.ts
index d1cd41c7b..83f810966 100644
--- a/apps/edr-passenger-api/src/common/interceptors/response-transform.interceptor.ts
+++ b/apps/edr-passenger-api/src/common/interceptors/response-transform.interceptor.ts
@@ -4,7 +4,14 @@ import { map } from 'rxjs/operators';
 
 @Injectable()
 export class ResponseTransformInterceptor<T> implements NestInterceptor<T, any> {
-  intercept(_ctx: ExecutionContext, next: CallHandler<T>): Observable<any> {
+  intercept(ctx: ExecutionContext, next: CallHandler<T>): Observable<any> {
+    // Only wrap HTTP responses. This interceptor is global, so it also runs for RabbitMQ
+    // message handlers (golevelup uses Nest's context system) — there, wrapping the return
+    // value would corrupt the handler's contract (e.g. a returned Nack would be swallowed,
+    // dropping a message instead of dead-lettering it). Let non-HTTP returns pass through.
+    if (ctx.getType() !== 'http') {
+      return next.handle();
+    }
     return next.handle().pipe(
       map((data) => ({ success: true, data, timestamp: new Date().toISOString() })),
     );
diff --git a/apps/edr-passenger-api/src/config/rabbitmq.config.ts b/apps/edr-passenger-api/src/config/rabbitmq.config.ts
new file mode 100644
index 000000000..d6d5ee335
--- /dev/null
+++ b/apps/edr-passenger-api/src/config/rabbitmq.config.ts
@@ -0,0 +1,12 @@
+import { registerAs } from '@nestjs/config';
+
+/**
+ * RabbitMQ connection for the payment-event consumer (payment microservice -> passenger).
+ * Independent of the IAM/notification module's RABBITMQ_URL so the two broker connections
+ * never interfere. Points at the dedicated `payment` vhost on the shared broker.
+ */
+export default registerAs('rabbitmq', () => ({
+  url: process.env.PAYMENT_RABBITMQ_URL ?? 'amqp://localhost:5672/payment',
+  /** Max unacked payment events held by this consumer at once. */
+  prefetch: parseInt(process.env.PAYMENT_EVENTS_PREFETCH ?? '10', 10),
+}));
diff --git a/apps/edr-passenger-api/src/config/waafi.config.ts b/apps/edr-passenger-api/src/config/waafi.config.ts
index c3afab7ce..639e66e2b 100644
--- a/apps/edr-passenger-api/src/config/waafi.config.ts
+++ b/apps/edr-passenger-api/src/config/waafi.config.ts
@@ -1,10 +1,27 @@
 import { registerAs } from '@nestjs/config';
 
 export default registerAs('waafi', () => ({
-  baseUrl: process.env.WAAFI_BASE_URL ?? 'https://api.waafipay.net',
+  // `/asm` is appended in the provider; use sandbox by default, switch to
+  // https://api.waafipay.net in production.
+  baseUrl: process.env.WAAFI_BASE_URL ?? 'https://sandbox.waafipay.net',
+  // HPP credentials (Hosted Payment Page family).
   merchantUid: process.env.WAAFI_MERCHANT_UID ?? '',
-  apiUserId: process.env.WAAFI_API_USER_ID ?? '',
-  apiKey: process.env.WAAFI_API_KEY ?? '',
+  storeId: process.env.WAAFI_STORE_ID ?? '',
+  hppKey: process.env.WAAFI_HPP_KEY ?? '',
+  // HMAC secret returned once by WEBHOOK_REGISTER; verifies inbound webhooks.
+  webhookSecret: process.env.WAAFI_WEBHOOK_SECRET ?? '',
+  // Wallet payment method (EVC/ZAAD/Sahal) — MWALLET_ACCOUNT requires the payer phone up front.
+  paymentMethod: process.env.WAAFI_PAYMENT_METHOD ?? 'MWALLET_ACCOUNT',
+  // Waafi has no ETB; when set this overrides the booking currency (USD/DJF/SLSH).
+  currency: process.env.WAAFI_CURRENCY ?? 'DJF',
+  // Browser redirect targets after the hosted page completes/fails (UX only; webhook is source of truth).
+  successUrl: process.env.WAAFI_HPP_SUCCESS_URL ?? '',
+  failureUrl: process.env.WAAFI_HPP_FAILURE_URL ?? '',
+  // Callback data format: 1 = POST, 2 = GET, 4 = Result Token.
+  respDataFormat: Number(process.env.WAAFI_HPP_RESP_FORMAT ?? '1'),
+  // Registered webhook URL (reference only; registration is performed out-of-band).
   notifyUrl: process.env.WAAFI_NOTIFY_URL ?? '',
-  returnUrl: process.env.WAAFI_RETURN_URL ?? '',
+  // DEV ONLY: disable TLS cert verification. The Waafi sandbox serves a *.waafi.com cert that
+  // does not match sandbox.waafipay.net (ERR_TLS_CERT_ALTNAME_INVALID). Never enable in prod.
+  insecureTls: process.env.WAAFI_INSECURE_TLS === 'true',
 }));
diff --git a/apps/edr-passenger-api/src/main.ts b/apps/edr-passenger-api/src/main.ts
index d85b17dbe..a7bd85f81 100644
--- a/apps/edr-passenger-api/src/main.ts
+++ b/apps/edr-passenger-api/src/main.ts
@@ -8,7 +8,9 @@ import { ResponseTransformInterceptor } from "./common/interceptors/response-tra
 import { SessionActivityInterceptor } from "./common/interceptors/session-activity.interceptor";
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
+  // rawBody: true buffers the unparsed request body onto req.rawBody so webhook handlers
+  // (e.g. Waafi HMAC verification) can sign over the exact bytes the provider signed.
+  const app = await NestFactory.create(AppModule, { rawBody: true });
 
   app.enableCors({
     origin: [
@@ -236,6 +238,7 @@ Payment providers send notifications to:
     .addTag("Support", "FAQ management and live chat support")
     .addTag("Tickets", "QR ticket generation, PDFs, and gate validation")
     .addTag("Wallet", "Wallet balance, top-ups, and transaction ledger")
+    .addTag("Config", "System configuration and settings")
     //.addServer('http://localhost:4000', 'Development')
     // .addServer("https://api.edr-platform.com", "Production")
     .build();
diff --git a/apps/edr-passenger-api/src/modules/auth/auth.controller.ts b/apps/edr-passenger-api/src/modules/auth/auth.controller.ts
index 4d091656f..0565faf8f 100644
--- a/apps/edr-passenger-api/src/modules/auth/auth.controller.ts
+++ b/apps/edr-passenger-api/src/modules/auth/auth.controller.ts
@@ -1,8 +1,11 @@
-import { Body, Controller, Post, HttpCode, HttpStatus, UseGuards, Get, Request, UnauthorizedException } from '@nestjs/common';
+import { Body, Controller, Post, HttpCode, HttpStatus, UseGuards, Get, Request, UnauthorizedException, Param, Patch, Delete, Query } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiResponse, ApiBody, ApiBearerAuth } from '@nestjs/swagger';
 import { AuthService } from './auth.service';
 import { RegisterDto, LoginDto, RequestOtpDto, VerifyOtpDto, RequestPasswordResetDto, ResetPasswordDto } from './auth.dto';
 import { JwtGuard } from '../../common/jwt.guard';
+import { RolesGuard } from '../../common/roles.guard';
+import { Roles } from '../../common/roles.decorator';
+import { UserRole } from '@prisma/client';
 
 @ApiTags('Auth')
 @Controller('auth')
@@ -137,6 +140,9 @@ export class AuthController {
 - **Loyalty Account**: Tier, points balance, lifetime points
 - **Wallet Account**: Balance (minor units), currency
 
+#### Devices
+- List of registered devices with platform, name, push token, and last seen time
+
 #### User Preferences
 - Language, notification settings, etc.
 
@@ -154,6 +160,8 @@ export class AuthController {
 
 5. **Wallet Balance**: Display available balance
 
+6. **Device Management**: Get list of user's registered devices
+
 ---
 
 ### Authentication
@@ -196,7 +204,25 @@ export class AuthController {
           emailNotifications: true,
           smsNotifications: true,
           language: 'am'
-        }
+        },
+        devices: [
+          {
+            id: 'device-uuid-1',
+            platform: 'WEB',
+            name: 'Chrome on Windows',
+            pushToken: 'token-abc123',
+            trusted: true,
+            lastSeenAt: '2024-01-20T14:22:00.000Z'
+          },
+          {
+            id: 'device-uuid-2',
+            platform: 'IOS',
+            name: 'iPhone 14',
+            pushToken: 'token-xyz789',
+            trusted: false,
+            lastSeenAt: '2024-01-19T10:15:00.000Z'
+          }
+        ]
       }
     }
   })
@@ -217,4 +243,61 @@ export class AuthController {
     }
     return this.service.getProfile(req.user.userId); 
   }
+
+  @Get('users')
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(UserRole.ADMIN, UserRole.SUPERVISOR)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Get all backoffice users (admin/supervisor only)' })
+  getUsers(
+    @Query('search') search?: string,
+    @Query('role') role?: string,
+    @Query('status') status?: string,
+    @Query('page') page?: string,
+    @Query('pageSize') pageSize?: string,
+  ) {
+    return this.service.getUsers({
+      search,
+      role,
+      status,
+      page: page ? parseInt(page) : 1,
+      pageSize: pageSize ? parseInt(pageSize) : 10,
+    });
+  }
+
+  @Post('users')
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(UserRole.ADMIN, UserRole.SUPERVISOR)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Create new backoffice user (admin/supervisor only)' })
+  createUser(@Body() dto: any) {
+    return this.service.createUser(dto);
+  }
+
+  @Patch('users/:id')
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(UserRole.ADMIN, UserRole.SUPERVISOR)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Update backoffice user (admin/supervisor only)' })
+  updateUser(@Param('id') id: string, @Body() dto: any) {
+    return this.service.updateUser(id, dto);
+  }
+
+  @Delete('users/:id')
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(UserRole.ADMIN)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Delete backoffice user (admin only)' })
+  deleteUser(@Param('id') id: string) {
+    return this.service.deleteUser(id);
+  }
+
+  @Post('users/:id/reset-password')
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(UserRole.ADMIN, UserRole.SUPERVISOR)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Reset user password with temporary password (admin/supervisor only)' })
+  resetUserPassword(@Param('id') id: string, @Body() dto: { tempPassword: string }) {
+    return this.service.resetUserPassword(id, dto.tempPassword);
+  }
 }
diff --git a/apps/edr-passenger-api/src/modules/auth/auth.service.ts b/apps/edr-passenger-api/src/modules/auth/auth.service.ts
index 74bd3f79b..e937a106b 100644
--- a/apps/edr-passenger-api/src/modules/auth/auth.service.ts
+++ b/apps/edr-passenger-api/src/modules/auth/auth.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, UnauthorizedException, ConflictException, BadRequestException } from '@nestjs/common';
+import { Injectable, UnauthorizedException, ConflictException, BadRequestException, NotFoundException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { PrismaService } from '../../common/prisma.service';
 import { RegisterDto, LoginDto, RequestOtpDto, VerifyOtpDto, RequestPasswordResetDto, ResetPasswordDto } from './auth.dto';
@@ -58,7 +58,7 @@ export class AuthService {
     
     await this.prisma.user.update({
       where: { id: user.id },
-      data: { failedLoginAttempts: 0, lockedUntil: null }
+      data: { failedLoginAttempts: 0, lockedUntil: null, lastLoginAt: new Date() }
     });
     
     await this.createAuditLog(user.id, 'USER_LOGIN', 'User', user.id, null, null);
@@ -131,6 +131,174 @@ export class AuthService {
     return { reset: true };
   }
 
+  async getUsers(filters: { search?: string; role?: string; status?: string; page?: number; pageSize?: number }) {
+    const { search, role, status, page = 1, pageSize = 10 } = filters;
+    const skip = (page - 1) * pageSize;
+
+    const where: any = {
+      role: { not: 'PASSENGER' }, // Exclude passenger accounts
+    };
+
+    if (search) {
+      where.OR = [
+        { email: { contains: search, mode: 'insensitive' } },
+        { fullName: { contains: search, mode: 'insensitive' } },
+      ];
+    }
+
+    if (role) {
+      where.role = role;
+    }
+
+    // For status filtering, we check if user is active (no lock/block) or inactive
+    if (status === 'ACTIVE') {
+      where.AND = [
+        { blockedUntil: { lte: new Date() } },
+        { lockedUntil: { lte: new Date() } }
+      ];
+    } else if (status === 'INACTIVE') {
+      where.OR = [
+        { blockedUntil: { gt: new Date() } },
+        { lockedUntil: { gt: new Date() } }
+      ];
+    }
+
+    const [items, total] = await Promise.all([
+      this.prisma.user.findMany({
+        where,
+        select: {
+          id: true,
+          email: true,
+          fullName: true,
+          role: true,
+          lastLoginAt: true,
+          createdAt: true,
+          blockedUntil: true,
+          lockedUntil: true,
+        },
+        skip,
+        take: pageSize,
+        orderBy: { createdAt: 'desc' },
+      }),
+      this.prisma.user.count({ where }),
+    ]);
+
+    return {
+      items: items.map(user => ({
+        id: user.id,
+        email: user.email,
+        fullName: user.fullName,
+        role: user.role,
+        lastLogin: user.lastLoginAt,
+        status: (!user.blockedUntil || user.blockedUntil <= new Date()) &&
+                (!user.lockedUntil || user.lockedUntil <= new Date()) 
+          ? 'ACTIVE' 
+          : 'INACTIVE',
+      })),
+      total,
+      page,
+      pageSize,
+    };
+  }
+
+  async createUser(dto: { email: string; fullName: string; role: string; status?: string; password?: string }) {
+    const exists = await this.prisma.user.findFirst({
+      where: { OR: [{ email: dto.email }] },
+    });
+    if (exists) throw new ConflictException('Email already registered');
+
+    const passwordHash = await bcrypt.hash(dto.password || 'TempPassword123!', 10);
+    
+    const user = await this.prisma.user.create({
+      data: {
+        email: dto.email,
+        fullName: dto.fullName,
+        role: dto.role as any,
+        phone: dto.email, // Use email as phone temporarily for unique constraint
+        passwordHash,
+        blockedUntil: dto.status === 'INACTIVE' ? new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) : undefined,
+      },
+      select: {
+        id: true,
+        email: true,
+        fullName: true,
+        role: true,
+        lastLoginAt: true,
+        createdAt: true,
+      },
+    });
+
+    await this.createAuditLog(user.id, 'USER_CREATED', 'User', user.id, null, { email: user.email, role: dto.role });
+
+    return user;
+  }
+
+  async updateUser(id: string, dto: Partial<{ email: string; fullName: string; role: string; status: string }>) {
+    const user = await this.prisma.user.findUnique({ where: { id } });
+    if (!user) throw new NotFoundException('User not found');
+
+    const updateData: any = {};
+    if (dto.fullName) updateData.fullName = dto.fullName;
+    if (dto.role) updateData.role = dto.role;
+    if (dto.status === 'ACTIVE') {
+      updateData.blockedUntil = null;
+      updateData.lockedUntil = null;
+    } else if (dto.status === 'INACTIVE') {
+      updateData.blockedUntil = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000);
+    }
+
+    const updated = await this.prisma.user.update({
+      where: { id },
+      data: updateData,
+      select: {
+        id: true,
+        email: true,
+        fullName: true,
+        role: true,
+        lastLoginAt: true,
+        createdAt: true,
+      },
+    });
+
+    await this.createAuditLog(id, 'USER_UPDATED', 'User', id, { oldData: user }, { newData: updateData });
+
+    return updated;
+  }
+
+  async deleteUser(id: string) {
+    const user = await this.prisma.user.findUnique({ where: { id } });
+    if (!user) throw new NotFoundException('User not found');
+
+    // Don't actually delete, just deactivate
+    await this.prisma.user.update({
+      where: { id },
+      data: { blockedUntil: new Date(), lockedUntil: new Date() },
+    });
+
+    await this.createAuditLog(id, 'USER_DELETED', 'User', id, { email: user.email }, null);
+
+    return { deleted: true };
+  }
+
+  async resetUserPassword(id: string, tempPassword: string) {
+    const user = await this.prisma.user.findUnique({ where: { id } });
+    if (!user) throw new NotFoundException('User not found');
+
+    const passwordHash = await bcrypt.hash(tempPassword, 10);
+    await this.prisma.user.update({
+      where: { id },
+      data: {
+        passwordHash,
+        failedLoginAttempts: 0,
+        lockedUntil: null,
+      },
+    });
+
+    await this.createAuditLog(id, 'PASSWORD_RESET_ADMIN', 'User', id, null, { resetBy: 'admin' });
+
+    return { reset: true, tempPassword };
+  }
+
   private async signToken(userId: string, email: string, role: string, passengerId?: string, agentId?: string) {
     // Get the full user data to include fullName
     const user = await this.prisma.user.findUnique({
@@ -180,6 +348,7 @@ export class AuthService {
           },
         },
         preferences: true,
+        devices: true,
       },
     });
 
@@ -213,6 +382,14 @@ export class AuthService {
         } : null,
       } : null,
       preferences: user.preferences,
+      devices: user.devices.map(device => ({
+        id: device.id,
+        platform: device.platform,
+        name: device.name,
+        pushToken: device.pushToken,
+        trusted: device.trusted,
+        lastSeenAt: device.lastSeenAt,
+      })),
     };
   }
 
diff --git a/apps/edr-passenger-api/src/modules/bookings/bookings.controller.ts b/apps/edr-passenger-api/src/modules/bookings/bookings.controller.ts
index d21777a1b..d7f87550f 100644
--- a/apps/edr-passenger-api/src/modules/bookings/bookings.controller.ts
+++ b/apps/edr-passenger-api/src/modules/bookings/bookings.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, Param, Post, Patch, UseGuards, Query, Req } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post, Patch, UseGuards, Query, Req, BadRequestException } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth, ApiResponse, ApiQuery } from '@nestjs/swagger';
 import { BookingsService } from './bookings.service';
 import { GuestBookingService } from './guest-booking.service';
@@ -15,7 +15,7 @@ export class BookingsController {
     private guestService: GuestBookingService,
   ) {}
   
-  @Get('my/bookings')
+  @Get('my')
   @UseGuards(JwtGuard)
   @ApiBearerAuth('JWT-auth')
   @ApiOperation({ 
@@ -43,6 +43,34 @@ export class BookingsController {
       pageSize: pageSize ? parseInt(pageSize) : 20 
     });
   }
+
+  @Get('by-device')
+  @ApiOperation({ 
+    summary: 'Get bookings by device ID',
+    description: 'Returns all bookings associated with a device ID (for guest users). Includes saved passenger details and booking history.'
+  })
+  @ApiQuery({ name: 'deviceId', required: true, description: 'Device identifier' })
+  @ApiQuery({ name: 'search', required: false, description: 'Search by booking reference or station names' })
+  @ApiQuery({ name: 'status', required: false, description: 'Filter by booking status' })
+  @ApiQuery({ name: 'page', required: false, description: 'Page number' })
+  @ApiQuery({ name: 'pageSize', required: false, description: 'Items per page' })
+  @ApiResponse({ status: 200, description: 'List of guest bookings and saved passengers for device' })
+  @ApiResponse({ status: 400, description: 'Device ID is required' })
+  getByDevice(
+    @Query('deviceId') deviceId?: string,
+    @Query('search') search?: string,
+    @Query('status') status?: string,
+    @Query('page') page?: string,
+    @Query('pageSize') pageSize?: string,
+  ) {
+    if (!deviceId) throw new BadRequestException('Device ID is required');
+    return this.service.findByDeviceId(deviceId, { 
+      search, 
+      status, 
+      page: page ? parseInt(page) : 1, 
+      pageSize: pageSize ? parseInt(pageSize) : 20 
+    });
+  }
   
   @Get()
   @ApiOperation({ 
diff --git a/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts b/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts
index 256e974a7..58c7b6cea 100644
--- a/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts
+++ b/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts
@@ -102,6 +102,83 @@ export class BookingsService {
     };
   }
 
+  async findByDeviceId(deviceId: string, filters: BookingFilters = {}) {
+    const { search, status, page = 1, pageSize = 20 } = filters;
+    const skip = (page - 1) * pageSize;
+    
+    // Find user with this device ID
+    const device = await this.prisma.device.findUnique({
+      where: { id: deviceId },
+      include: { user: { include: { passenger: true } } },
+    }).catch(() => null);
+    
+    const searchConditions = search ? [
+      { bookingRef: { contains: search, mode: 'insensitive' } },
+      { schedule: { originStation: { name: { contains: search, mode: 'insensitive' } } } },
+      { schedule: { destinationStation: { name: { contains: search, mode: 'insensitive' } } } },
+    ] : [];
+    
+    const where: any = {
+      OR: [
+        { userAgent: deviceId },
+        ...(device?.user?.passenger ? [{ passengerId: device.user.passenger.id }] : []),
+      ],
+    };
+    
+    if (search) {
+      where.AND = [{ OR: searchConditions }];
+    }
+    
+    if (status) {
+      where.status = status;
+    }
+    
+    const [items, total] = await Promise.all([
+      this.prisma.booking.findMany({
+        where,
+        skip,
+        take: pageSize,
+        orderBy: { createdAt: 'desc' },
+        include: {
+          schedule: { include: { originStation: true, destinationStation: true, train: true } },
+          paymentIntent: true,
+          seats: { include: { seat: true } },
+        },
+      }),
+      this.prisma.booking.count({ where }),
+    ]);
+    
+    return {
+      items: items.map(booking => ({
+        id: booking.id,
+        bookingRef: booking.bookingRef,
+        status: booking.status,
+        totalMinor: booking.totalMinor,
+        currency: 'ETB',
+        displayCurrency: booking.displayCurrency,
+        displayTotalMinor: booking.displayTotalMinor,
+        adultCount: booking.adultCount,
+        childCount: booking.childCount,
+        createdAt: booking.createdAt,
+        schedule: {
+          train: booking.schedule.train,
+          originStation: booking.schedule.originStation,
+          destinationStation: booking.schedule.destinationStation,
+          departureAt: booking.schedule.departureAt,
+          arrivalAt: booking.schedule.arrivalAt,
+        },
+        paymentIntent: booking.paymentIntent,
+        seatCount: booking.seats.length,
+      })),
+      meta: {
+        page,
+        pageSize,
+        total,
+        totalPages: Math.ceil(total / pageSize),
+      },
+    };
+  }
+
   async findAll(filters: BookingFilters = {}) {
     const { search, status, page = 1, pageSize = 20 } = filters;
     const skip = (page - 1) * pageSize;
@@ -218,7 +295,6 @@ export class BookingsService {
       passengersData.push({ ...passenger, passengerName, dateOfBirth, category, verifaydaVerified, verifaydaData, nationality });
     }
 
-    // Use first passenger's nationality for fare lookup (or allow per-passenger pricing)
     const primaryNationality = passengersData[0]?.nationality;
     const baseFareMinor = await this.getBaseFare(dto.scheduleId, dto.seatClassId, segmentRoute, fullRoute, primaryNationality);
     const adultFareMinor = baseFareMinor * adultCount;
@@ -316,7 +392,7 @@ export class BookingsService {
       where: { bookingRef },
       include: {
         schedule: { include: { originStation: true, destinationStation: true, train: true } },
-        seats: { include: { seat: { include: { coach: { include: { seatClass: true } } } } } },
+        seats: { include: { seat: { include: { coach: true } } } },
         paymentIntent: true, ticket: true,
       },
     });
@@ -332,7 +408,7 @@ export class BookingsService {
         destination: { id: booking.schedule.destinationStation.id, name: booking.schedule.destinationStation.name, code: booking.schedule.destinationStation.code, city: booking.schedule.destinationStation.city },
         departureAt: booking.schedule.departureAt, arrivalAt: booking.schedule.arrivalAt,
       },
-      passengers: booking.seats.map((bs) => ({
+      passengers: booking.seats?.map((bs: any) => ({
         fullName: bs.passengerName, category: bs.passengerCategory, verifaydaVerified: bs.verifaydaVerified,
         seat: { number: bs.seat.label, coach: bs.seat.coach.label, class: bs.seat.coach.seatClass.name },
       })),
diff --git a/apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts b/apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts
index ef66c6be1..93cbda7b0 100644
--- a/apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts
+++ b/apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts
@@ -250,6 +250,7 @@ export class GuestBookingService {
         displayCurrency,
         displayTotalMinor,
         bookingType: 'ONE_WAY',
+        userAgent: dto.deviceId,
         // contactEmail: firstPassenger.email,  // Temporarily disabled until migration
         // contactPhone: firstPassenger.phone,  // Temporarily disabled until migration
         seats: {
diff --git a/apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts b/apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts
index e104a507f..1f9717c6a 100644
--- a/apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts
+++ b/apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts
@@ -35,7 +35,7 @@ export class DashboardService {
       upcomingTicket: upcomingBooking ? {
         ticketId: upcomingBooking.ticket?.id, bookingRef: upcomingBooking.bookingRef,
         from: upcomingBooking.schedule.originStation.name, to: upcomingBooking.schedule.destinationStation.name,
-        trainName: upcomingBooking.schedule.train.name, coachLabel: seat?.seat.coach.label, seatLabel: seat?.seat.label,
+        trainName: upcomingBooking.schedule.train.name, coachLabel: seat?.seat.coach.number, seatLabel: seat?.seat.seatNumber,
         departureAt: upcomingBooking.schedule.departureAt,
         punctualityLabel: (upcomingBooking.schedule.liveStatus?.delayMinutes ?? 0) > 0 ? 'DELAYED' : 'ON_TIME',
       } : null,
diff --git a/apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts b/apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts
index b0411718f..182709446 100644
--- a/apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts
+++ b/apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts
@@ -44,7 +44,7 @@ export class FareEngineService {
     if (!seatClass) throw new NotFoundException('Seat class not found');
     if (!seatClass.isActive) throw new BadRequestException('Seat class is not active');
 
-    const ratePerKmMinor = seatClass.basePrice;
+    const ratePerKmMinor = seatClass.baseFareMinor;
     const baseFarePerPassengerMinor = totalDistanceKm * ratePerKmMinor;
 
     const adultCount        = dto.adultCount ?? 1;
@@ -129,7 +129,7 @@ export class FareEngineService {
   ) {
     const seatClasses = await this.prisma.seatClass.findMany({
       where: { isActive: true },
-      orderBy: { basePrice: 'asc' },
+      orderBy: { baseFareMinor: 'asc' },
     });
 
     const results = await Promise.all(
@@ -172,7 +172,7 @@ export class FareEngineService {
     if (schedule.routeId) {
       const seatClasses = await this.prisma.seatClass.findMany({
         where: { isActive: true },
-        orderBy: { basePrice: 'asc' },
+        orderBy: { baseFareMinor: 'asc' },
       });
 
       const results = await Promise.all(
@@ -198,23 +198,25 @@ export class FareEngineService {
         validFrom: { lte: now },
         OR: [{ validUntil: null }, { validUntil: { gte: now } }],
       },
-      include: { seatClass: true },
-      orderBy: { seatClass: { basePrice: 'asc' } },
+      orderBy: [{ seatClass: { baseFareMinor: 'asc' } }],
     });
 
     if (fareRules.length > 0) {
       const billingCurrency = resolveCurrencyFromNationality(nationality);
       const exchangeRate = await this.currencyService.getExchangeRate(Currency.ETB, billingCurrency);
-      return fareRules.map(rule => ({
-        seatClassId: rule.seatClassId,
-        seatClassName: rule.seatClass.name,
-        baseFareMinor: rule.baseFareMinor,
-        totalMinor: rule.baseFareMinor,
-        billingCurrency,
-        totalInBillingCurrency: Math.round(rule.baseFareMinor * exchangeRate),
-        exchangeRate,
-        source: 'FARE_RULE',
-      }));
+      return fareRules.map(rule => {
+        const seatClassId = rule.seatClassId;
+        return {
+          seatClassId,
+          seatClassName: 'Unknown',
+          baseFareMinor: rule.baseFareMinor,
+          totalMinor: rule.baseFareMinor,
+          billingCurrency,
+          totalInBillingCurrency: Math.round(rule.baseFareMinor * exchangeRate),
+          exchangeRate,
+          source: 'FARE_RULE',
+        };
+      });
     }
 
     throw new BadRequestException(
diff --git a/apps/edr-passenger-api/src/modules/fleet/fleet.controller.ts b/apps/edr-passenger-api/src/modules/fleet/fleet.controller.ts
index e26fb2211..940978f88 100644
--- a/apps/edr-passenger-api/src/modules/fleet/fleet.controller.ts
+++ b/apps/edr-passenger-api/src/modules/fleet/fleet.controller.ts
@@ -1,7 +1,7 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Query, UseGuards } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth, ApiParam, ApiQuery, ApiBody, ApiResponse } from '@nestjs/swagger';
 import { FleetService } from './fleet.service';
-import { CreateTrainDto, CreateCoachDto, UpdateCoachDto, AssignCoachDto, CreateSeatBatchDto, ListCoachesDto } from './fleet.dto';
+import { CreateTrainDto, CreateCoachDto, UpdateCoachDto, AssignCoachDto, ListCoachesDto, CreateCoachTypeDto, UpdateCoachTypeDto, CreateClassDto, UpdateClassDto } from './fleet.dto';
 import { JwtGuard } from '../../common/jwt.guard';
 
 @ApiTags('Fleet')
@@ -11,16 +11,128 @@ import { JwtGuard } from '../../common/jwt.guard';
 export class FleetController {
   constructor(private service: FleetService) {}
 
+  // Coach Type Endpoints
+  @Get('coach-types')
+  @ApiOperation({ summary: 'List all coach types' })
+  @ApiResponse({ status: 200, description: 'Array of coach types' })
+  getCoachTypes() {
+    return this.service.getCoachTypes();
+  }
+
+  @Post('coach-types')
+  @ApiOperation({ summary: 'Create a coach type' })
+  @ApiBody({ type: CreateCoachTypeDto })
+  @ApiResponse({ status: 201, description: 'Coach type created' })
+  createCoachType(@Body() dto: CreateCoachTypeDto) {
+    return this.service.createCoachType(dto);
+  }
+
+  @Patch('coach-types/:id')
+  @ApiOperation({ summary: 'Update a coach type' })
+  @ApiParam({ name: 'id', description: 'Coach Type UUID' })
+  @ApiBody({ type: UpdateCoachTypeDto })
+  @ApiResponse({ status: 200, description: 'Coach type updated' })
+  @ApiResponse({ status: 404, description: 'Coach type not found' })
+  updateCoachType(@Param('id') id: string, @Body() dto: UpdateCoachTypeDto) {
+    return this.service.updateCoachType(id, dto);
+  }
+
+  @Delete('coach-types/:id')
+  @ApiOperation({ summary: 'Delete a coach type' })
+  @ApiParam({ name: 'id', description: 'Coach Type UUID' })
+  @ApiResponse({ status: 200, description: 'Coach type deleted' })
+  @ApiResponse({ status: 404, description: 'Coach type not found' })
+  deleteCoachType(@Param('id') id: string) {
+    return this.service.deleteCoachType(id);
+  }
+
+  // Class Endpoints
+  @Get('classes')
+  @ApiOperation({ summary: 'List all classes' })
+  @ApiQuery({ name: 'coachTypeId', required: false, description: 'Filter by coach type' })
+  @ApiResponse({ status: 200, description: 'Array of classes' })
+  getClasses(@Query('coachTypeId') coachTypeId?: string) {
+    return this.service.getClasses(coachTypeId);
+  }
+
+  @Post('classes')
+  @ApiOperation({ summary: 'Create a class' })
+  @ApiBody({ type: CreateClassDto })
+  @ApiResponse({ status: 201, description: 'Class created' })
+  createClass(@Body() dto: CreateClassDto) {
+    return this.service.createClass(dto);
+  }
+
+  @Patch('classes/:id')
+  @ApiOperation({ summary: 'Update a class' })
+  @ApiParam({ name: 'id', description: 'Class UUID' })
+  @ApiBody({ type: UpdateClassDto })
+  @ApiResponse({ status: 200, description: 'Class updated' })
+  @ApiResponse({ status: 404, description: 'Class not found' })
+  updateClass(@Param('id') id: string, @Body() dto: UpdateClassDto) {
+    return this.service.updateClass(id, dto);
+  }
+
+  @Delete('classes/:id')
+  @ApiOperation({ summary: 'Delete a class' })
+  @ApiParam({ name: 'id', description: 'Class UUID' })
+  @ApiResponse({ status: 200, description: 'Class deleted' })
+  @ApiResponse({ status: 404, description: 'Class not found' })
+  deleteClass(@Param('id') id: string) {
+    return this.service.deleteClass(id);
+  }
+
+  // Seat Class Endpoints (DEPRECATED - use Classes endpoints instead)
+  @Get('seat-classes')
+  @ApiOperation({ summary: 'List all classes (DEPRECATED - use /fleet/classes)' })
+  @ApiQuery({ name: 'coachTypeId', required: false, description: 'Filter by coach type' })
+  @ApiResponse({ status: 200, description: 'Array of classes' })
+  getSeatClasses(@Query('coachTypeId') coachTypeId?: string) {
+    return this.service.getClasses(coachTypeId);
+  }
+
+  @Post('seat-classes')
+  @ApiOperation({ summary: 'Create a class (DEPRECATED - use /fleet/classes)' })
+  @ApiBody({ type: CreateClassDto })
+  @ApiResponse({ status: 201, description: 'Class created' })
+  createSeatClass(@Body() dto: CreateClassDto) {
+    return this.service.createClass(dto);
+  }
+
+  @Patch('seat-classes/:id')
+  @ApiOperation({ summary: 'Update a class (DEPRECATED - use /fleet/classes)' })
+  @ApiParam({ name: 'id', description: 'Class UUID' })
+  @ApiBody({ type: UpdateClassDto })
+  @ApiResponse({ status: 200, description: 'Class updated' })
+  @ApiResponse({ status: 404, description: 'Class not found' })
+  updateSeatClass(@Param('id') id: string, @Body() dto: UpdateClassDto) {
+    return this.service.updateClass(id, dto);
+  }
+
+  @Delete('seat-classes/:id')
+  @ApiOperation({ summary: 'Delete a class (DEPRECATED - use /fleet/classes)' })
+  @ApiParam({ name: 'id', description: 'Class UUID' })
+  @ApiResponse({ status: 200, description: 'Class deleted' })
+  @ApiResponse({ status: 404, description: 'Class not found' })
+  deleteSeatClass(@Param('id') id: string) {
+    return this.service.deleteClass(id);
+  }
+
+  // Train Endpoints
   @Get('trains')
   @ApiOperation({ summary: 'List all trains with their recent schedules' })
-  @ApiResponse({ status: 200, description: 'Array of trains each with up to 5 most recent schedules' })
-  getTrains() { return this.service.getTrains(); }
+  @ApiResponse({ status: 200, description: 'Array of trains' })
+  getTrains() {
+    return this.service.getTrains();
+  }
 
   @Post('trains')
   @ApiOperation({ summary: 'Create a train service' })
   @ApiBody({ type: CreateTrainDto })
   @ApiResponse({ status: 201, description: 'Train created' })
-  createTrain(@Body() dto: CreateTrainDto) { return this.service.createTrain(dto); }
+  createTrain(@Body() dto: CreateTrainDto) {
+    return this.service.createTrain(dto);
+  }
 
   @Patch('trains/:id')
   @ApiOperation({ summary: 'Update a train service' })
@@ -28,96 +140,95 @@ export class FleetController {
   @ApiBody({ type: CreateTrainDto })
   @ApiResponse({ status: 200, description: 'Train updated' })
   @ApiResponse({ status: 404, description: 'Train not found' })
-  updateTrain(@Param('id') id: string, @Body() dto: CreateTrainDto) { return this.service.updateTrain(id, dto); }
-
-  @Get('coaches')
-  @ApiOperation({ summary: 'List coaches filtered by status, mode, seat class, or schedule assignment' })
-  @ApiQuery({ name: 'isActive', required: false, type: Boolean, description: 'true = active only, false = inactive only, omit = all' })
-  @ApiQuery({ name: 'mode', required: false, description: 'Filter by mode: seat | bed | convertible' })
-  @ApiQuery({ name: 'seatClassId', required: false, description: 'Filter by SeatClass UUID' })
-  @ApiQuery({ name: 'scheduleId', required: false, description: 'Filter to coaches assigned to this TrainSchedule UUID' })
-  @ApiResponse({ status: 200, description: 'Coaches with seat class info, assignment count, and seat status summary (total/available/held/booked/blocked)' })
-  listCoaches(
-    @Query('isActive') isActive?: string,
-    @Query('mode') mode?: string,
-    @Query('seatClassId') seatClassId?: string,
-    @Query('scheduleId') scheduleId?: string,
-  ) {
-    const dto: ListCoachesDto = {
-      isActive: isActive === 'true' ? true : isActive === 'false' ? false : undefined,
-      mode,
-      seatClassId,
-      scheduleId,
-    };
-    return this.service.listCoaches(dto);
+  updateTrain(@Param('id') id: string, @Body() dto: CreateTrainDto) {
+    return this.service.updateTrain(id, dto);
   }
 
-  @Get('coaches/:id')
-  @ApiOperation({ summary: 'Get a single coach with full seat layout and arrangement' })
-  @ApiParam({ name: 'id', description: 'Coach UUID' })
-  @ApiResponse({
-    status: 200,
-    description: `Coach detail including:
-- seatClass: seat class info
-- seatsByRow: seats grouped by row number, each seat includes label, seatNumber, col, kind (STANDARD/PREMIUM/ACCESSIBLE), status (AVAILABLE/HELD/BOOKED/BLOCKED), isWindow, isAisle, bedPosition (bed mode only), premiumFeeMinor
-- seatStatusSummary: total/available/held/booked/blocked counts
-- assignments: up to 5 most recent schedule assignments with origin/destination`,
-  })
-  @ApiResponse({ status: 404, description: 'Coach not found' })
-  getCoach(@Param('id') id: string) { return this.service.getCoach(id); }
-
-  @Post('coaches')
-  @ApiOperation({ summary: 'Register a new physical coach and auto-generate its seats from arrangement config' })
-  @ApiBody({ type: CreateCoachDto })
-  @ApiResponse({ status: 201, description: 'Coach created with seats auto-generated from mode + arrangement + totalUnits' })
-  @ApiResponse({ status: 400, description: 'Invalid arrangement format' })
-  createCoach(@Body() dto: CreateCoachDto) { return this.service.createCoach(dto); }
-
-  @Patch('coaches/:id')
-  @ApiOperation({ summary: 'Update coach properties (label, mode, arrangement, etc.)' })
-  @ApiParam({ name: 'id', description: 'Coach UUID' })
-  @ApiBody({ type: UpdateCoachDto })
-  @ApiResponse({ status: 200, description: 'Coach updated' })
-  @ApiResponse({ status: 404, description: 'Coach not found' })
-  updateCoach(@Param('id') id: string, @Body() dto: UpdateCoachDto) { return this.service.updateCoach(id, dto); }
-
   @Delete('trains/:id')
   @ApiOperation({ summary: 'Delete a train service' })
   @ApiParam({ name: 'id', description: 'Train UUID' })
   @ApiResponse({ status: 200, description: 'Train deleted' })
   @ApiResponse({ status: 404, description: 'Train not found' })
-  deleteTrain(@Param('id') id: string) { return this.service.deleteTrain(id); }
+  deleteTrain(@Param('id') id: string) {
+    return this.service.deleteTrain(id);
+  }
+
+  // Coach Endpoints
+  @Get('coaches')
+  @ApiOperation({ summary: 'List coaches with seat status summary' })
+  @ApiQuery({ name: 'status', required: false, description: 'Filter by status: ACTIVE, INACTIVE' })
+  @ApiQuery({ name: 'scheduleId', required: false, description: 'Filter coaches assigned to schedule' })
+  @ApiResponse({ status: 200, description: 'Array of coaches' })
+  listCoaches(
+    @Query('status') status?: string,
+    @Query('scheduleId') scheduleId?: string,
+  ) {
+    const dto: ListCoachesDto = {
+      status,
+      scheduleId,
+    };
+    return this.service.listCoaches(dto);
+  }
+
+  @Get('coaches/:id')
+  @ApiOperation({ summary: 'Get single coach with seat layout' })
+  @ApiParam({ name: 'id', description: 'Coach UUID' })
+  @ApiResponse({ status: 200, description: 'Coach detail with seats by row' })
+  @ApiResponse({ status: 404, description: 'Coach not found' })
+  getCoach(@Param('id') id: string) {
+    return this.service.getCoach(id);
+  }
+
+  @Post('coaches')
+  @ApiOperation({ summary: 'Create a coach with auto-generated seat numbers' })
+  @ApiBody({ type: CreateCoachDto })
+  @ApiResponse({ status: 201, description: 'Coach created' })
+  @ApiResponse({ status: 400, description: 'Invalid arrangement format' })
+  createCoach(@Body() dto: CreateCoachDto) {
+    return this.service.createCoach(dto);
+  }
+
+  @Patch('coaches/:id')
+  @ApiOperation({ summary: 'Update coach properties' })
+  @ApiParam({ name: 'id', description: 'Coach UUID' })
+  @ApiBody({ type: UpdateCoachDto })
+  @ApiResponse({ status: 200, description: 'Coach updated' })
+  @ApiResponse({ status: 404, description: 'Coach not found' })
+  updateCoach(@Param('id') id: string, @Body() dto: UpdateCoachDto) {
+    return this.service.updateCoach(id, dto);
+  }
 
   @Delete('coaches/:id')
   @ApiOperation({ summary: 'Delete a coach' })
   @ApiParam({ name: 'id', description: 'Coach UUID' })
   @ApiResponse({ status: 200, description: 'Coach deleted' })
   @ApiResponse({ status: 404, description: 'Coach not found' })
-  deleteCoach(@Param('id') id: string) { return this.service.deleteCoach(id); }
+  deleteCoach(@Param('id') id: string) {
+    return this.service.deleteCoach(id);
+  }
 
   @Post('assignments')
-  @ApiOperation({ summary: 'Assign a physical coach to a train schedule at a given position' })
+  @ApiOperation({ summary: 'Assign a coach to a schedule' })
   @ApiBody({ type: AssignCoachDto })
-  @ApiResponse({ status: 201, description: 'CoachAssignment created' })
+  @ApiResponse({ status: 201, description: 'Coach assigned' })
   @ApiResponse({ status: 404, description: 'Schedule or coach not found' })
-  assignCoach(@Body() dto: AssignCoachDto) { return this.service.assignCoach(dto); }
+  assignCoach(@Body() dto: AssignCoachDto) {
+    return this.service.assignCoach(dto);
+  }
 
   @Delete('assignments/:id')
-  @ApiOperation({ summary: 'Remove a coach assignment from a schedule' })
-  @ApiParam({ name: 'id', description: 'CoachAssignment UUID' })
+  @ApiOperation({ summary: 'Remove a coach assignment' })
+  @ApiParam({ name: 'id', description: 'Assignment UUID' })
   @ApiResponse({ status: 200, description: 'Assignment removed' })
   @ApiResponse({ status: 404, description: 'Assignment not found' })
-  removeAssignment(@Param('id') id: string) { return this.service.removeAssignment(id); }
-
-  @Post('seats/batch')
-  @ApiOperation({ summary: 'Batch-generate seats for a coach (rows × cols)' })
-  @ApiBody({ type: CreateSeatBatchDto })
-  @ApiResponse({ status: 201, description: 'Returns count of seats created' })
-  @ApiResponse({ status: 404, description: 'Coach not found' })
-  createSeatBatch(@Body() dto: CreateSeatBatchDto) { return this.service.createSeatBatch(dto); }
+  removeAssignment(@Param('id') id: string) {
+    return this.service.removeAssignment(id);
+  }
 
   @Get('analytics')
-  @ApiOperation({ summary: 'Fleet analytics: train count, schedule count, seat occupancy rate' })
-  @ApiResponse({ status: 200, description: 'Returns totalTrains, totalSchedules, totalSeats, bookedSeats, occupancyRate' })
-  getAnalytics() { return this.service.getAnalytics(); }
+  @ApiOperation({ summary: 'Fleet analytics and occupancy metrics' })
+  @ApiResponse({ status: 200, description: 'Occupancy statistics' })
+  getAnalytics() {
+    return this.service.getAnalytics();
+  }
 }
diff --git a/apps/edr-passenger-api/src/modules/fleet/fleet.dto.ts b/apps/edr-passenger-api/src/modules/fleet/fleet.dto.ts
index 6046b1068..d0875d79e 100644
--- a/apps/edr-passenger-api/src/modules/fleet/fleet.dto.ts
+++ b/apps/edr-passenger-api/src/modules/fleet/fleet.dto.ts
@@ -10,41 +10,57 @@ export class CreateTrainDto {
 }
 
 export class CreateCoachDto {
-  @ApiProperty({ example: 'C-A1', description: 'Unique physical coach identifier' }) @IsString() coachNumber: string;
-  @ApiProperty({ example: 'A', description: 'Display label shown on tickets' }) @IsString() label: string;
-  @ApiProperty({ example: 'seat-class-uuid', description: 'SeatClass UUID this coach belongs to' }) @IsString() seatClassId: string;
-  @ApiPropertyOptional({ example: 'sleeper', description: 'Coach type descriptor' }) @IsOptional() @IsString() coachType?: string;
-  @ApiPropertyOptional({ example: 'seat', description: 'seat | bed | convertible. Determines which arrangement field is used for seat generation.' }) @IsOptional() @IsString() mode?: string;
-  @ApiPropertyOptional({ example: '2+2', description: 'Seat arrangement for seat/convertible mode. Format: groups separated by +, e.g. "2+2" (4 cols: A/B aisle C/D) or "1+2+1". Used to derive columns, window and aisle flags. Required when mode=seat and totalUnits>0.' }) @IsOptional() @IsString() seatArrangement?: string;
-  @ApiPropertyOptional({ example: '2+2', description: 'Bed arrangement for bed mode. First number = tiers per berth: 2 → lower/upper, 3 → lower/middle/upper. E.g. "2+2" = 2-tier berths. Required when mode=bed and totalUnits>0.' }) @IsOptional() @IsString() bedArrangement?: string;
-  @ApiPropertyOptional({ example: 60, description: 'Total seat/bed units. When >0, seats are auto-generated from the arrangement on coach creation.' }) @IsOptional() @IsInt() totalUnits?: number;
+  @ApiProperty({ example: 'A-001', description: 'Unique coach number' }) @IsString() number: string;
+  @ApiProperty({ example: 'coach-type-uuid', description: 'Coach Type UUID' }) @IsString() coachTypeId: string;
+  @ApiProperty({ example: '2+2', description: 'Seat arrangement (e.g., "2+2", "3+2")' }) @IsString() arrangement: string;
+  @ApiProperty({ example: 60, description: 'Total seat capacity' }) @IsInt() capacity: number;
+  @ApiPropertyOptional({ example: 'ACTIVE', description: 'Status: ACTIVE, INACTIVE' }) @IsOptional() @IsString() status?: string;
 }
 
-export class UpdateCoachDto extends PartialType(OmitType(CreateCoachDto, ['coachNumber'] as const)) {}
+export class UpdateCoachDto extends PartialType(OmitType(CreateCoachDto, ['number'] as const)) {}
 
 export class AssignCoachDto {
   @ApiProperty({ example: 'schedule-uuid', description: 'TrainSchedule UUID' }) @IsString() scheduleId: string;
   @ApiProperty({ example: 'coach-uuid', description: 'Coach UUID' }) @IsString() coachId: string;
-  @ApiProperty({ example: 1, description: 'Position in the train consist (1 = first coach)' }) @IsInt() positionNumber: number;
-  @ApiPropertyOptional({ example: true, description: 'Whether this coach is operational for this schedule' }) @IsOptional() @IsBoolean() isOperational?: boolean;
-}
-
-export class CreateSeatBatchDto {
-  @ApiProperty({ example: 'coach-uuid', description: 'Coach UUID to generate seats for' }) @IsString() coachId: string;
-  @ApiProperty({ example: 15, description: 'Number of rows to generate' }) @IsInt() rows: number;
-  @ApiProperty({ example: ['A', 'B', 'C', 'D'], type: [String], description: 'Column labels per row' }) @IsArray() @IsString({ each: true }) cols: string[];
+  @ApiProperty({ example: 1, description: 'Position in the train consist' }) @IsInt() positionNumber: number;
+  @ApiPropertyOptional({ example: true, description: 'Whether this coach is operational' }) @IsOptional() @IsBoolean() isOperational?: boolean;
 }
 
 export class ListCoachesDto {
-  @ApiPropertyOptional({ example: true, description: 'Filter by active/inactive status. Omit to return all.' })
-  @IsOptional() @IsBoolean() isActive?: boolean;
+  @ApiPropertyOptional({ example: 'ACTIVE', description: 'Filter by status: ACTIVE, INACTIVE' })
+  @IsOptional() @IsString() status?: string;
 
-  @ApiPropertyOptional({ example: 'seat', description: 'Filter by mode: seat | bed | convertible' })
-  @IsOptional() @IsString() mode?: string;
-
-  @ApiPropertyOptional({ example: 'seat-class-uuid', description: 'Filter by SeatClass UUID' })
-  @IsOptional() @IsString() seatClassId?: string;
-
-  @ApiPropertyOptional({ example: 'schedule-uuid', description: 'Filter to coaches assigned to this TrainSchedule UUID' })
+  @ApiPropertyOptional({ example: 'schedule-uuid', description: 'Filter coaches assigned to this schedule' })
   @IsOptional() @IsString() scheduleId?: string;
 }
+
+// Legacy DTO types for backward compatibility
+export class CreateCoachTypeDto {
+  @ApiProperty({ example: 'sleeper' }) @IsString() code: string;
+  @ApiProperty({ example: 'Sleeper Coach' }) @IsString() name: string;
+  @IsOptional() @IsString() type?: string;
+}
+
+export class UpdateCoachTypeDto {
+  @ApiPropertyOptional({ example: 'sleeper' }) @IsOptional() @IsString() code?: string;
+  @ApiPropertyOptional({ example: 'Sleeper Coach' }) @IsOptional() @IsString() name?: string;
+  @ApiPropertyOptional({ example: 'sleeper' }) @IsOptional() @IsString() type?: string;
+}
+
+export class CreateClassDto {
+  @ApiProperty({ example: 'coach-type-uuid' }) @IsString() coachTypeId: string;
+  @ApiProperty({ example: 'Economy' }) @IsString() name: string;
+  @IsOptional() @IsString() description?: string;
+  @ApiProperty({ example: 5000 }) @IsInt() baseFareMinor: number;
+}
+
+export class UpdateClassDto {
+  @ApiPropertyOptional({ example: 'coach-type-uuid' }) @IsOptional() @IsString() coachTypeId?: string;
+  @ApiPropertyOptional({ example: 'Economy' }) @IsOptional() @IsString() name?: string;
+  @ApiPropertyOptional() @IsOptional() @IsString() description?: string;
+  @ApiPropertyOptional({ example: 5000 }) @IsOptional() @IsInt() baseFareMinor?: number;
+  @ApiPropertyOptional({ example: true })
+  @IsOptional()
+  @IsBoolean()
+  isActive?: boolean;
+}
diff --git a/apps/edr-passenger-api/src/modules/fleet/fleet.service.ts b/apps/edr-passenger-api/src/modules/fleet/fleet.service.ts
index daea3a9dd..043a3531b 100644
--- a/apps/edr-passenger-api/src/modules/fleet/fleet.service.ts
+++ b/apps/edr-passenger-api/src/modules/fleet/fleet.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException, BadRequestException } from '@nestjs/common';
 import { PrismaService } from '../../common/prisma.service';
-import { CreateTrainDto, CreateCoachDto, UpdateCoachDto, AssignCoachDto, CreateSeatBatchDto, ListCoachesDto } from './fleet.dto';
+import { CreateTrainDto, CreateCoachDto, UpdateCoachDto, AssignCoachDto, ListCoachesDto, CreateCoachTypeDto, UpdateCoachTypeDto, CreateClassDto, UpdateClassDto } from './fleet.dto';
 import { SeatKind } from '@prisma/client';
 
 // Parses '2+2' → [2, 2], '2+2+2' → [2, 2, 2]
@@ -8,22 +8,20 @@ function parseArrangement(arrangement: string): number[] {
   return arrangement.split('+').map((n) => parseInt(n, 10));
 }
 
-// Derives column labels from a seat-mode arrangement string.
-// '2+2' → ['A','B','C','D']  (A/D window, B/C aisle)
-// '1+2+1' → ['A','B','C','D']
+// Derives column labels from arrangement: '2+2' → ['A','B','C','D']
 function seatCols(arrangement: string): string[] {
   const groups = parseArrangement(arrangement);
   const total = groups.reduce((s, n) => s + n, 0);
-  return Array.from({ length: total }, (_, i) => String.fromCharCode(65 + i)); // A, B, C …
+  return Array.from({ length: total }, (_, i) => String.fromCharCode(65 + i));
 }
 
-// Returns true if the column index is a window seat given the arrangement groups.
+// Returns true if column is a window seat
 function isWindowCol(colIndex: number, groups: number[]): boolean {
   const total = groups.reduce((s, n) => s + n, 0);
   return colIndex === 0 || colIndex === total - 1;
 }
 
-// Returns true if the column index is an aisle seat.
+// Returns true if column is an aisle seat
 function isAisleCol(colIndex: number, groups: number[]): boolean {
   let cursor = 0;
   for (const g of groups) {
@@ -35,82 +33,188 @@ function isAisleCol(colIndex: number, groups: number[]): boolean {
   return false;
 }
 
-// Bed positions for a given tier count: 2 → lower/upper, 3 → lower/middle/upper
-const BED_POSITIONS: Record<number, string[]> = {
-  2: ['lower', 'upper'],
-  3: ['lower', 'middle', 'upper'],
-};
-
-type SeatRow = {
-  coachId: string;
-  row: number;
-  col: string;
-  label: string;
-  seatNumber: string;
-  kind: SeatKind;
-  isWindow: boolean;
-  isAisle: boolean;
-  bedPosition?: string;
-};
-
-function buildSeatSeats(coachId: string, coachLabel: string, arrangement: string, totalUnits: number): SeatRow[] {
+function buildSeats(coachId: string, coachNumber: string, arrangement: string, capacity: number, seatClass?: string): SeatRow[] {
   const cols = seatCols(arrangement);
   const groups = parseArrangement(arrangement);
   const seats: SeatRow[] = [];
   let row = 1;
-  while (seats.length < totalUnits) {
-    for (let ci = 0; ci < cols.length && seats.length < totalUnits; ci++) {
+  let seatNumber = 1;
+  let seatIndex = 0;
+  const isBedCoach = seatClass?.toLowerCase().includes('bed');
+  const totalCols = cols.length;
+
+  while (seatIndex < capacity) {
+    for (let ci = 0; ci < cols.length && seatIndex < capacity; ci++) {
       const col = cols[ci];
+      let bedPosition = null;
+
+      // Set bedPosition for bed coaches based on seat number cycling
+      if (isBedCoach) {
+        if (totalCols === 3) {
+          // Economy bed (3 levels): 1L, 2M, 3U, 4L, 5M, 6U...
+          const posMod = ((seatNumber - 1) % 3);
+          if (posMod === 0) bedPosition = 'lower';
+          else if (posMod === 1) bedPosition = 'middle';
+          else if (posMod === 2) bedPosition = 'upper';
+        } else if (totalCols === 2) {
+          // VIP bed (2 levels): 1L, 2U, 3L, 4U...
+          const posMod = ((seatNumber - 1) % 2);
+          if (posMod === 0) bedPosition = 'lower';
+          else if (posMod === 1) bedPosition = 'upper';
+        }
+      }
+
       seats.push({
-        coachId, row, col,
-        label: `${row}${col}`,
-        seatNumber: `${coachLabel}${row}${col}`,
+        coachId,
+        row,
+        col,
+        seatNumber: `${seatNumber}`,
         kind: SeatKind.STANDARD,
-        isWindow: isWindowCol(ci, groups),
-        isAisle: isAisleCol(ci, groups),
+        bedPosition,
       });
+      seatNumber++;
+      seatIndex++;
     }
     row++;
   }
   return seats;
 }
 
-function buildBedSeats(coachId: string, coachLabel: string, arrangement: string, totalUnits: number): SeatRow[] {
-  // arrangement for beds describes tiers per berth, e.g. '2+2' = 2 lower+upper on each side
-  // Each compartment number is the row; each tier is the col (L=lower, M=middle, U=upper)
-  const groups = parseArrangement(arrangement);
-  const tiersPerSide = groups[0]; // e.g. 2 → lower+upper
-  const positions = BED_POSITIONS[tiersPerSide] ?? ['lower', 'upper'];
-  const tierCols = positions.map((_, i) => String.fromCharCode(65 + i)); // A=lower, B=upper, C=middle
-  const seats: SeatRow[] = [];
-  let compartment = 1;
-  while (seats.length < totalUnits) {
-    for (let ti = 0; ti < tierCols.length && seats.length < totalUnits; ti++) {
-      const col = tierCols[ti];
-      seats.push({
-        coachId, row: compartment, col,
-        label: `${compartment}${col}`,
-        seatNumber: `${coachLabel}${compartment}${col}`,
-        kind: SeatKind.STANDARD,
-        isWindow: false,
-        isAisle: false,
-        bedPosition: positions[ti],
-      });
-    }
-    compartment++;
-  }
-  return seats;
-}
+type SeatRow = {
+  coachId: string;
+  row: number;
+  col: string;
+  seatNumber: string;
+  kind: SeatKind;
+  bedPosition?: string | null;
+};
 
 @Injectable()
 export class FleetService {
   constructor(private prisma: PrismaService) {}
 
+  async createCoachType(dto: CreateCoachTypeDto) {
+    return this.prisma.coachType.create({
+      data: {
+        code: dto.code,
+        name: dto.name,
+        type: dto.type || 'passenger',
+      },
+      include: {
+        seatClasses: true,
+        coaches: true,
+      },
+    });
+  }
+
+  async getCoachTypes() {
+    return this.prisma.coachType.findMany({
+      include: {
+        seatClasses: true,
+        coaches: true,
+      },
+      orderBy: { createdAt: 'desc' },
+    });
+  }
+
+  async updateCoachType(id: string, dto: UpdateCoachTypeDto) {
+    const coachType = await this.prisma.coachType.findUnique({ where: { id } });
+    if (!coachType) throw new NotFoundException('Coach type not found');
+    
+    const data: any = {};
+    if (dto.code !== undefined) data.code = dto.code;
+    if (dto.name !== undefined) data.name = dto.name;
+    if (dto.type !== undefined) data.type = dto.type;
+    
+    return this.prisma.coachType.update({
+      where: { id },
+      data,
+      include: {
+        seatClasses: true,
+        coaches: true,
+      },
+    });
+  }
+
+  async deleteCoachType(id: string) {
+    const coachType = await this.prisma.coachType.findUnique({ where: { id } });
+    if (!coachType) throw new NotFoundException('Coach type not found');
+    
+    return this.prisma.coachType.delete({ where: { id } });
+  }
+
+  async createClass(dto: CreateClassDto) {
+    return this.prisma.seatClass.create({
+      data: {
+        coachTypeId: dto.coachTypeId,
+        name: dto.name,
+        description: dto.description,
+        baseFareMinor: dto.baseFareMinor,
+      },
+    });
+  }
+
+  async getClasses(coachTypeId?: string) {
+    const where = coachTypeId ? { coachTypeId } : {};
+    return this.prisma.seatClass.findMany({
+      where,
+      include: { coachType: true },
+      orderBy: { createdAt: 'desc' },
+    });
+  }
+
+  async updateClass(id: string, dto: UpdateClassDto) {
+    const seatClass = await this.prisma.seatClass.findUnique({ where: { id } });
+    if (!seatClass) throw new NotFoundException('Seat class not found');
+    
+    const updateData: any = {
+      coachTypeId: dto.coachTypeId,
+      name: dto.name,
+      description: dto.description,
+      baseFareMinor: dto.baseFareMinor,
+    };
+    
+    if (dto.isActive !== undefined) {
+      updateData.isActive = dto.isActive;
+    }
+    
+    return this.prisma.seatClass.update({
+      where: { id },
+      data: updateData,
+      include: { coachType: true },
+    });
+  }
+
+  async deleteClass(id: string) {
+    const seatClass = await this.prisma.seatClass.findUnique({ where: { id } });
+    if (!seatClass) throw new NotFoundException('Seat class not found');
+    
+    return this.prisma.seatClass.delete({ where: { id } });
+  }
+
+  createSeatClass(dto: CreateClassDto) {
+    return this.createClass(dto);
+  }
+
+  getSeatClasses(coachTypeId?: string) {
+    return this.getClasses(coachTypeId);
+  }
+
+  async updateSeatClass(id: string, dto: UpdateClassDto) {
+    return this.updateClass(id, dto);
+  }
+
+  async deleteSeatClass(id: string) {
+    return this.deleteClass(id);
+  }
+
   getTrains() {
     return this.prisma.train.findMany({ include: { schedules: { take: 5, orderBy: { departureAt: 'desc' } } } });
   }
 
-  createTrain(dto: CreateTrainDto) { return this.prisma.train.create({ data: dto }); }
+  createTrain(dto: CreateTrainDto) {
+    return this.prisma.train.create({ data: dto });
+  }
 
   async updateTrain(id: string, dto: CreateTrainDto) {
     const train = await this.prisma.train.findUnique({ where: { id } });
@@ -118,120 +222,112 @@ export class FleetService {
     return this.prisma.train.update({ where: { id }, data: dto });
   }
 
-  async getCoach(id: string) {
-    const coach = await this.prisma.coach.findUnique({
-      where: { id },
-      include: {
-        seatClass: true,
-        seats: {
-          orderBy: [{ row: 'asc' }, { col: 'asc' }],
-        },
-        assignments: {
-          include: { schedule: { include: { originStation: true, destinationStation: true } } },
-          orderBy: { schedule: { departureAt: 'desc' } },
-          take: 5,
-        },
-        _count: { select: { seats: true, assignments: true } },
-      },
-    });
-    if (!coach) throw new NotFoundException('Coach not found');
-
-    // Group seats by row to reflect the physical arrangement layout
-    const rowMap = new Map<number, typeof coach.seats>();
-    for (const seat of coach.seats) {
-      if (!rowMap.has(seat.row)) rowMap.set(seat.row, []);
-      rowMap.get(seat.row)!.push(seat);
-    }
-
-    const seatsByRow = Array.from(rowMap.entries()).map(([row, seats]) => ({ row, seats }));
-
-    const seatStatusSummary = {
-      total:     coach.seats.length,
-      available: coach.seats.filter(s => s.status === 'AVAILABLE').length,
-      held:      coach.seats.filter(s => s.status === 'HELD').length,
-      booked:    coach.seats.filter(s => s.status === 'BOOKED').length,
-      blocked:   coach.seats.filter(s => s.status === 'BLOCKED').length,
-    };
-
-    const { seats, ...coachData } = coach;
-    return { ...coachData, seatsByRow, seatStatusSummary };
-  }
-
-  async listCoaches(dto: ListCoachesDto) {
-    const where: any = {};
-    if (dto.isActive !== undefined) where.isActive = dto.isActive;
-    if (dto.mode) where.mode = dto.mode;
-    if (dto.seatClassId) where.seatClassId = dto.seatClassId;
-    if (dto.scheduleId) where.assignments = { some: { scheduleId: dto.scheduleId } };
-
-    const coaches = await this.prisma.coach.findMany({
-      where,
-      include: {
-        seatClass: true,
-        seats: { select: { status: true } },
-        _count: { select: { seats: true, assignments: true } },
-      },
-      orderBy: [{ isActive: 'desc' }, { label: 'asc' }],
-    });
-
-    return coaches.map(({ seats, ...coach }) => ({
-      ...coach,
-      seatStatusSummary: {
-        total: seats.length,
-        available: seats.filter(s => s.status === 'AVAILABLE').length,
-        held:      seats.filter(s => s.status === 'HELD').length,
-        booked:    seats.filter(s => s.status === 'BOOKED').length,
-        blocked:   seats.filter(s => s.status === 'BLOCKED').length,
-      },
-    }));
-  }
-
-  async createCoach(dto: CreateCoachDto) {
-    const mode = dto.mode ?? 'seat';
-    const totalUnits = dto.totalUnits ?? 0;
-
-    const isBed = mode === 'bed';
-    const arrangement = isBed
-      ? (dto.bedArrangement ?? dto.seatArrangement ?? '2+2')
-      : (dto.seatArrangement ?? '2+2');
-
-    if (totalUnits > 0) {
-      const groups = parseArrangement(arrangement);
-      if (groups.some(isNaN)) {
-        throw new BadRequestException(`Invalid arrangement format "${arrangement}". Use e.g. "2+2" or "2+2+2"`);
-      }
-    }
-
-    const coach = await this.prisma.coach.create({ data: dto });
-
-    if (totalUnits > 0) {
-      const seats = isBed
-        ? buildBedSeats(coach.id, coach.label, arrangement, totalUnits)
-        : buildSeatSeats(coach.id, coach.label, arrangement, totalUnits);
-      await this.prisma.seat.createMany({ data: seats, skipDuplicates: true });
-    }
-
-    return this.prisma.coach.findUnique({
-      where: { id: coach.id },
-      include: { seatClass: true, _count: { select: { seats: true } } },
-    });
-  }
-
-  async updateCoach(id: string, dto: UpdateCoachDto) {
-    const coach = await this.prisma.coach.findUnique({ where: { id } });
-    if (!coach) throw new NotFoundException('Coach not found');
-    return this.prisma.coach.update({ where: { id }, data: dto });
-  }
-
   async deleteTrain(id: string) {
     const train = await this.prisma.train.findUnique({ where: { id } });
     if (!train) throw new NotFoundException('Train not found');
     return this.prisma.train.delete({ where: { id } });
   }
 
+  async getCoach(id: string) {
+    const coach = await this.prisma.coach.findUnique({
+      where: { id },
+      include: {
+        coachType: true,
+        seats: { orderBy: [{ row: 'asc' }, { col: 'asc' }] },
+        assignments: {
+          include: { schedule: { include: { originStation: true, destinationStation: true } } },
+          orderBy: { schedule: { departureAt: 'desc' } },
+          take: 5,
+        },
+      },
+    });
+    if (!coach) throw new NotFoundException('Coach not found');
+    return coach;
+  }
+
+  async listCoaches(dto: ListCoachesDto) {
+    const where: any = {};
+    if (dto.status) where.status = dto.status;
+    if (dto.scheduleId) where.assignments = { some: { scheduleId: dto.scheduleId } };
+
+    return this.prisma.coach.findMany({
+      where,
+      include: { coachType: true },
+      orderBy: { number: 'asc' },
+    });
+  }
+
+  async createCoach(dto: CreateCoachDto) {
+    const groups = parseArrangement(dto.arrangement);
+    if (groups.some(isNaN)) {
+      throw new BadRequestException(`Invalid arrangement format "${dto.arrangement}". Use e.g. "2+2"`);
+    }
+
+    const coach = await this.prisma.coach.create({
+      data: {
+        coachTypeId: dto.coachTypeId,
+        number: dto.number,
+        arrangement: dto.arrangement,
+        capacity: dto.capacity,
+        status: dto.status || 'ACTIVE',
+      },
+      include: { coachType: true },
+    });
+
+    if (dto.capacity > 0) {
+      const seatClass = coach.coachType?.name || '';
+      const seats = buildSeats(coach.id, coach.number, dto.arrangement, dto.capacity, seatClass);
+      await this.prisma.seat.createMany({ data: seats });
+    }
+
+    return coach;
+  }
+
+  async updateCoach(id: string, dto: UpdateCoachDto) {
+    const coach = await this.prisma.coach.findUnique({ where: { id } });
+    if (!coach) throw new NotFoundException('Coach not found');
+    
+    return this.prisma.coach.update({ 
+      where: { id }, 
+      data: {
+        arrangement: dto.arrangement,
+        capacity: dto.capacity,
+        status: dto.status,
+      },
+      include: { coachType: true },
+    });
+  }
+
   async deleteCoach(id: string) {
     const coach = await this.prisma.coach.findUnique({ where: { id } });
     if (!coach) throw new NotFoundException('Coach not found');
+    
+    // Get all seat IDs for this coach
+    const seats = await this.prisma.seat.findMany({ where: { coachId: id }, select: { id: true } });
+    const seatIds = seats.map(s => s.id);
+    
+    // Delete in order of foreign key dependencies
+    if (seatIds.length > 0) {
+      // 1. Delete seat blocks (references seats)
+      await this.prisma.seatBlock.deleteMany({ where: { seatId: { in: seatIds } } });
+      
+      // 2. Delete ticket seats (references seats)
+      await this.prisma.ticketSeat.deleteMany({ where: { seatId: { in: seatIds } } });
+      
+      // 3. Delete booking seats (references seats)
+      await this.prisma.bookingSeat.deleteMany({ where: { seatId: { in: seatIds } } });
+      
+      // 4. Delete journey segments with these seats
+      await this.prisma.journeySegment.deleteMany({ where: { seatId: { in: seatIds } } });
+    }
+    
+    // 5. Delete all associated seats
+    await this.prisma.seat.deleteMany({ where: { coachId: id } });
+    
+    // 6. Delete coach assignments
+    await this.prisma.coachAssignment.deleteMany({ where: { coachId: id } });
+    
+    // 7. Finally delete the coach
     return this.prisma.coach.delete({ where: { id } });
   }
 
@@ -251,19 +347,6 @@ export class FleetService {
     return this.prisma.coachAssignment.delete({ where: { id } });
   }
 
-  async createSeatBatch(dto: CreateSeatBatchDto) {
-    const coach = await this.prisma.coach.findUnique({ where: { id: dto.coachId } });
-    if (!coach) throw new NotFoundException('Coach not found');
-    const seats = [];
-    for (let row = 1; row <= dto.rows; row++) {
-      for (const col of dto.cols) {
-        seats.push({ coachId: dto.coachId, row, col, label: `${row}${col}`, seatNumber: `${coach.label}${row}${col}` });
-      }
-    }
-    await this.prisma.seat.createMany({ data: seats, skipDuplicates: true });
-    return { created: seats.length };
-  }
-
   async getAnalytics() {
     const [totalTrains, totalSchedules, totalSeats, bookedSeats] = await Promise.all([
       this.prisma.train.count(),
@@ -271,6 +354,12 @@ export class FleetService {
       this.prisma.seat.count(),
       this.prisma.seat.count({ where: { status: 'BOOKED' } }),
     ]);
-    return { totalTrains, totalSchedules, totalSeats, bookedSeats, occupancyRate: totalSeats > 0 ? +((bookedSeats / totalSeats) * 100).toFixed(2) : 0 };
+    return {
+      totalTrains,
+      totalSchedules,
+      totalSeats,
+      bookedSeats,
+      occupancyRate: totalSeats > 0 ? +((bookedSeats / totalSeats) * 100).toFixed(2) : 0,
+    };
   }
 }
diff --git a/apps/edr-passenger-api/src/modules/passengers/passengers.service.ts b/apps/edr-passenger-api/src/modules/passengers/passengers.service.ts
index 8864a6363..39fd235a4 100644
--- a/apps/edr-passenger-api/src/modules/passengers/passengers.service.ts
+++ b/apps/edr-passenger-api/src/modules/passengers/passengers.service.ts
@@ -92,22 +92,22 @@ export class PassengersService {
   }
 
   async getProfile(passengerId: string) {
-    const p = await this.prisma.passenger.findUnique({
+    const passenger = await this.prisma.passenger.findUnique({
       where: { id: passengerId },
       include: {
         user: { select: { fullName: true, email: true, phone: true } },
-        bookings: { orderBy: { createdAt: 'desc' }, take: 10, include: { schedule: { include: { originStation: true, destinationStation: true, train: true } }, seats: { include: { seat: { include: { coach: { include: { seatClass: true } } } } } } } },
+        bookings: { orderBy: { createdAt: 'desc' }, take: 10, include: { schedule: { include: { originStation: true, destinationStation: true, train: true } }, seats: { include: { seat: { include: { coach: true } } } } } },
         loyalty: true, wallet: true, travelerProfiles: true, savedRoutes: true,
       },
     });
-    if (!p) throw new NotFoundException('Passenger not found');
+    if (!passenger) throw new NotFoundException('Passenger not found');
     return {
-      id: p.id,
-      fullName: p.user.fullName,
-      email: p.user.email,
-      phone: p.user.phone,
-      createdAt: p.createdAt,
-      bookings: p.bookings.map((b) => ({
+      id: passenger.id,
+      fullName: passenger.user.fullName,
+      email: passenger.user.email,
+      phone: passenger.user.phone,
+      createdAt: passenger.createdAt,
+      bookings: passenger.bookings.map((b) => ({
         id: b.id, bookingRef: b.bookingRef, status: b.status, totalFare: b.totalMinor / 100, createdAt: b.createdAt,
         trip: {
           number: b.schedule.train.number,
@@ -115,7 +115,7 @@ export class PassengersService {
           destination: { id: b.schedule.destinationStation.id, name: b.schedule.destinationStation.name, code: b.schedule.destinationStation.code, city: b.schedule.destinationStation.city },
           departureAt: b.schedule.departureAt,
         },
-        passengers: b.seats.map((bs) => ({ fullName: bs.passengerName, seat: { number: bs.seat.label, coach: bs.seat.coach.label, class: bs.seat.coach.seatClass?.name ?? 'N/A' } })),
+        passengers: b.seats.map((bs) => ({ fullName: bs.passengerName, seat: { number: bs.seat.seatNumber, coach: bs.seat.coach.number, class: 'N/A' } })),
       })),
     };
   }
@@ -207,7 +207,6 @@ export class PassengersService {
     const isLoggedIn = !!dto.userId;
     let verifiedData: any = null;
 
-    // Auto-verify Ethiopian passengers with national ID if Fayda is enabled
     if (isEthiopian && dto.verifyWithFayda !== false) {
       try {
         const verification = await this.verifaydaService.verifyNationalId(dto.nationalId!);
@@ -215,12 +214,10 @@ export class PassengersService {
           verifiedData = verification.passengerData;
         }
       } catch (error) {
-        // If verification fails, continue with manual data
         console.warn('Fayda verification failed, using manual data:', error);
       }
     }
 
-    // Use verified data if available, otherwise use provided data
     const finalData = {
       passengerName: verifiedData?.fullName || dto.passengerName,
       dateOfBirth: verifiedData?.dateOfBirth || new Date(dto.dateOfBirth),
@@ -230,7 +227,6 @@ export class PassengersService {
       email: dto.email,
     };
 
-    // If logged in, update user profile and link passenger
     if (isLoggedIn) {
       const user = await this.prisma.user.findUnique({
         where: { id: dto.userId },
@@ -241,7 +237,6 @@ export class PassengersService {
         throw new BadRequestException('User not found');
       }
 
-      // Update user record if not already verified
       if (!user.faydaVerified && verifiedData) {
         await this.prisma.user.update({
           where: { id: dto.userId },
@@ -267,7 +262,6 @@ export class PassengersService {
       };
     }
 
-    // Guest user - save to SavedPassengerProfile
     const profile = await this.prisma.savedPassengerProfile.create({
       data: {
         deviceId: dto.deviceId,
@@ -318,4 +312,4 @@ export class PassengersService {
       affectedModules: usage,
     };
   }
-}
\ No newline at end of file
+}
diff --git a/apps/edr-passenger-api/src/modules/payments/internal-payments.controller.ts b/apps/edr-passenger-api/src/modules/payments/internal-payments.controller.ts
new file mode 100644
index 000000000..98262c4c3
--- /dev/null
+++ b/apps/edr-passenger-api/src/modules/payments/internal-payments.controller.ts
@@ -0,0 +1,35 @@
+import {
+  Body,
+  Controller,
+  HttpCode,
+  HttpStatus,
+  Post,
+  UseGuards,
+} from "@nestjs/common";
+import { ApiOperation, ApiTags } from "@nestjs/swagger";
+import { ServiceAuthGuard } from "../../common/guards/service-auth.guard";
+import { PaymentEventDto, MarkPaidResponseDto } from "./internal-payments.dto";
+import { PaymentsService } from "./payments.service";
+
+/**
+ * Consumer side of the payment microservice's outbox relay (docs/payment-service §7.3).
+ * Only the payment service may call this (shared service token). Idempotent by design:
+ * the relay delivers at-least-once, so duplicates must be harmless. Becomes a queue
+ * consumer when RabbitMQ lands — the handler logic is transport-agnostic.
+ */
+@ApiTags("Internal Payments")
+@UseGuards(ServiceAuthGuard)
+@Controller("internal/payments")
+export class InternalPaymentsController {
+  constructor(private readonly paymentsService: PaymentsService) {}
+
+  @Post("mark-paid")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary:
+      "Apply a payment.succeeded/payment.failed event from the payment service (idempotent)",
+  })
+  async markPaid(@Body() event: PaymentEventDto): Promise<MarkPaidResponseDto> {
+    return this.paymentsService.handlePaymentEvent(event);
+  }
+}
diff --git a/apps/edr-passenger-api/src/modules/payments/internal-payments.dto.ts b/apps/edr-passenger-api/src/modules/payments/internal-payments.dto.ts
new file mode 100644
index 000000000..7f732ae51
--- /dev/null
+++ b/apps/edr-passenger-api/src/modules/payments/internal-payments.dto.ts
@@ -0,0 +1,57 @@
+import {
+  IsEnum,
+  IsIn,
+  IsInt,
+  IsISO8601,
+  IsOptional,
+  IsPositive,
+  IsString,
+  IsUUID,
+} from "class-validator";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import {
+  PaymentEventType,
+  PaymentReferenceType,
+  PaymentService,
+  ProviderMethod,
+} from "@edr/types";
+
+/**
+ * Wire shape of the `PaymentEvent` envelope (@edr/types) delivered by the payment
+ * microservice's outbox relay. Delivery is at-least-once — the consumer is idempotent.
+ */
+export class PaymentEventDto {
+  @ApiProperty({ enum: [1] }) @IsIn([1]) version!: 1;
+  @ApiProperty() @IsUUID() eventId!: string;
+  @ApiProperty({ enum: ["payment.succeeded", "payment.failed"] })
+  @IsIn(["payment.succeeded", "payment.failed"])
+  eventType!: PaymentEventType;
+
+  @ApiProperty() @IsISO8601() occurredAt!: string;
+  @ApiProperty({ enum: PaymentService })
+  @IsEnum(PaymentService)
+  service!: string;
+  @ApiProperty() @IsUUID() intentId!: string;
+  @ApiProperty({ enum: PaymentReferenceType })
+  @IsEnum(PaymentReferenceType)
+  referenceType!: string;
+
+  @ApiProperty() @IsString() referenceId!: string;
+  @ApiProperty() @IsString() merchantOrderId!: string;
+  @ApiProperty({ enum: ProviderMethod })
+  @IsEnum(ProviderMethod)
+  provider!: string;
+  @ApiProperty() @IsInt() @IsPositive() amountMinor!: number;
+  @ApiProperty() @IsString() currency!: string;
+
+  @ApiPropertyOptional() @IsOptional() @IsString() providerTxnId?: string;
+  @ApiPropertyOptional() @IsOptional() @IsISO8601() paidAt?: string;
+  @ApiPropertyOptional() @IsOptional() @IsString() failureCode?: string;
+  @ApiPropertyOptional() @IsOptional() @IsString() failureMessage?: string;
+}
+
+export class MarkPaidResponseDto {
+  @ApiProperty() processed!: boolean;
+  @ApiPropertyOptional() alreadyFinalized?: boolean;
+  @ApiPropertyOptional() reason?: string;
+}
diff --git a/apps/edr-passenger-api/src/modules/payments/payment-client.service.ts b/apps/edr-passenger-api/src/modules/payments/payment-client.service.ts
new file mode 100644
index 000000000..7b1789ae9
--- /dev/null
+++ b/apps/edr-passenger-api/src/modules/payments/payment-client.service.ts
@@ -0,0 +1,95 @@
+import { BadGatewayException, Injectable, Logger } from "@nestjs/common";
+import { HttpService } from "@nestjs/axios";
+import { AxiosError } from "axios";
+import { firstValueFrom } from "rxjs";
+import {
+  InitiatePaymentRequest,
+  PaymentIntentSnapshot,
+  PaymentReferenceType,
+  PaymentService,
+} from "@edr/types";
+
+/**
+ * Thin HTTP client for the payment microservice (apps/edr-payment-api) — the passenger app's
+ * side of the Phase 6 cutover (docs/payment-service §10). Domain validation stays here;
+ * provider calls, intents, and webhooks live in the payment service.
+ */
+@Injectable()
+export class PaymentClientService {
+  private readonly logger = new Logger(PaymentClientService.name);
+  private readonly baseUrl = (
+    process.env.PAYMENT_API_URL ?? "http://localhost:3003"
+  ).replace(/\/$/, "");
+  private readonly serviceToken = process.env.SERVICE_AUTH_TOKEN ?? "";
+
+  constructor(private readonly http: HttpService) {}
+
+  /** POST /payments/initiate — idempotent per (service, referenceType, referenceId). */
+  async initiate(
+    request: InitiatePaymentRequest,
+  ): Promise<PaymentIntentSnapshot> {
+    return this.call("POST", "/payments/initiate", request);
+  }
+
+  /** GET /payments/intents?… — active intent by domain reference; null when none exists. */
+  async getIntentByReference(
+    referenceType: PaymentReferenceType,
+    referenceId: string,
+  ): Promise<PaymentIntentSnapshot | null> {
+    const query = new URLSearchParams({
+      service: PaymentService.PASSENGER,
+      referenceType,
+      referenceId,
+    });
+    try {
+      return await this.call("GET", `/payments/intents?${query.toString()}`);
+    } catch (err) {
+      if (err instanceof AxiosError && err.response?.status === 404)
+        return null;
+      throw err;
+    }
+  }
+
+  private async call<T>(
+    method: "GET" | "POST",
+    path: string,
+    body?: unknown,
+  ): Promise<T> {
+    const url = `${this.baseUrl}${path}`;
+    this.logger.log("=====================================================================");
+    this.logger.log(`URL ${url}`);
+    this.logger.log("=====================================================================");
+    try {
+      const response = await firstValueFrom(
+        this.http.request<T>({
+          method,
+          url,
+          data: body,
+          headers: this.serviceToken
+            ? { "x-service-token": this.serviceToken }
+            : {},
+        }),
+      );
+      return response.data;
+    } catch (err) {
+      if (err instanceof AxiosError && err.response) {
+        // 4xx/5xx from the payment service: propagate 404 to callers that handle it;
+        // everything else is a gateway-level failure from the client's perspective.
+        if (err.response.status === 404) throw err;
+        const detail =
+          (err.response.data as { message?: string | string[] })?.message ??
+          err.message;
+        this.logger.error(
+          `payment service ${method} ${path} → ${err.response.status}: ${detail}`,
+        );
+        throw new BadGatewayException(`Payment service error: ${detail}`);
+      }
+      const message =
+        err instanceof Error && err.message ? err.message : String(err);
+      this.logger.error(
+        `payment service unreachable (${method} ${path}): ${message}`,
+      );
+      throw new BadGatewayException("Payment service unreachable");
+    }
+  }
+}
diff --git a/apps/edr-passenger-api/src/modules/payments/payment-events.consumer.ts b/apps/edr-passenger-api/src/modules/payments/payment-events.consumer.ts
new file mode 100644
index 000000000..291402240
--- /dev/null
+++ b/apps/edr-passenger-api/src/modules/payments/payment-events.consumer.ts
@@ -0,0 +1,47 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { Nack, RabbitSubscribe } from '@golevelup/nestjs-rabbitmq';
+import {
+  PAYMENT_EVENTS_DLX,
+  PAYMENT_EVENTS_EXCHANGE,
+  PAYMENT_QUEUES,
+  PaymentEvent,
+  PaymentService,
+  paymentServiceBindingPattern,
+} from '@edr/types';
+import { PaymentEventDto } from './internal-payments.dto';
+import { PaymentsService } from './payments.service';
+
+const PASSENGER_QUEUE = PAYMENT_QUEUES[PaymentService.PASSENGER];
+
+@Injectable()
+export class PaymentEventsConsumer {
+  private readonly logger = new Logger(PaymentEventsConsumer.name);
+
+  constructor(private readonly paymentsService: PaymentsService) {}
+
+  @RabbitSubscribe({
+    exchange: PAYMENT_EVENTS_EXCHANGE,
+    routingKey: paymentServiceBindingPattern(PaymentService.PASSENGER), // payment.passenger.*
+    queue: PASSENGER_QUEUE.main,
+    queueOptions: {
+      durable: true,
+      deadLetterExchange: PAYMENT_EVENTS_DLX,
+    },
+  })
+  async handle(event: PaymentEvent): Promise<Nack | void> {
+    try {
+      const result = await this.paymentsService.handlePaymentEvent(
+        event as unknown as PaymentEventDto,
+      );
+      this.logger.log(
+        `processed ${event.eventType} (${event.eventId}) ref=${event.referenceId}: ${JSON.stringify(result)}`,
+      );
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.logger.error(
+        `DEAD-LETTERING ${event.eventType} (${event.eventId}) ref=${event.referenceId}: ${message}`,
+      );
+      return new Nack(false);
+    }
+  }
+}
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.adapters.ts b/apps/edr-passenger-api/src/modules/payments/payments.adapters.ts
index b686269c5..0397e62ab 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.adapters.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.adapters.ts
@@ -1,10 +1,50 @@
-export interface GatewayResult { success: boolean; providerRef: string; clientAction?: { type: string; url?: string }; }
-
-export async function telebirrAdapter(_a: number, ref: string): Promise<GatewayResult> {
-  await new Promise((r) => setTimeout(r, 200));
-  return { success: true, providerRef: `TB-${ref}-${Date.now()}`, clientAction: { type: 'REDIRECT', url: `https://telebirr.sandbox.com/pay/${ref}` } };
+export interface GatewayResult {
+  success: boolean;
+  providerRef: string;
+  clientAction?: { type: string; url?: string };
+}
+
+export async function telebirrAdapter(
+  _a: number,
+  ref: string,
+): Promise<GatewayResult> {
+  await new Promise((r) => setTimeout(r, 200));
+  return {
+    success: true,
+    providerRef: `TB-${ref}-${Date.now()}`,
+    clientAction: {
+      type: "REDIRECT",
+      url: `https://telebirr.sandbox.com/pay/${ref}`,
+    },
+  };
+}
+export async function cbeBirrAdapter(
+  _a: number,
+  ref: string,
+): Promise<GatewayResult> {
+  await new Promise((r) => setTimeout(r, 150));
+  return { success: true, providerRef: `CBE-${ref}-${Date.now()}` };
+}
+export async function eBirrAdapter(
+  _a: number,
+  ref: string,
+): Promise<GatewayResult> {
+  await new Promise((r) => setTimeout(r, 150));
+  return { success: true, providerRef: `EB-${ref}-${Date.now()}` };
+}
+export async function cardAdapter(
+  _a: number,
+  ref: string,
+): Promise<GatewayResult> {
+  await new Promise((r) => setTimeout(r, 150));
+  return {
+    success: !ref.startsWith("FAIL"),
+    providerRef: `CARD-${ref}-${Date.now()}`,
+  };
+}
+export async function walletAdapter(
+  amount: number,
+  balance: number,
+): Promise<GatewayResult> {
+  return { success: balance >= amount, providerRef: `WALLET-${Date.now()}` };
 }
-export async function cbeBirrAdapter(_a: number, ref: string): Promise<GatewayResult> { await new Promise((r) => setTimeout(r, 150)); return { success: true, providerRef: `CBE-${ref}-${Date.now()}` }; }
-export async function eBirrAdapter(_a: number, ref: string): Promise<GatewayResult>   { await new Promise((r) => setTimeout(r, 150)); return { success: true, providerRef: `EB-${ref}-${Date.now()}` }; }
-export async function cardAdapter(_a: number, ref: string): Promise<GatewayResult>    { await new Promise((r) => setTimeout(r, 150)); return { success: !ref.startsWith('FAIL'), providerRef: `CARD-${ref}-${Date.now()}` }; }
-export async function walletAdapter(amount: number, balance: number): Promise<GatewayResult> { return { success: balance >= amount, providerRef: `WALLET-${Date.now()}` }; }
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.controller.ts b/apps/edr-passenger-api/src/modules/payments/payments.controller.ts
index 49b570ab1..373e10513 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.controller.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.controller.ts
@@ -1,108 +1,183 @@
-import { Body, Controller, Get, HttpStatus, Param, Post, Query, Res, UseGuards } from '@nestjs/common';
-import { ApiTags, ApiOperation, ApiBearerAuth, ApiQuery, ApiOkResponse, ApiProduces } from '@nestjs/swagger';
-import { Response } from 'express';
-import { PaymentsService } from './payments.service';
-import { InitiatePaymentDto, RefundDto, AddPaymentMethodDto, PaymentRegionEnum, SupportedPaymentMethodDto, PaymentMethodTypeEnum, PaymentPlatformDto } from './payments.dto';
-import { JwtGuard } from '../../common/jwt.guard';
-import { RolesGuard } from '../../common/roles.guard';
-import { Roles } from '../../common/roles.decorator';
-import { UserRole } from '@prisma/client';
+import {
+  Body,
+  Controller,
+  Get,
+  HttpStatus,
+  Param,
+  Post,
+  Query,
+  Res,
+  UseGuards,
+} from "@nestjs/common";
+import {
+  ApiTags,
+  ApiOperation,
+  ApiBearerAuth,
+  ApiQuery,
+  ApiOkResponse,
+  ApiProduces,
+} from "@nestjs/swagger";
+import { Response } from "express";
+import { PaymentsService } from "./payments.service";
+import {
+  InitiatePaymentDto,
+  RefundDto,
+  AddPaymentMethodDto,
+  PaymentRegionEnum,
+  SupportedPaymentMethodDto,
+  PaymentMethodTypeEnum,
+  PaymentPlatformDto,
+} from "./payments.dto";
+import { JwtGuard } from "../../common/jwt.guard";
+import { RolesGuard } from "../../common/roles.guard";
+import { Roles } from "../../common/roles.decorator";
+import { UserRole } from "@prisma/client";
 
-@ApiTags('Payment')
-@Controller('payments')
+@ApiTags("Payment")
+@Controller("payments")
 export class PaymentsController {
   constructor(private service: PaymentsService) {}
-  
-  @Post('initiate')
-  @ApiOperation({ 
-    summary: 'Initiate payment with nationality-based payment methods',
-    description: `Initiates payment for a booking with support for multiple payment providers:
 
-**Ethiopian Payment Methods:**
-- TELEBIRR - Ethiopia's leading mobile money
-- CBE_BIRR - Commercial Bank of Ethiopia
-- EBIRR - Electronic payment gateway
+  @Get("all")
+  @UseGuards(JwtGuard, RolesGuard)
+  @Roles(UserRole.ADMIN, UserRole.SUPERVISOR, UserRole.STAFF)
+  @ApiBearerAuth("JWT-auth")
+  @ApiOperation({ summary: "Get all payments with filters (staff/admin only)" })
+  @ApiQuery({ name: "search", required: false })
+  @ApiQuery({ name: "status", required: false })
+  @ApiQuery({ name: "method", required: false })
+  @ApiQuery({ name: "page", required: false })
+  @ApiQuery({ name: "pageSize", required: false })
+  async getAll(
+    @Query("search") search?: string,
+    @Query("status") status?: string,
+    @Query("method") method?: string,
+    @Query("page") page?: string,
+    @Query("pageSize") pageSize?: string,
+  ) {
+    return this.service.getAll({
+      search,
+      status,
+      method,
+      page: page ? parseInt(page) : 1,
+      pageSize: pageSize ? parseInt(pageSize) : 10,
+    });
+  }
 
-**Djiboutian Payment Methods:**
-- WAAFI - Djibouti's mobile money service
-
-**International Payment Methods:**
-- CARD - Visa, Mastercard
-- WALLET - Internal wallet balance
-
-**Multi-Currency:**
-- All transactions processed in ETB
-- Display amounts in ETB, DJF, or USD
-- Real-time exchange rate conversion`
+  @Post("initiate")
+  @ApiOperation({
+    summary: "Initiate payment with nationality-based payment methods",
+    description: `Initiates payment for a booking with support for multiple payment providers:\n\n**Ethiopian Payment Methods:**\n- TELEBIRR - Ethiopia's leading mobile money\n- CBE_BIRR - Commercial Bank of Ethiopia\n- EBIRR - Electronic payment gateway\n\n**Djiboutian Payment Methods:**\n- WAAFI - Djibouti's mobile money service\n\n**International Payment Methods:**\n- CARD - Visa, Mastercard\n- WALLET - Internal wallet balance\n\n**Multi-Currency:**\n- All transactions processed in ETB\n- Display amounts in ETB, DJF, or USD\n- Real-time exchange rate conversion`,
   })
-  initiatePayment(@Body() dto: InitiatePaymentDto) { return this.service.initiatePayment(dto); }
-  
-  @Get('intents/:bookingId')
-  @ApiOperation({ summary: 'Get payment intent status for a booking' })
-  getIntent(@Param('bookingId') bookingId: string) { return this.service.getIntentByBookingId(bookingId); }
-  
-  @Post('refund')
+  initiatePayment(@Body() dto: InitiatePaymentDto) {
+    return this.service.initiatePayment(dto);
+  }
+
+  @Get("intents/:bookingId")
+  @ApiOperation({ summary: "Get payment intent status for a booking" })
+  getIntent(@Param("bookingId") bookingId: string) {
+    return this.service.getIntentByBookingId(bookingId);
+  }
+
+  @Post("refund")
   @UseGuards(JwtGuard, RolesGuard)
   @Roles(UserRole.ADMIN, UserRole.STAFF, UserRole.AGENT)
-  @ApiBearerAuth('JWT-auth')
-  @ApiOperation({ summary: 'Refund a confirmed booking (staff/agent only)' })
-  refund(@Body() dto: RefundDto) { return this.service.refund(dto); }
+  @ApiBearerAuth("JWT-auth")
+  @ApiOperation({ summary: "Refund a confirmed booking (staff/agent only)" })
+  refund(@Body() dto: RefundDto) {
+    return this.service.refund(dto);
+  }
 
-  @Post('methods')
+  @Post("methods")
   @UseGuards(JwtGuard, RolesGuard)
   @Roles(UserRole.ADMIN, UserRole.STAFF)
-  @ApiBearerAuth('JWT-auth')
-  @ApiOperation({ summary: 'Add a payment system to the platform catalog (admin only)' })
-  addMethod(@Body() dto: AddPaymentMethodDto) { return this.service.addPaymentMethod(dto); }
-  
-  @Get('methods')
+  @ApiBearerAuth("JWT-auth")
   @ApiOperation({
-    summary: 'List payment systems supported by the platform',
-    description: 'Returns the global catalog of accepted payment systems. Not user-specific. Optionally filter by region to match a passenger\'s nationality.',
+    summary: "Add a payment system to the platform catalog (admin only)",
   })
-  @ApiQuery({ name: 'region', enum: PaymentRegionEnum, required: false })
-  @ApiOkResponse({ type: [SupportedPaymentMethodDto] })
-  getMethods(@Query('region') region?: PaymentRegionEnum) { return this.service.getSupportedPaymentMethods(region); }
+  addMethod(@Body() dto: AddPaymentMethodDto) {
+    return this.service.addPaymentMethod(dto);
+  }
 
-  @Get('checkout')
+  @Get("methods")
   @ApiOperation({
-    summary: 'Browser checkout redirect',
-    description: 'Initiates payment and returns an HTML page that auto-redirects the browser to the provider checkout URL. Designed to be opened directly in a browser tab.',
+    summary: "List payment systems supported by the platform",
+    description:
+      "Returns the global catalog of accepted payment systems. Not user-specific. Optionally filter by region to match a passenger's nationality.",
   })
-  @ApiQuery({ name: 'bookingId', required: true })
-  @ApiQuery({ name: 'method', enum: PaymentMethodTypeEnum, required: true })
-  @ApiQuery({ name: 'platform', enum: ['web', 'mobile'], required: false })
-  @ApiProduces('text/html')
+  @ApiQuery({ name: "region", enum: PaymentRegionEnum, required: false })
+  @ApiOkResponse({ type: [SupportedPaymentMethodDto] })
+  getMethods(@Query("region") region?: PaymentRegionEnum) {
+    return this.service.getSupportedPaymentMethods(region);
+  }
+
+  @Get("checkout")
+  @ApiOperation({
+    summary: "Browser checkout redirect",
+    description:
+      "Initiates payment and returns an HTML page that auto-redirects the browser to the provider checkout URL. Designed to be opened directly in a browser tab.",
+  })
+  @ApiQuery({ name: "bookingId", required: true })
+  @ApiQuery({ name: "method", enum: PaymentMethodTypeEnum, required: true })
+  @ApiQuery({ name: "platform", enum: ["web", "mobile"], required: false })
+  @ApiProduces("text/html")
   async checkout(
-    @Query('bookingId') bookingId: string,
-    @Query('method') method: PaymentMethodTypeEnum,
-    @Query('platform') platform: PaymentPlatformDto = 'web',
+    @Query("bookingId") bookingId: string,
+    @Query("method") method: PaymentMethodTypeEnum,
+    @Query("platform") platform: PaymentPlatformDto = "web",
     @Res() res: Response,
   ) {
     if (!bookingId) {
-      return res.status(HttpStatus.BAD_REQUEST).type('html').send(this.buildErrorHtml('Missing required query parameter: bookingId'));
+      return res
+        .status(HttpStatus.BAD_REQUEST)
+        .type("html")
+        .send(
+          this.buildErrorHtml("Missing required query parameter: bookingId"),
+        );
     }
     if (!method || !Object.values(PaymentMethodTypeEnum).includes(method)) {
-      return res.status(HttpStatus.BAD_REQUEST).type('html').send(this.buildErrorHtml('Missing or invalid query parameter: method'));
+      return res
+        .status(HttpStatus.BAD_REQUEST)
+        .type("html")
+        .send(
+          this.buildErrorHtml("Missing or invalid query parameter: method"),
+        );
     }
 
     try {
-      const result = await this.service.initiatePayment({ bookingId, method, platform });
-      const url = result.clientAction?.type === 'REDIRECT' ? result.clientAction.url : undefined;
+      const result = await this.service.initiatePayment({
+        bookingId,
+        method,
+        platform,
+      });
+      const url =
+        result.clientAction?.type === "REDIRECT"
+          ? result.clientAction.url
+          : undefined;
 
       if (url) {
-        return res.status(HttpStatus.OK).type('html').send(this.buildRedirectHtml(url));
+        return res
+          .status(HttpStatus.OK)
+          .type("html")
+          .send(this.buildRedirectHtml(url));
       }
 
-      return res.status(HttpStatus.OK).type('html').send(this.buildStatusHtml(result.status, result.intentId));
+      return res
+        .status(HttpStatus.OK)
+        .type("html")
+        .send(this.buildStatusHtml(result.status, result.intentId));
     } catch (err: unknown) {
-      const message = err instanceof Error ? err.message : 'An unexpected error occurred';
-      return res.status(HttpStatus.OK).type('html').send(this.buildErrorHtml(message));
+      const message =
+        err instanceof Error ? err.message : "An unexpected error occurred";
+      return res
+        .status(HttpStatus.OK)
+        .type("html")
+        .send(this.buildErrorHtml(message));
     }
   }
 
   private buildRedirectHtml(url: string): string {
-    const escaped = url.replace(/"/g, '&quot;');
+    const escaped = url.replace(/\"/g, "&quot;");
     return `<!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.dto.ts b/apps/edr-passenger-api/src/modules/payments/payments.dto.ts
index 9d8467c3f..309bd4a0a 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.dto.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.dto.ts
@@ -1,36 +1,53 @@
-import { IsString, IsEnum, IsOptional, IsIn, IsBoolean, IsInt } from 'class-validator';
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { PaymentIntentStatus } from '@prisma/client';
+import {
+  IsString,
+  IsEnum,
+  IsOptional,
+  IsIn,
+  IsBoolean,
+  IsInt,
+} from "class-validator";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { PaymentIntentStatus } from "@prisma/client";
 
 export enum PaymentRegionEnum {
-  ETHIOPIA = 'ETHIOPIA',
-  DJIBOUTI = 'DJIBOUTI',
-  INTERNATIONAL = 'INTERNATIONAL',
-  GLOBAL = 'GLOBAL',
+  ETHIOPIA = "ETHIOPIA",
+  DJIBOUTI = "DJIBOUTI",
+  INTERNATIONAL = "INTERNATIONAL",
+  GLOBAL = "GLOBAL",
 }
 
-export enum PaymentMethodTypeEnum { 
-  TELEBIRR = 'TELEBIRR',  // Ethiopia
-  CBE_BIRR = 'CBE_BIRR',  // Ethiopia
-  EBIRR = 'EBIRR',        // Ethiopia
-  WAAFI = 'WAAFI',        // Djibouti
-  CARD = 'CARD',          // International
-  WALLET = 'WALLET'       // Internal
+export enum PaymentMethodTypeEnum {
+  TELEBIRR = "TELEBIRR", // Ethiopia
+  CBE_BIRR = "CBE_BIRR", // Ethiopia
+  EBIRR = "EBIRR", // Ethiopia
+  WAAFI = "WAAFI", // Djibouti
+  CARD = "CARD", // International
+  WALLET = "WALLET", // Internal
 }
 
-export type PaymentPlatformDto = 'web' | 'mobile';
+export type PaymentPlatformDto = "web" | "mobile";
 
 export class InitiatePaymentDto {
-  @ApiProperty({ example: 'booking-uuid' }) @IsString() bookingId: string;
+  @ApiProperty({ example: "booking-uuid" }) @IsString() bookingId: string;
   @ApiProperty({
     enum: PaymentMethodTypeEnum,
-    description: 'Payment method: TELEBIRR/CBE_BIRR/EBIRR (Ethiopia), WAAFI (Djibouti), CARD (International), WALLET (Internal)',
-    example: 'TELEBIRR'
-  }) @IsEnum(PaymentMethodTypeEnum) method: PaymentMethodTypeEnum;
-  @ApiPropertyOptional({ description: 'Saved payment method ID (optional)' }) @IsOptional() @IsString() paymentMethodId?: string;
-  @ApiPropertyOptional({ enum: ['web', 'mobile'], default: 'web', description: 'Payment platform (web or mobile)' })
+    description:
+      "Payment method: TELEBIRR/CBE_BIRR/EBIRR (Ethiopia), WAAFI (Djibouti), CARD (International), WALLET (Internal)",
+    example: "TELEBIRR",
+  })
+  @IsEnum(PaymentMethodTypeEnum)
+  method: PaymentMethodTypeEnum;
+  @ApiPropertyOptional({ description: "Saved payment method ID (optional)" })
   @IsOptional()
-  @IsIn(['web', 'mobile'])
+  @IsString()
+  paymentMethodId?: string;
+  @ApiPropertyOptional({
+    enum: ["web", "mobile"],
+    default: "web",
+    description: "Payment platform (web or mobile)",
+  })
+  @IsOptional()
+  @IsIn(["web", "mobile"])
   platform?: PaymentPlatformDto;
 }
 
@@ -40,42 +57,76 @@ export class RefundDto {
 }
 
 export class AddPaymentMethodDto {
-  @ApiProperty({ enum: PaymentMethodTypeEnum }) @IsEnum(PaymentMethodTypeEnum) type: PaymentMethodTypeEnum;
+  @ApiProperty({ enum: PaymentMethodTypeEnum })
+  @IsEnum(PaymentMethodTypeEnum)
+  type: PaymentMethodTypeEnum;
   @ApiProperty() @IsString() displayName: string;
-  @ApiProperty({ enum: PaymentRegionEnum }) @IsEnum(PaymentRegionEnum) region: PaymentRegionEnum;
-  @ApiPropertyOptional({ example: 'ETB' }) @IsOptional() @IsString() currency?: string;
+  @ApiProperty({ enum: PaymentRegionEnum })
+  @IsEnum(PaymentRegionEnum)
+  region: PaymentRegionEnum;
+  @ApiPropertyOptional({ example: "ETB" })
+  @IsOptional()
+  @IsString()
+  currency?: string;
   @ApiPropertyOptional() @IsOptional() @IsString() providerId?: string;
-  @ApiPropertyOptional({ default: true }) @IsOptional() @IsBoolean() enabled?: boolean;
-  @ApiPropertyOptional({ default: 0 }) @IsOptional() @IsInt() sortOrder?: number;
+  @ApiPropertyOptional({ default: true })
+  @IsOptional()
+  @IsBoolean()
+  enabled?: boolean;
+  @ApiPropertyOptional({ default: 0 })
+  @IsOptional()
+  @IsInt()
+  sortOrder?: number;
 }
 
 export class SupportedPaymentMethodDto {
   @ApiProperty({ enum: PaymentMethodTypeEnum }) type: PaymentMethodTypeEnum;
-  @ApiProperty({ example: 'Telebirr' }) displayName: string;
+  @ApiProperty({ example: "Telebirr" }) displayName: string;
   @ApiProperty({ enum: PaymentRegionEnum }) region: PaymentRegionEnum;
-  @ApiProperty({ example: 'ETB', description: 'Settlement currency for this method' }) currency: string;
-  @ApiProperty({ description: 'Whether the platform currently accepts this method' }) enabled: boolean;
+  @ApiProperty({
+    example: "ETB",
+    description: "Settlement currency for this method",
+  })
+  currency: string;
+  @ApiProperty({
+    description: "Whether the platform currently accepts this method",
+  })
+  enabled: boolean;
 }
 
 export class ClientActionDto {
-  @ApiProperty({ enum: ['REDIRECT', 'LAUNCH_APP'] }) type: 'REDIRECT' | 'LAUNCH_APP';
-  @ApiPropertyOptional({ description: 'Set when type=REDIRECT (web flow)' }) url?: string;
-  @ApiPropertyOptional({ description: 'Set when type=LAUNCH_APP (mobile flow)' }) prepayId?: string;
-  @ApiPropertyOptional({ description: 'Set when type=LAUNCH_APP (mobile flow)' }) receiveCode?: string;
-  @ApiPropertyOptional({ description: 'Set when type=LAUNCH_APP (mobile flow)' }) shortCode?: string;
+  @ApiProperty({ enum: ["REDIRECT", "LAUNCH_APP"] }) type:
+    | "REDIRECT"
+    | "LAUNCH_APP";
+  @ApiPropertyOptional({ description: "Set when type=REDIRECT (web flow)" })
+  url?: string;
+  @ApiPropertyOptional({
+    description: "Set when type=LAUNCH_APP (mobile flow)",
+  })
+  prepayId?: string;
+  @ApiPropertyOptional({
+    description: "Set when type=LAUNCH_APP (mobile flow)",
+  })
+  receiveCode?: string;
+  @ApiPropertyOptional({
+    description: "Set when type=LAUNCH_APP (mobile flow)",
+  })
+  shortCode?: string;
 }
 
 export class InitiateResponseDto {
   @ApiProperty() intentId: string;
   @ApiProperty({ enum: PaymentIntentStatus }) status: PaymentIntentStatus;
-  @ApiPropertyOptional({ type: ClientActionDto }) clientAction?: ClientActionDto;
+  @ApiPropertyOptional({ type: ClientActionDto })
+  clientAction?: ClientActionDto;
   @ApiPropertyOptional() merchantOrderId?: string;
 }
 
 export class IntentStatusDto {
   @ApiProperty() intentId: string;
   @ApiProperty({ enum: PaymentIntentStatus }) status: PaymentIntentStatus;
-  @ApiPropertyOptional({ type: ClientActionDto }) clientAction?: ClientActionDto;
+  @ApiPropertyOptional({ type: ClientActionDto })
+  clientAction?: ClientActionDto;
   @ApiPropertyOptional() merchantOrderId?: string;
   @ApiPropertyOptional() paidAt?: string;
   @ApiPropertyOptional() failureCode?: string;
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.e2e-spec.ts b/apps/edr-passenger-api/src/modules/payments/payments.e2e-spec.ts
index 78ffe2196..0fd594b39 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.e2e-spec.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.e2e-spec.ts
@@ -1,10 +1,10 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { INestApplication, ValidationPipe } from '@nestjs/common';
-import request from 'supertest';
-import { AppModule } from '../../app.module';
-import { PrismaService } from '../../common/prisma.service';
+import { Test, TestingModule } from "@nestjs/testing";
+import { INestApplication, ValidationPipe } from "@nestjs/common";
+import request from "supertest";
+import { AppModule } from "../../app.module";
+import { PrismaService } from "../../common/prisma.service";
 
-describe('Payments E2E', () => {
+describe("Payments E2E", () => {
   let app: INestApplication;
   let prisma: PrismaService;
   let authToken: string;
@@ -16,49 +16,123 @@ describe('Payments E2E', () => {
     }).compile();
 
     app = moduleFixture.createNestApplication();
-    app.useGlobalPipes(new ValidationPipe({ transform: true, whitelist: true }));
+    app.useGlobalPipes(
+      new ValidationPipe({ transform: true, whitelist: true }),
+    );
     await app.init();
 
     prisma = app.get<PrismaService>(PrismaService);
 
     const testUser = await prisma.user.create({
-      data: { email: 'payment-test@example.com', phone: '+251911111112', fullName: 'Payment Test User', passwordHash: '$2b$10$abcdefghijklmnopqrstuvwxyz', role: 'PASSENGER' },
+      data: {
+        email: "payment-test@example.com",
+        phone: "+251911111112",
+        fullName: "Payment Test User",
+        passwordHash: "$2b$10$abcdefghijklmnopqrstuvwxyz",
+        role: "PASSENGER",
+      },
     });
 
-    const passenger = await prisma.passenger.create({ data: { userId: testUser.id } });
+    const passenger = await prisma.passenger.create({
+      data: { userId: testUser.id },
+    });
 
-    await prisma.walletAccount.create({ data: { passengerId: passenger.id, balanceMinor: 100000, currency: 'ETB' } });
+    await prisma.walletAccount.create({
+      data: {
+        passengerId: passenger.id,
+        balanceMinor: 100000,
+        currency: "ETB",
+      },
+    });
 
-    authToken = 'mock-jwt-token';
+    authToken = "mock-jwt-token";
 
-    const station1 = await prisma.station.create({ data: { code: 'TST1', name: 'Test Station 1', city: 'Test City', lat: 9.0, lng: 38.0 } });
-    const station2 = await prisma.station.create({ data: { code: 'TST2', name: 'Test Station 2', city: 'Test City 2', lat: 9.5, lng: 38.5 } });
+    const station1 = await prisma.station.create({
+      data: {
+        code: "TST1",
+        name: "Test Station 1",
+        city: "Test City",
+        lat: 9.0,
+        lng: 38.0,
+      },
+    });
+    const station2 = await prisma.station.create({
+      data: {
+        code: "TST2",
+        name: "Test Station 2",
+        city: "Test City 2",
+        lat: 9.5,
+        lng: 38.5,
+      },
+    });
 
-    const train = await prisma.train.create({ data: { number: 'TEST-001', name: 'Test Train' } });
+    const train = await prisma.train.create({
+      data: { number: "TEST-001", name: "Test Train" },
+    });
 
     const schedule = await prisma.trainSchedule.create({
-      data: { trainId: train.id, originStationId: station1.id, destinationStationId: station2.id, departureAt: new Date(Date.now() + 86400000), arrivalAt: new Date(Date.now() + 90000000), durationMinutes: 60 },
+      data: {
+        trainId: train.id,
+        originStationId: station1.id,
+        destinationStationId: station2.id,
+        departureAt: new Date(Date.now() + 86400000),
+        arrivalAt: new Date(Date.now() + 90000000),
+        durationMinutes: 60,
+      },
     });
 
-    const seatClass = await prisma.seatClass.upsert({
-      where: { name: 'Economy Regular' },
-      update: {},
-      create: { name: 'Economy Regular', description: 'Standard economy seating', basePrice: 45000, isActive: true },
+    const coachType = await prisma.coachType.create({
+      data: { name: "Standard", code: "STD" },
+    });
+
+    const seatClass = await prisma.seatClass.create({
+      data: {
+        name: "Economy Regular",
+        description: "Standard economy seating",
+        baseFareMinor: 45000,
+        isActive: true,
+        coachTypeId: coachType.id,
+      },
     });
 
     const coach = await prisma.coach.create({
-      data: { coachNumber: 'TEST-C1', label: 'A', seatClassId: seatClass.id, mode: 'seat', totalUnits: 10 },
+      data: {
+        coachTypeId: coachType.id,
+        number: "TEST-C1",
+        arrangement: "2+2",
+        capacity: 10,
+        status: "ACTIVE",
+      },
     });
 
-    await prisma.coachAssignment.create({ data: { scheduleId: schedule.id, coachId: coach.id, positionNumber: 1 } });
-
-    const seat = await prisma.seat.create({ data: { coachId: coach.id, row: 1, col: 'A', label: '1A', status: 'AVAILABLE' } });
+    const seat = await prisma.seat.create({
+      data: {
+        coachId: coach.id,
+        row: 1,
+        col: "A",
+        seatNumber: "1A",
+        status: "AVAILABLE",
+      },
+    });
 
     const booking = await prisma.booking.create({
-      data: { bookingRef: 'TEST-BOOK-001', passengerId: passenger.id, scheduleId: schedule.id, status: 'PENDING_PAYMENT', totalMinor: 50000, currency: 'ETB' },
+      data: {
+        bookingRef: "TEST-BOOK-001",
+        passengerId: passenger.id,
+        scheduleId: schedule.id,
+        status: "PENDING_PAYMENT",
+        totalMinor: 50000,
+        currency: "ETB",
+      },
     });
 
-    await prisma.bookingSeat.create({ data: { bookingId: booking.id, seatId: seat.id, passengerName: 'Test Passenger' } });
+    await prisma.bookingSeat.create({
+      data: {
+        bookingId: booking.id,
+        seatId: seat.id,
+        passengerName: "Test Passenger",
+      },
+    });
 
     bookingId = booking.id;
   });
@@ -73,89 +147,60 @@ describe('Payments E2E', () => {
       prisma.coach.deleteMany(),
       prisma.trainSchedule.deleteMany(),
       prisma.train.deleteMany(),
-      prisma.station.deleteMany({ where: { code: { in: ['TST1', 'TST2'] } } }),
+      prisma.station.deleteMany({ where: { code: { in: ["TST1", "TST2"] } } }),
       prisma.walletLedgerEntry.deleteMany(),
       prisma.walletAccount.deleteMany(),
       prisma.passenger.deleteMany(),
-      prisma.user.deleteMany({ where: { email: 'payment-test@example.com' } }),
+      prisma.user.deleteMany({ where: { email: "payment-test@example.com" } }),
     ]);
     await app.close();
   });
 
-  describe('POST /payments/initiate', () => {
-    it('should initiate wallet payment successfully', async () => {
+  describe("POST /payments/initiate", () => {
+    it("should initiate wallet payment successfully", async () => {
       const response = await request(app.getHttpServer())
-        .post('/payments/initiate')
-        .set('Authorization', `Bearer ${authToken}`)
-        .send({ bookingId, method: 'WALLET' })
+        .post("/payments/initiate")
+        .set("Authorization", `Bearer ${authToken}`)
+        .send({ bookingId, method: "WALLET" })
         .expect(201);
       expect(response.body.intentId).toBeDefined();
-      expect(response.body.status).toBe('SUCCEEDED');
+      expect(response.body.status).toBe("SUCCEEDED");
     });
 
-    it('should return 400 for invalid payment method', async () => {
+    it("should return 400 for invalid payment method", async () => {
       await request(app.getHttpServer())
-        .post('/payments/initiate')
-        .set('Authorization', `Bearer ${authToken}`)
-        .send({ bookingId, method: 'INVALID_METHOD' })
+        .post("/payments/initiate")
+        .set("Authorization", `Bearer ${authToken}`)
+        .send({ bookingId, method: "INVALID_METHOD" })
         .expect(400);
     });
 
-    it('should return 404 for non-existent booking', async () => {
+    it("should return 404 for non-existent booking", async () => {
       await request(app.getHttpServer())
-        .post('/payments/initiate')
-        .set('Authorization', `Bearer ${authToken}`)
-        .send({ bookingId: 'non-existent-id', method: 'WALLET' })
+        .post("/payments/initiate")
+        .set("Authorization", `Bearer ${authToken}`)
+        .send({ bookingId: "non-existent-id", method: "WALLET" })
         .expect(404);
     });
   });
 
-  describe('GET /payments/intents/:bookingId', () => {
-    it('should get payment intent status', async () => {
+  describe("GET /payments/intents/:bookingId", () => {
+    it("should get payment intent status", async () => {
       const response = await request(app.getHttpServer())
         .get(`/payments/intents/${bookingId}`)
-        .set('Authorization', `Bearer ${authToken}`)
+        .set("Authorization", `Bearer ${authToken}`)
         .expect(200);
       expect(response.body.intentId).toBeDefined();
       expect(response.body.status).toBeDefined();
     });
 
-    it('should return 404 for non-existent intent', async () => {
+    it("should return 404 for non-existent intent", async () => {
       await request(app.getHttpServer())
-        .get('/payments/intents/non-existent-booking')
-        .set('Authorization', `Bearer ${authToken}`)
+        .get("/payments/intents/non-existent-booking")
+        .set("Authorization", `Bearer ${authToken}`)
         .expect(404);
     });
   });
 
-  describe('Webhook endpoints', () => {
-    it('should handle Telebirr webhook', async () => {
-      await request(app.getHttpServer())
-        .post('/payments/webhooks/telebirr')
-        .send({ merch_order_id: 'TEST-ORDER-123', payment_order_id: 'PAY-123', trade_status: 'Completed', sign: 'mock-signature' })
-        .expect(200);
-    });
-
-    it('should handle CBE Birr webhook', async () => {
-      await request(app.getHttpServer())
-        .post('/payments/webhooks/cbe-birr')
-        .send({ merchantId: 'TEST-MERCHANT', merchantOrderId: 'TEST-ORDER-123', orderId: 'CBE-ORDER-123', status: 'SUCCESS', signature: 'mock-signature' })
-        .expect(200);
-    });
-
-    it('should handle eBirr webhook', async () => {
-      await request(app.getHttpServer())
-        .post('/payments/webhooks/ebirr')
-        .send({ merchantCode: 'TEST-MERCHANT', orderNo: 'TEST-ORDER-123', tradeStatus: 'TRADE_SUCCESS', timestamp: Date.now(), sign: 'mock-signature' })
-        .expect(200);
-    });
-
-    it('should handle Card webhook', async () => {
-      await request(app.getHttpServer())
-        .post('/payments/webhooks/card')
-        .set('stripe-signature', 'mock-signature')
-        .send({ id: 'evt_123', type: 'payment_intent.succeeded', data: { object: { id: 'pi_123', status: 'succeeded', amount: 50000, currency: 'ETB', metadata: { merchantOrderId: 'TEST-ORDER-123', bookingRef: 'TEST-BOOK-001' } } }, created: Math.floor(Date.now() / 1000) })
-        .expect(200);
-    });
-  });
+  // Provider webhooks moved to the payment microservice (apps/edr-payment-api /webhooks/*).
 });
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.module.ts b/apps/edr-passenger-api/src/modules/payments/payments.module.ts
index 1f8086ac3..056986613 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.module.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.module.ts
@@ -1,38 +1,61 @@
-import { Module } from '@nestjs/common';
-import { HttpModule } from '@nestjs/axios';
-import { PaymentsController } from './payments.controller';
-import { PaymentsService } from './payments.service';
-import { SeatsModule } from '../seats/seats.module';
-import { TicketsModule } from '../tickets/tickets.module';
+import { Module } from "@nestjs/common";
+import { HttpModule } from "@nestjs/axios";
+import { ConfigService } from "@nestjs/config";
+import { RabbitMQModule } from "@golevelup/nestjs-rabbitmq";
 import {
-  TelebirrProvider,
-  CbeBirrProvider,
-  EBirrProvider,
-  CardProvider,
-  WaafiProvider,
-} from '@edr/payment-providers';
-import { WebhooksController } from './webhooks/webhooks.controller';
-import { TelebirrWebhookService } from './webhooks/telebirr-webhook.service';
-import { CbeBirrWebhookService } from './webhooks/cbe-birr-webhook.service';
-import { EBirrWebhookService } from './webhooks/ebirr-webhook.service';
-import { CardWebhookService } from './webhooks/card-webhook.service';
-import { WaafiWebhookService } from './webhooks/waafi-webhook.service';
+  PAYMENT_EVENTS_DLX,
+  PAYMENT_EVENTS_EXCHANGE,
+  PAYMENT_QUEUES,
+  PaymentService,
+  paymentServiceBindingPattern,
+} from "@edr/types";
+import { PaymentsController } from "./payments.controller";
+import { PaymentsService } from "./payments.service";
+import { InternalPaymentsController } from "./internal-payments.controller";
+import { PaymentClientService } from "./payment-client.service";
+import { PaymentEventsConsumer } from "./payment-events.consumer";
+import { ServiceAuthGuard } from "../../common/guards/service-auth.guard";
+import { SeatsModule } from "../seats/seats.module";
+import { TicketsModule } from "../tickets/tickets.module";
+
+const PASSENGER_QUEUE = PAYMENT_QUEUES[PaymentService.PASSENGER];
 
 @Module({
-  imports: [SeatsModule, TicketsModule, HttpModule.register({ timeout: 10_000 })],
-  controllers: [PaymentsController, WebhooksController],
+  imports: [
+    SeatsModule,
+    TicketsModule,
+    HttpModule.register({ timeout: 10_000 }),
+    RabbitMQModule.forRootAsync({
+      inject: [ConfigService],
+      useFactory: (config: ConfigService) => ({
+        uri: config.get<string>("rabbitmq.url") as string,
+        exchanges: [
+          {
+            name: PAYMENT_EVENTS_EXCHANGE,
+            type: "topic",
+            options: { durable: true },
+          },
+          { name: PAYMENT_EVENTS_DLX, type: "topic", options: { durable: true } },
+        ],
+        queues: [
+          {
+            name: PASSENGER_QUEUE.dlq,
+            exchange: PAYMENT_EVENTS_DLX,
+            routingKey: paymentServiceBindingPattern(PaymentService.PASSENGER),
+            options: { durable: true },
+          },
+        ],
+        prefetchCount: config.get<number>("rabbitmq.prefetch") ?? 10,
+        connectionInitOptions: { wait: false },
+      }),
+    }),
+  ],
+  controllers: [PaymentsController, InternalPaymentsController],
   providers: [
     PaymentsService,
-    TelebirrProvider,
-    CbeBirrProvider,
-    EBirrProvider,
-    CardProvider,
-    WaafiProvider,
-    TelebirrWebhookService,
-    CbeBirrWebhookService,
-    EBirrWebhookService,
-    CardWebhookService,
-    WaafiWebhookService,
+    PaymentClientService,
+    PaymentEventsConsumer,
+    ServiceAuthGuard,
   ],
 })
 export class PaymentsModule {}
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.service.spec.ts b/apps/edr-passenger-api/src/modules/payments/payments.service.spec.ts
index d4a35e14f..1a2ebdf1f 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.service.spec.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.service.spec.ts
@@ -1,19 +1,21 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { PaymentsService } from './payments.service';
-import { PrismaService } from '../../common/prisma.service';
-import { SeatsService } from '../seats/seats.service';
-import { TicketsService } from '../tickets/tickets.service';
-import { EventEmitter2 } from '@nestjs/event-emitter';
+import { Test, TestingModule } from "@nestjs/testing";
+import { PaymentsService } from "./payments.service";
+import { PaymentClientService } from "./payment-client.service";
+import { PrismaService } from "../../common/prisma.service";
+import { SeatsService } from "../seats/seats.service";
+import { TicketsService } from "../tickets/tickets.service";
+import { EventEmitter2 } from "@nestjs/event-emitter";
+import { PaymentIntentStatus, PaymentMethodType } from "@prisma/client";
+import { BadRequestException, NotFoundException } from "@nestjs/common";
 import {
-  TelebirrProvider,
-  CbeBirrProvider,
-  EBirrProvider,
-  CardProvider,
-} from '@edr/payment-providers';
-import { PaymentIntentStatus, PaymentMethodType } from '@prisma/client';
-import { BadRequestException, NotFoundException } from '@nestjs/common';
+  PaymentIntentSnapshot,
+  PaymentReferenceType,
+  PaymentService as PaymentServiceEnum,
+  ProviderMethod,
+  ProviderPaymentStatus,
+} from "@edr/types";
 
-describe('PaymentsService', () => {
+describe("PaymentsService", () => {
   let service: PaymentsService;
   let prisma: PrismaService;
   let seatsService: SeatsService;
@@ -62,29 +64,25 @@ describe('PaymentsService', () => {
     emit: jest.fn(),
   };
 
-  const mockTelebirrProvider = {
-    method: PaymentMethodType.TELEBIRR,
+  const mockPaymentClient = {
     initiate: jest.fn(),
-    queryStatus: jest.fn(),
+    getIntentByReference: jest.fn(),
   };
 
-  const mockCbeBirrProvider = {
-    method: PaymentMethodType.CBE_BIRR,
-    initiate: jest.fn(),
-    queryStatus: jest.fn(),
-  };
-
-  const mockEBirrProvider = {
-    method: PaymentMethodType.EBIRR,
-    initiate: jest.fn(),
-    queryStatus: jest.fn(),
-  };
-
-  const mockCardProvider = {
-    method: PaymentMethodType.CARD,
-    initiate: jest.fn(),
-    queryStatus: jest.fn(),
-  };
+  const requiresActionSnapshot = (
+    provider: ProviderMethod,
+  ): PaymentIntentSnapshot => ({
+    intentId: "remote-intent-1",
+    service: PaymentServiceEnum.PASSENGER,
+    referenceType: PaymentReferenceType.BOOKING,
+    referenceId: "booking-1",
+    merchantOrderId: "PSG-MERCH-123",
+    provider,
+    status: ProviderPaymentStatus.REQUIRES_ACTION,
+    amountMinor: 50000,
+    currency: "ETB",
+    clientAction: { type: "REDIRECT", url: "https://provider.example/pay" },
+  });
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -94,10 +92,7 @@ describe('PaymentsService', () => {
         { provide: SeatsService, useValue: mockSeatsService },
         { provide: TicketsService, useValue: mockTicketsService },
         { provide: EventEmitter2, useValue: mockEventEmitter },
-        { provide: TelebirrProvider, useValue: mockTelebirrProvider },
-        { provide: CbeBirrProvider, useValue: mockCbeBirrProvider },
-        { provide: EBirrProvider, useValue: mockEBirrProvider },
-        { provide: CardProvider, useValue: mockCardProvider },
+        { provide: PaymentClientService, useValue: mockPaymentClient },
       ],
     }).compile();
 
@@ -108,221 +103,276 @@ describe('PaymentsService', () => {
     eventEmitter = module.get<EventEmitter2>(EventEmitter2);
 
     jest.clearAllMocks();
+    mockPaymentClient.getIntentByReference.mockResolvedValue(null);
   });
 
-  describe('initiatePayment', () => {
+  describe("initiatePayment", () => {
     const mockBooking = {
-      id: 'booking-1',
-      bookingRef: 'EDR123456',
-      passengerId: 'passenger-1',
+      id: "booking-1",
+      bookingRef: "EDR123456",
+      passengerId: "passenger-1",
       totalMinor: 50000,
-      currency: 'ETB',
-      status: 'PENDING_PAYMENT',
-      seats: [{ id: 'seat-1', seatId: 'seat-id-1' }],
+      currency: "ETB",
+      status: "PENDING_PAYMENT",
+      seats: [{ id: "seat-1", seatId: "seat-id-1" }],
     };
 
-    it('should throw NotFoundException if booking not found', async () => {
+    it("should throw NotFoundException if booking not found", async () => {
       mockPrisma.booking.findUnique.mockResolvedValue(null);
 
       await expect(
         service.initiatePayment({
-          bookingId: 'invalid',
-          method: 'TELEBIRR' as any,
+          bookingId: "invalid",
+          method: "TELEBIRR" as any,
         }),
       ).rejects.toThrow(NotFoundException);
     });
 
-    it('should throw BadRequestException if booking not payable', async () => {
+    it("should throw BadRequestException if booking not payable", async () => {
       mockPrisma.booking.findUnique.mockResolvedValue({
         ...mockBooking,
-        status: 'CONFIRMED',
+        status: "CONFIRMED",
       });
 
       await expect(
         service.initiatePayment({
-          bookingId: 'booking-1',
-          method: 'TELEBIRR' as any,
+          bookingId: "booking-1",
+          method: "TELEBIRR" as any,
         }),
       ).rejects.toThrow(BadRequestException);
     });
 
-    it('should initiate Telebirr payment successfully', async () => {
+    it("should initiate a provider payment through the payment microservice", async () => {
       mockPrisma.booking.findUnique.mockResolvedValue(mockBooking);
-      mockPrisma.paymentIntent.findUnique.mockResolvedValue(null);
-      mockTelebirrProvider.initiate.mockResolvedValue({
-        providerOrderId: 'TB-ORDER-123',
-        clientAction: { type: 'REDIRECT', url: 'https://telebirr.com/pay' },
-        expiresAt: new Date(),
-        rawInitiation: {},
-      });
+      mockPaymentClient.initiate.mockResolvedValue(
+        requiresActionSnapshot(ProviderMethod.TELEBIRR),
+      );
       mockPrisma.paymentIntent.upsert.mockResolvedValue({
-        id: 'intent-1',
+        id: "intent-1",
         status: PaymentIntentStatus.REQUIRES_ACTION,
-        merchantOrderId: 'MERCH-123',
-        clientAction: { type: 'REDIRECT', url: 'https://telebirr.com/pay' },
+        merchantOrderId: "PSG-MERCH-123",
+        clientAction: { type: "REDIRECT", url: "https://provider.example/pay" },
       });
 
       const result = await service.initiatePayment({
-        bookingId: 'booking-1',
-        method: 'TELEBIRR' as any,
+        bookingId: "booking-1",
+        method: "TELEBIRR" as any,
       });
 
       expect(result.status).toBe(PaymentIntentStatus.REQUIRES_ACTION);
-      expect(mockTelebirrProvider.initiate).toHaveBeenCalled();
+      expect(result.clientAction?.url).toBe("https://provider.example/pay");
+      expect(mockPaymentClient.initiate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          service: PaymentServiceEnum.PASSENGER,
+          referenceType: PaymentReferenceType.BOOKING,
+          referenceId: "booking-1",
+          orderRef: "EDR123456",
+          amountMinor: 50000,
+          currency: "ETB",
+          provider: "TELEBIRR",
+        }),
+      );
+      // Snapshot mirrored into the local projection.
+      expect(mockPrisma.paymentIntent.upsert).toHaveBeenCalledWith(
+        expect.objectContaining({ where: { bookingId: "booking-1" } }),
+      );
     });
 
-    it('should initiate CBE Birr payment successfully', async () => {
+    it("should finalize the booking when the service reports an already-paid intent", async () => {
       mockPrisma.booking.findUnique.mockResolvedValue(mockBooking);
-      mockPrisma.paymentIntent.findUnique.mockResolvedValue(null);
-      mockCbeBirrProvider.initiate.mockResolvedValue({
-        providerOrderId: 'CBE-ORDER-123',
-        clientAction: { type: 'REDIRECT', url: 'https://cbe.com/pay' },
-        expiresAt: new Date(),
-        rawInitiation: {},
+      mockPaymentClient.initiate.mockResolvedValue({
+        ...requiresActionSnapshot(ProviderMethod.WAAFI),
+        status: ProviderPaymentStatus.SUCCEEDED,
+        providerTxnId: "TXN-1",
+        paidAt: new Date().toISOString(),
       });
+      // Projection clamps SUCCEEDED to PROCESSING; finalizePaymentSuccess flips it.
       mockPrisma.paymentIntent.upsert.mockResolvedValue({
-        id: 'intent-1',
-        status: PaymentIntentStatus.REQUIRES_ACTION,
-        merchantOrderId: 'MERCH-123',
-        clientAction: { type: 'REDIRECT', url: 'https://cbe.com/pay' },
+        id: "intent-1",
+        bookingId: "booking-1",
+        status: PaymentIntentStatus.PROCESSING,
       });
-
-      const result = await service.initiatePayment({
-        bookingId: 'booking-1',
-        method: 'CBE_BIRR' as any,
-      });
-
-      expect(result.status).toBe(PaymentIntentStatus.REQUIRES_ACTION);
-      expect(mockCbeBirrProvider.initiate).toHaveBeenCalled();
-    });
-
-    it('should initiate wallet payment and debit successfully', async () => {
-      mockPrisma.booking.findUnique.mockResolvedValue(mockBooking);
-      mockPrisma.paymentIntent.findUnique.mockResolvedValue(null);
-      mockPrisma.walletAccount.findUnique.mockResolvedValue({
-        id: 'wallet-1',
-        passengerId: 'passenger-1',
-        balanceMinor: 100000,
-      });
-      mockPrisma.paymentIntent.upsert.mockResolvedValue({
-        id: 'intent-1',
+      mockPrisma.paymentIntent.findUnique.mockResolvedValue({
+        id: "intent-1",
+        bookingId: "booking-1",
         status: PaymentIntentStatus.PROCESSING,
       });
       mockPrisma.paymentIntent.findUniqueOrThrow.mockResolvedValue({
-        id: 'intent-1',
+        id: "intent-1",
         status: PaymentIntentStatus.SUCCEEDED,
-        bookingId: 'booking-1',
+        merchantOrderId: "PSG-MERCH-123",
+      });
+      mockPrisma.loyaltyAccount.findUnique.mockResolvedValue(null);
+
+      const result = await service.initiatePayment({
+        bookingId: "booking-1",
+        method: "WAAFI" as any,
+      });
+
+      expect(result.status).toBe(PaymentIntentStatus.SUCCEEDED);
+      expect(mockTicketsService.generate).toHaveBeenCalledWith("booking-1");
+    });
+
+    it("should initiate wallet payment and debit successfully", async () => {
+      mockPrisma.booking.findUnique.mockResolvedValue(mockBooking);
+      // First call: existing-intent check (none); second call: finalize loads the new intent.
+      mockPrisma.paymentIntent.findUnique
+        .mockResolvedValueOnce(null)
+        .mockResolvedValue({
+          id: "intent-1",
+          bookingId: "booking-1",
+          status: PaymentIntentStatus.PROCESSING,
+        });
+      mockPrisma.walletAccount.findUnique.mockResolvedValue({
+        id: "wallet-1",
+        passengerId: "passenger-1",
+        balanceMinor: 100000,
+      });
+      mockPrisma.paymentIntent.upsert.mockResolvedValue({
+        id: "intent-1",
+        status: PaymentIntentStatus.PROCESSING,
+      });
+      mockPrisma.paymentIntent.findUniqueOrThrow.mockResolvedValue({
+        id: "intent-1",
+        status: PaymentIntentStatus.SUCCEEDED,
+        bookingId: "booking-1",
       });
       mockPrisma.loyaltyAccount.findUnique.mockResolvedValue({
-        id: 'loyalty-1',
+        id: "loyalty-1",
         pointsBalance: 100,
       });
 
       const result = await service.initiatePayment({
-        bookingId: 'booking-1',
-        method: 'WALLET' as any,
+        bookingId: "booking-1",
+        method: "WALLET" as any,
       });
 
       expect(result.status).toBe(PaymentIntentStatus.SUCCEEDED);
       expect(mockSeatsService.confirmSeats).toHaveBeenCalled();
       expect(mockTicketsService.generate).toHaveBeenCalled();
+      expect(mockPaymentClient.initiate).not.toHaveBeenCalled();
     });
 
-    it('should fail wallet payment with insufficient balance', async () => {
+    it("should fail wallet payment with insufficient balance", async () => {
       mockPrisma.booking.findUnique.mockResolvedValue(mockBooking);
       mockPrisma.paymentIntent.findUnique.mockResolvedValue(null);
       mockPrisma.walletAccount.findUnique.mockResolvedValue({
-        id: 'wallet-1',
-        passengerId: 'passenger-1',
+        id: "wallet-1",
+        passengerId: "passenger-1",
         balanceMinor: 10000, // Less than booking total
       });
       mockPrisma.paymentIntent.upsert.mockResolvedValue({
-        id: 'intent-1',
+        id: "intent-1",
         status: PaymentIntentStatus.FAILED,
-        failureCode: 'INSUFFICIENT_BALANCE',
+        failureCode: "INSUFFICIENT_BALANCE",
       });
 
       const result = await service.initiatePayment({
-        bookingId: 'booking-1',
-        method: 'WALLET' as any,
+        bookingId: "booking-1",
+        method: "WALLET" as any,
       });
 
       expect(result.status).toBe(PaymentIntentStatus.FAILED);
     });
   });
 
-  describe('finalizePaymentSuccess', () => {
-    it('should finalize payment and issue ticket', async () => {
+  describe("finalizePaymentSuccess", () => {
+    it("should finalize payment and issue ticket", async () => {
       const mockIntent = {
-        id: 'intent-1',
-        bookingId: 'booking-1',
+        id: "intent-1",
+        bookingId: "booking-1",
         status: PaymentIntentStatus.PROCESSING,
       };
       const mockBooking = {
-        id: 'booking-1',
-        passengerId: 'passenger-1',
+        id: "booking-1",
+        passengerId: "passenger-1",
         totalMinor: 50000,
-        seats: [{ seatId: 'seat-1' }],
+        seats: [{ seatId: "seat-1" }],
       };
 
       mockPrisma.paymentIntent.findUnique.mockResolvedValue(mockIntent);
       mockPrisma.booking.findUnique.mockResolvedValue(mockBooking);
       mockPrisma.loyaltyAccount.findUnique.mockResolvedValue({
-        id: 'loyalty-1',
+        id: "loyalty-1",
         pointsBalance: 100,
       });
 
       const result = await service.finalizePaymentSuccess({
-        intentId: 'intent-1',
-        providerTxnId: 'TXN-123',
+        intentId: "intent-1",
+        providerTxnId: "TXN-123",
       });
 
       expect(result.alreadyFinalized).toBe(false);
-      expect(mockSeatsService.confirmSeats).toHaveBeenCalledWith(['seat-1']);
-      expect(mockTicketsService.generate).toHaveBeenCalledWith('booking-1');
-      expect(mockEventEmitter.emit).toHaveBeenCalledWith('payment.succeeded', {
+      expect(mockSeatsService.confirmSeats).toHaveBeenCalledWith(["seat-1"]);
+      expect(mockTicketsService.generate).toHaveBeenCalledWith("booking-1");
+      expect(mockEventEmitter.emit).toHaveBeenCalledWith("payment.succeeded", {
         booking: mockBooking,
       });
     });
 
-    it('should return alreadyFinalized if payment already succeeded', async () => {
+    it("should return alreadyFinalized if payment already succeeded", async () => {
       mockPrisma.paymentIntent.findUnique.mockResolvedValue({
-        id: 'intent-1',
+        id: "intent-1",
         status: PaymentIntentStatus.SUCCEEDED,
       });
 
       const result = await service.finalizePaymentSuccess({
-        intentId: 'intent-1',
+        intentId: "intent-1",
       });
 
       expect(result.alreadyFinalized).toBe(true);
     });
   });
 
-  describe('getIntentByBookingId', () => {
-    it('should return intent status', async () => {
+  describe("getIntentByBookingId", () => {
+    it("should return the cached local intent when the payment service has none", async () => {
       const mockIntent = {
-        id: 'intent-1',
-        bookingId: 'booking-1',
+        id: "intent-1",
+        bookingId: "booking-1",
         status: PaymentIntentStatus.SUCCEEDED,
         method: PaymentMethodType.TELEBIRR,
         paidAt: new Date(),
-        merchantOrderId: 'MERCH-123',
+        merchantOrderId: "MERCH-123",
         updatedAt: new Date(),
       };
 
       mockPrisma.paymentIntent.findUnique.mockResolvedValue(mockIntent);
+      mockPaymentClient.getIntentByReference.mockResolvedValue(null);
 
-      const result = await service.getIntentByBookingId('booking-1');
+      const result = await service.getIntentByBookingId("booking-1");
 
-      expect(result.intentId).toBe('intent-1');
+      expect(result.intentId).toBe("intent-1");
       expect(result.status).toBe(PaymentIntentStatus.SUCCEEDED);
     });
 
-    it('should throw NotFoundException if intent not found', async () => {
+    it("should mirror a payment-service snapshot into the local projection", async () => {
       mockPrisma.paymentIntent.findUnique.mockResolvedValue(null);
+      mockPaymentClient.getIntentByReference.mockResolvedValue(
+        requiresActionSnapshot(ProviderMethod.WAAFI),
+      );
+      mockPrisma.paymentIntent.upsert.mockResolvedValue({
+        id: "intent-1",
+        bookingId: "booking-1",
+        status: PaymentIntentStatus.REQUIRES_ACTION,
+        merchantOrderId: "PSG-MERCH-123",
+        clientAction: { type: "REDIRECT", url: "https://provider.example/pay" },
+      });
 
-      await expect(service.getIntentByBookingId('invalid')).rejects.toThrow(
+      const result = await service.getIntentByBookingId("booking-1");
+
+      expect(mockPaymentClient.getIntentByReference).toHaveBeenCalledWith(
+        PaymentReferenceType.BOOKING,
+        "booking-1",
+      );
+      expect(result.status).toBe(PaymentIntentStatus.REQUIRES_ACTION);
+      expect(result.clientAction?.url).toBe("https://provider.example/pay");
+    });
+
+    it("should throw NotFoundException if intent not found anywhere", async () => {
+      mockPrisma.paymentIntent.findUnique.mockResolvedValue(null);
+      mockPaymentClient.getIntentByReference.mockResolvedValue(null);
+
+      await expect(service.getIntentByBookingId("invalid")).rejects.toThrow(
         NotFoundException,
       );
     });
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.service.ts b/apps/edr-passenger-api/src/modules/payments/payments.service.ts
index f6c5ba458..fe80ae88e 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.service.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.service.ts
@@ -1,22 +1,37 @@
-import { Injectable, Logger, NotFoundException, BadRequestException } from '@nestjs/common';
-import { PrismaService } from '../../common/prisma.service';
-import { SeatsService } from '../seats/seats.service';
-import { TicketsService } from '../tickets/tickets.service';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { Prisma, PaymentIntentStatus, PaymentMethodType, PaymentRegion } from '@prisma/client';
-import { InitiatePaymentDto, RefundDto, AddPaymentMethodDto, InitiateResponseDto, IntentStatusDto, PaymentRegionEnum } from './payments.dto';
 import {
+  Injectable,
+  Logger,
+  NotFoundException,
+  BadRequestException,
+} from "@nestjs/common";
+import { PrismaService } from "../../common/prisma.service";
+import { SeatsService } from "../seats/seats.service";
+import { TicketsService } from "../tickets/tickets.service";
+import { EventEmitter2 } from "@nestjs/event-emitter";
+import {
+  Prisma,
+  PaymentIntentStatus,
+  PaymentMethodType,
+  PaymentRegion,
+} from "@prisma/client";
+import {
+  InitiatePaymentDto,
+  RefundDto,
+  AddPaymentMethodDto,
+  InitiateResponseDto,
+  IntentStatusDto,
+  PaymentRegionEnum,
+} from "./payments.dto";
+import { PaymentEventDto, MarkPaidResponseDto } from "./internal-payments.dto";
+import { PaymentClientService } from "./payment-client.service";
+import {
+  PaymentService as PaymentServiceEnum,
+  PaymentReferenceType,
+  PaymentIntentSnapshot,
+  ProviderMethod,
   ClientAction,
-  PaymentProvider,
-  ProviderStatus,
   ProviderPaymentStatus,
-  TelebirrProvider,
-  CbeBirrProvider,
-  EBirrProvider,
-  CardProvider,
-  WaafiProvider,
-  createMerchantOrderId,
-} from '@edr/payment-providers';
+} from "@edr/types";
 
 const NON_TERMINAL_STATUSES: PaymentIntentStatus[] = [
   PaymentIntentStatus.REQUIRES_ACTION,
@@ -27,26 +42,67 @@ const NON_TERMINAL_STATUSES: PaymentIntentStatus[] = [
 @Injectable()
 export class PaymentsService {
   private readonly logger = new Logger(PaymentsService.name);
-  private readonly providers: Map<PaymentMethodType, PaymentProvider>;
 
   constructor(
     private prisma: PrismaService,
     private seatsService: SeatsService,
     private ticketsService: TicketsService,
     private eventEmitter: EventEmitter2,
-    private telebirrProvider: TelebirrProvider,
-    private cbeBirrProvider: CbeBirrProvider,
-    private eBirrProvider: EBirrProvider,
-    private cardProvider: CardProvider,
-    private waafiProvider: WaafiProvider,
-  ) {
-    this.providers = new Map<PaymentMethodType, PaymentProvider>([
-      [PaymentMethodType.TELEBIRR, this.telebirrProvider],
-      [PaymentMethodType.CBE_BIRR, this.cbeBirrProvider],
-      [PaymentMethodType.EBIRR, this.eBirrProvider],
-      [PaymentMethodType.CARD, this.cardProvider],
-      [PaymentMethodType.WAAFI, this.waafiProvider],
+    private paymentClient: PaymentClientService,
+  ) {}
+
+  async getAll(filters: {
+    search?: string;
+    status?: string;
+    method?: string;
+    page?: number;
+    pageSize?: number;
+  }) {
+    const { search, status, method, page = 1, pageSize = 10 } = filters;
+    const skip = (page - 1) * pageSize;
+
+    const where: any = {};
+    if (search) {
+      where.OR = [
+        { id: { contains: search, mode: "insensitive" } },
+        { booking: { bookingRef: { contains: search, mode: "insensitive" } } },
+      ];
+    }
+    if (status) {
+      where.status = status;
+    }
+    if (method) {
+      where.method = method;
+    }
+
+    const [items, total] = await Promise.all([
+      this.prisma.paymentIntent.findMany({
+        where,
+        include: { booking: true },
+        skip,
+        take: pageSize,
+        orderBy: { createdAt: "desc" },
+      }),
+      this.prisma.paymentIntent.count({ where }),
     ]);
+
+    return {
+      items: items.map((item) => ({
+        id: item.id,
+        reference: item.id.substring(0, 8),
+        bookingId: item.bookingId,
+        booking: { bookingRef: item.booking?.bookingRef },
+        amountMinor: item.amountMinor,
+        currency: item.currency,
+        method: item.method,
+        status: item.status,
+        createdAt: item.createdAt,
+        paidAt: item.paidAt,
+      })),
+      total,
+      page,
+      pageSize,
+    };
   }
 
   async initiatePayment(dto: InitiatePaymentDto): Promise<InitiateResponseDto> {
@@ -54,30 +110,87 @@ export class PaymentsService {
       where: { id: dto.bookingId },
       include: { seats: true },
     });
-    if (!booking) throw new NotFoundException('Booking not found');
-    if (booking.status !== 'PENDING_PAYMENT') {
-      throw new BadRequestException('Booking not payable');
-    }
-
-    const existing = await this.prisma.paymentIntent.findUnique({
-      where: { bookingId: dto.bookingId },
-    });
-    if (existing && NON_TERMINAL_STATUSES.includes(existing.status)) {
-      return this.formatIntentResponse(existing);
+    if (!booking) throw new NotFoundException("Booking not found");
+    if (booking.status !== "PENDING_PAYMENT") {
+      throw new BadRequestException("Booking not payable");
     }
 
     const method = dto.method as PaymentMethodType;
 
+    // WALLET is an internal balance debit — it never leaves this app.
     if (method === PaymentMethodType.WALLET) {
+      const existing = await this.prisma.paymentIntent.findUnique({
+        where: { bookingId: dto.bookingId },
+      });
+      if (existing && NON_TERMINAL_STATUSES.includes(existing.status)) {
+        return this.formatIntentResponse(existing);
+      }
       return this.initiateWalletPayment(booking);
     }
 
-    const provider = this.providers.get(method);
-    if (provider) {
-      return this.initiateProviderPayment(booking, provider, dto.platform);
-    }
+    // Provider methods go through the payment microservice (docs/payment-service §7.1):
+    // it owns the intent, the provider session, and the single webhook per provider.
+    // Re-initiating is safe — the service returns the existing active intent (idempotent).
+    const snapshot = await this.paymentClient.initiate({
+      service: PaymentServiceEnum.PASSENGER,
+      referenceType: PaymentReferenceType.BOOKING,
+      referenceId: booking.id,
+      orderRef: booking.bookingRef,
+      amountMinor: booking.totalMinor,
+      currency: booking.currency,
+      provider: method as unknown as ProviderMethod,
+      platform: dto.platform,
+      // PASSENGER-owned browser bounce-back after the hosted page (freight passes its own).
+      // UX only — payment is confirmed by the webhook/mark-paid event, never this redirect.
+      returnUrl: process.env.PAYMENT_RETURN_URL || undefined,
+      failureUrl: process.env.PAYMENT_FAILURE_URL || undefined,
+    });
 
-    throw new BadRequestException(`Unsupported payment method: ${method}`);
+    let intent = await this.syncIntentProjection(booking.id, snapshot);
+    if (snapshot.status === ProviderPaymentStatus.SUCCEEDED) {
+      // Already-paid order re-initiated: converge the booking now (idempotent).
+      await this.finalizePaymentSuccess({
+        intentId: intent.id,
+        providerTxnId: snapshot.providerTxnId,
+        paidAt: snapshot.paidAt ? new Date(snapshot.paidAt) : undefined,
+      });
+      intent = await this.prisma.paymentIntent.findUniqueOrThrow({
+        where: { id: intent.id },
+      });
+    }
+    return this.formatIntentResponse(intent);
+  }
+
+  private async syncIntentProjection(
+    bookingId: string,
+    snapshot: PaymentIntentSnapshot,
+  ) {
+    const status =
+      snapshot.status === ProviderPaymentStatus.SUCCEEDED
+        ? PaymentIntentStatus.PROCESSING
+        : (snapshot.status as unknown as PaymentIntentStatus);
+    const data = {
+      status,
+      method: snapshot.provider as unknown as PaymentMethodType,
+      merchantOrderId: snapshot.merchantOrderId,
+      clientAction: snapshot.clientAction
+        ? (snapshot.clientAction as unknown as Prisma.InputJsonValue)
+        : Prisma.DbNull,
+      providerTxnId: snapshot.providerTxnId ?? null,
+      expiresAt: snapshot.expiresAt ? new Date(snapshot.expiresAt) : null,
+      failureCode: snapshot.failureCode ?? null,
+      failureMessage: snapshot.failureMessage ?? null,
+    };
+    return this.prisma.paymentIntent.upsert({
+      where: { bookingId },
+      update: data,
+      create: {
+        bookingId,
+        amountMinor: snapshot.amountMinor,
+        currency: snapshot.currency,
+        ...data,
+      },
+    });
   }
 
   private async initiateWalletPayment(
@@ -98,7 +211,7 @@ export class PaymentsService {
       await tx.walletLedgerEntry.create({
         data: {
           walletId: wallet.id,
-          type: 'DEBIT',
+          type: "DEBIT",
           amountMinor: booking.totalMinor,
           balanceAfterMinor: newBalance,
           description: `Train Ticket - ${booking.bookingRef}`,
@@ -113,14 +226,14 @@ export class PaymentsService {
         where: { bookingId: booking.id },
         update: {
           status: PaymentIntentStatus.FAILED,
-          failureCode: 'INSUFFICIENT_BALANCE',
+          failureCode: "INSUFFICIENT_BALANCE",
         },
         create: {
           bookingId: booking.id,
           amountMinor: booking.totalMinor,
           method: PaymentMethodType.WALLET,
           status: PaymentIntentStatus.FAILED,
-          failureCode: 'INSUFFICIENT_BALANCE',
+          failureCode: "INSUFFICIENT_BALANCE",
         },
       });
       return this.formatIntentResponse(failed);
@@ -144,57 +257,11 @@ export class PaymentsService {
     return this.formatIntentResponse(refreshed);
   }
 
-  private async initiateProviderPayment(
-    booking: Prisma.BookingGetPayload<{ include: { seats: true } }>,
-    provider: PaymentProvider,
-    platform: 'web' | 'mobile' | undefined,
-  ): Promise<InitiateResponseDto> {
-    const merchantOrderId = createMerchantOrderId();
-    const result = await provider.initiate({
-      merchantOrderId,
-      orderRef: booking.bookingRef,
-      amountMinor: booking.totalMinor,
-      currency: booking.currency,
-      platform,
-    });
-
-    const providerMethod = provider.method as unknown as PaymentMethodType;
-    const intent = await this.prisma.paymentIntent.upsert({
-      where: { bookingId: booking.id },
-      update: {
-        status: PaymentIntentStatus.REQUIRES_ACTION,
-        method: providerMethod,
-        merchantOrderId,
-        providerOrderId: result.providerOrderId,
-        clientAction: result.clientAction as unknown as Prisma.InputJsonValue,
-        rawInitiation: result.rawInitiation as Prisma.InputJsonValue,
-        expiresAt: result.expiresAt,
-        failureCode: null,
-        failureMessage: null,
-      },
-      create: {
-        bookingId: booking.id,
-        amountMinor: booking.totalMinor,
-        currency: booking.currency,
-        method: providerMethod,
-        status: PaymentIntentStatus.REQUIRES_ACTION,
-        merchantOrderId,
-        providerOrderId: result.providerOrderId,
-        clientAction: result.clientAction as unknown as Prisma.InputJsonValue,
-        rawInitiation: result.rawInitiation as Prisma.InputJsonValue,
-        expiresAt: result.expiresAt,
-      },
-    });
-    return this.formatIntentResponse(intent);
-  }
-
-
-
   private formatIntentResponse(
     intent: Prisma.PaymentIntentGetPayload<Record<string, never>>,
   ): InitiateResponseDto {
     const clientAction =
-      intent.clientAction && typeof intent.clientAction === 'object'
+      intent.clientAction && typeof intent.clientAction === "object"
         ? (intent.clientAction as unknown as ClientAction)
         : undefined;
     return {
@@ -206,65 +273,52 @@ export class PaymentsService {
   }
 
   async getIntentByBookingId(bookingId: string): Promise<IntentStatusDto> {
-    const intent = await this.prisma.paymentIntent.findUnique({
+    const local = await this.prisma.paymentIntent.findUnique({
       where: { bookingId },
     });
-    if (!intent) throw new NotFoundException('PaymentIntent not found');
 
-    const refreshable =
-      intent.status === PaymentIntentStatus.REQUIRES_ACTION ||
-      intent.status === PaymentIntentStatus.PROCESSING;
-    const stale = intent.updatedAt.getTime() < Date.now() - 5_000;
-    const provider = this.providers.get(intent.method);
-
-    if (refreshable && stale && intent.merchantOrderId && provider) {
-      try {
-        const status = await provider.queryStatus(intent.merchantOrderId);
-        this.logger.log(status);
-        await this.applyProviderStatus(intent.id, status);
-        const refreshed = await this.prisma.paymentIntent.findUniqueOrThrow({
-          where: { id: intent.id },
-        });
-        return this.formatIntentStatus(refreshed);
-      } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        this.logger.warn(
-          `queryStatus failed for intent ${intent.id}: ${message}; returning cached`,
-        );
-      }
+    // WALLET payments never leave this app — no remote intent exists for them.
+    if (local?.method === PaymentMethodType.WALLET) {
+      return this.formatIntentStatus(local);
     }
 
-    return this.formatIntentStatus(intent);
-  }
+    // Pull/reconcile through the payment microservice (it refreshes stale intents from the
+    // provider itself). Falls back to the legacy local path when the service is unreachable
+    // or only a pre-cutover local intent exists.
+    let snapshot: PaymentIntentSnapshot | null = null;
+    try {
+      snapshot = await this.paymentClient.getIntentByReference(
+        PaymentReferenceType.BOOKING,
+        bookingId,
+      );
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.logger.warn(
+        `payment service lookup failed for booking ${bookingId}: ${message}; using local intent`,
+      );
+    }
 
-  private async applyProviderStatus(
-    intentId: string,
-    status: ProviderStatus,
-  ): Promise<void> {
-    const bizContent = (status.rawResponse as { biz_content?: { order_status?: string } })
-      ?.biz_content;
-    if (bizContent?.order_status === 'PAY_SUCCESS') {
+    if (!snapshot) {
+      // Pre-cutover/local-only intent (or service briefly unreachable): serve the cached
+      // status. The payment service owns provider refresh for everything initiated after
+      // the cutover; webhooks/mark-paid converge the rest.
+      if (!local) throw new NotFoundException("PaymentIntent not found");
+      return this.formatIntentStatus(local);
+    }
+
+    let intent = await this.syncIntentProjection(bookingId, snapshot);
+    if (snapshot.status === ProviderPaymentStatus.SUCCEEDED) {
+      // Poll observed success before (or instead of) the mark-paid event — converge now.
       await this.finalizePaymentSuccess({
-        intentId,
-        providerTxnId: status.providerTxnId,
+        intentId: intent.id,
+        providerTxnId: snapshot.providerTxnId,
+        paidAt: snapshot.paidAt ? new Date(snapshot.paidAt) : undefined,
       });
-      return;
-    }
-    if (status.status === ProviderPaymentStatus.FAILED) {
-      await this.markPaymentFailed({
-        intentId,
-        failureCode: status.failureCode,
-        failureMessage: status.failureMessage,
+      intent = await this.prisma.paymentIntent.findUniqueOrThrow({
+        where: { id: intent.id },
       });
-      return;
     }
-    await this.prisma.paymentIntent.update({
-      where: { id: intentId },
-      data: {
-        status: status.status as unknown as PaymentIntentStatus,
-        providerTxnId: status.providerTxnId ?? undefined,
-      },
-    });
+    return this.formatIntentStatus(intent);
   }
 
   private formatIntentStatus(
@@ -280,13 +334,25 @@ export class PaymentsService {
   }
 
   async refund(dto: RefundDto) {
-    const intent = await this.prisma.paymentIntent.findUnique({ where: { bookingId: dto.bookingId } });
-    if (!intent || intent.status !== 'SUCCEEDED') throw new BadRequestException('No successful payment to refund');
-    await this.prisma.paymentIntent.update({ where: { bookingId: dto.bookingId }, data: { status: 'CANCELLED' } });
-    const booking = await this.prisma.booking.findUnique({ where: { id: dto.bookingId }, include: { seats: true } });
+    const intent = await this.prisma.paymentIntent.findUnique({
+      where: { bookingId: dto.bookingId },
+    });
+    if (!intent || intent.status !== "SUCCEEDED")
+      throw new BadRequestException("No successful payment to refund");
+    await this.prisma.paymentIntent.update({
+      where: { bookingId: dto.bookingId },
+      data: { status: "CANCELLED" },
+    });
+    const booking = await this.prisma.booking.findUnique({
+      where: { id: dto.bookingId },
+      include: { seats: true },
+    });
     if (booking) {
       await this.seatsService.releaseSeats(booking.seats.map((s) => s.seatId));
-      await this.prisma.booking.update({ where: { id: dto.bookingId }, data: { status: 'CANCELLED' } });
+      await this.prisma.booking.update({
+        where: { id: dto.bookingId },
+        data: { status: "CANCELLED" },
+      });
     }
     return { refunded: true, bookingRef: booking?.bookingRef };
   }
@@ -296,7 +362,7 @@ export class PaymentsService {
       type: dto.type as unknown as PaymentMethodType,
       displayName: dto.displayName,
       region: dto.region as unknown as PaymentRegion,
-      currency: dto.currency ?? 'ETB',
+      currency: dto.currency ?? "ETB",
       providerId: dto.providerId,
       enabled: dto.enabled ?? true,
       sortOrder: dto.sortOrder ?? 0,
@@ -313,10 +379,17 @@ export class PaymentsService {
       where: {
         enabled: true,
         ...(region
-          ? { region: { in: [region, PaymentRegionEnum.GLOBAL] as unknown as PaymentRegion[] } }
+          ? {
+              region: {
+                in: [
+                  region,
+                  PaymentRegionEnum.GLOBAL,
+                ] as unknown as PaymentRegion[],
+              },
+            }
           : {}),
       },
-      orderBy: [{ sortOrder: 'asc' }, { displayName: 'asc' }],
+      orderBy: [{ sortOrder: "asc" }, { displayName: "asc" }],
     });
   }
 
@@ -328,19 +401,21 @@ export class PaymentsService {
     const intent = await this.prisma.paymentIntent.findUnique({
       where: { id: input.intentId },
     });
-    if (!intent) throw new NotFoundException('PaymentIntent not found');
+    if (!intent) throw new NotFoundException("PaymentIntent not found");
     if (intent.status === PaymentIntentStatus.SUCCEEDED) {
       return { alreadyFinalized: true };
     }
     if (intent.status === PaymentIntentStatus.CANCELLED) {
-      throw new BadRequestException('PaymentIntent is cancelled; cannot finalize');
+      throw new BadRequestException(
+        "PaymentIntent is cancelled; cannot finalize",
+      );
     }
 
     const booking = await this.prisma.booking.findUnique({
       where: { id: intent.bookingId },
       include: { seats: true },
     });
-    if (!booking) throw new NotFoundException('Booking not found');
+    if (!booking) throw new NotFoundException("Booking not found");
 
     const paidAt = input.paidAt ?? new Date();
     await this.prisma.$transaction(async (tx) => {
@@ -348,23 +423,134 @@ export class PaymentsService {
         where: { id: intent.id },
         data: {
           status: PaymentIntentStatus.SUCCEEDED,
-          providerTxnId: input.providerTxnId ?? intent.providerTxnId ?? undefined,
+          providerTxnId:
+            input.providerTxnId ?? intent.providerTxnId ?? undefined,
           paidAt,
         },
       });
       await tx.booking.update({
         where: { id: booking.id },
-        data: { status: 'CONFIRMED' },
+        data: { status: "CONFIRMED" },
       });
     });
 
-    await this.seatsService.confirmSeats(booking.seats.map((s) => s.seatId));
-    await this.ticketsService.generate(booking.id);
-    await this.awardLoyaltyPoints(booking.passengerId, booking.totalMinor, booking.id);
-    this.eventEmitter.emit('payment.succeeded', { booking });
+    try {
+      await this.seatsService.confirmSeats(booking.seats.map((s) => s.seatId));
+    } catch (err) {
+      this.logger.error(
+        `Error confirming seats: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+
+    try {
+      await this.createJourneySegments(booking);
+    } catch (err) {
+      this.logger.error(
+        `Error creating journey segments: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+
+    try {
+      await this.ticketsService.generate(booking.id);
+    } catch (err) {
+      this.logger.error(
+        `Error generating ticket: ${err instanceof Error ? err.message : String(err)}`,
+      );
+      throw err;
+    }
+
+    try {
+      await this.awardLoyaltyPoints(
+        booking.passengerId,
+        booking.totalMinor,
+        booking.id,
+      );
+    } catch (err) {
+      this.logger.warn(
+        `Error awarding loyalty points: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+
+    this.eventEmitter.emit("payment.succeeded", { booking });
     return { alreadyFinalized: false };
   }
 
+  async handlePaymentEvent(
+    event: PaymentEventDto,
+  ): Promise<MarkPaidResponseDto> {
+    if (
+      event.service !== PaymentServiceEnum.PASSENGER ||
+      event.referenceType !== PaymentReferenceType.BOOKING
+    ) {
+      this.logger.warn(
+        `mark-paid: ignoring foreign reference ${event.service}/${event.referenceType}/${event.referenceId}`,
+      );
+      return { processed: false, reason: "foreign-reference" };
+    }
+
+    if (event.eventType === "payment.failed") {
+      const intent = await this.prisma.paymentIntent.findUnique({
+        where: { bookingId: event.referenceId },
+      });
+      if (intent) {
+        await this.markPaymentFailed({
+          intentId: intent.id,
+          failureCode: event.failureCode,
+          failureMessage: event.failureMessage,
+        });
+      }
+      return { processed: true };
+    }
+
+    const booking = await this.prisma.booking.findUnique({
+      where: { id: event.referenceId },
+    });
+    if (!booking) {
+      // Ack (200) — a missing booking will not appear on redelivery; needs investigation.
+      this.logger.error(
+        `mark-paid: no booking for reference ${event.referenceId}`,
+      );
+      return { processed: false, reason: "booking-not-found" };
+    }
+
+    if (booking.totalMinor !== event.amountMinor) {
+      // Refuse to confirm: a 4xx makes the relay retry and eventually flag the row FAILED,
+      // which is the alertable signal for an asserted-vs-paid amount divergence.
+      this.logger.error(
+        `mark-paid: amount mismatch for booking ${booking.id}: booking=${booking.totalMinor} event=${event.amountMinor}`,
+      );
+      throw new BadRequestException(
+        "Event amount does not match booking total",
+      );
+    }
+
+    // Local intent row is a projection during the strangler migration: reuse it when the
+    // legacy initiate path created one, otherwise materialize it from the event.
+    let intent = await this.prisma.paymentIntent.findUnique({
+      where: { bookingId: event.referenceId },
+    });
+    if (!intent) {
+      intent = await this.prisma.paymentIntent.create({
+        data: {
+          bookingId: event.referenceId,
+          amountMinor: event.amountMinor,
+          currency: event.currency,
+          method: event.provider as unknown as PaymentMethodType,
+          status: PaymentIntentStatus.PROCESSING,
+          merchantOrderId: event.merchantOrderId,
+          providerTxnId: event.providerTxnId,
+        },
+      });
+    }
+
+    const { alreadyFinalized } = await this.finalizePaymentSuccess({
+      intentId: intent.id,
+      providerTxnId: event.providerTxnId,
+      paidAt: event.paidAt ? new Date(event.paidAt) : undefined,
+    });
+    return { processed: true, alreadyFinalized };
+  }
+
   async markPaymentFailed(input: {
     intentId: string;
     failureCode?: string;
@@ -373,7 +559,7 @@ export class PaymentsService {
     const intent = await this.prisma.paymentIntent.findUnique({
       where: { id: input.intentId },
     });
-    if (!intent) throw new NotFoundException('PaymentIntent not found');
+    if (!intent) throw new NotFoundException("PaymentIntent not found");
     if (
       intent.status === PaymentIntentStatus.SUCCEEDED ||
       intent.status === PaymentIntentStatus.CANCELLED
@@ -390,13 +576,93 @@ export class PaymentsService {
     });
   }
 
-  private async awardLoyaltyPoints(passengerId: string, amountMinor: number, bookingId: string) {
+  private async awardLoyaltyPoints(
+    passengerId: string,
+    amountMinor: number,
+    bookingId: string,
+  ) {
     const points = Math.floor(amountMinor / 100);
-    const account = await this.prisma.loyaltyAccount.findUnique({ where: { passengerId } });
+    const account = await this.prisma.loyaltyAccount.findUnique({
+      where: { passengerId },
+    });
     if (!account) return;
     const newBalance = account.pointsBalance + points;
-    const tier = newBalance >= 10000 ? 'PLATINUM' : newBalance >= 5000 ? 'GOLD' : newBalance >= 2000 ? 'SILVER' : 'BRONZE';
-    await this.prisma.loyaltyAccount.update({ where: { passengerId }, data: { pointsBalance: { increment: points }, tier: tier as any } });
-    await this.prisma.loyaltyLedgerEntry.create({ data: { accountId: account.id, delta: points, reason: 'TRIP_COMPLETED', bookingId, balanceAfter: newBalance } });
+    const tier =
+      newBalance >= 10000
+        ? "PLATINUM"
+        : newBalance >= 5000
+          ? "GOLD"
+          : newBalance >= 2000
+            ? "SILVER"
+            : "BRONZE";
+    await this.prisma.loyaltyAccount.update({
+      where: { passengerId },
+      data: { pointsBalance: { increment: points }, tier: tier as any },
+    });
+    await this.prisma.loyaltyLedgerEntry.create({
+      data: {
+        accountId: account.id,
+        delta: points,
+        reason: "TRIP_COMPLETED",
+        bookingId,
+        balanceAfter: newBalance,
+      },
+    });
+  }
+
+  private async createJourneySegments(
+    booking: Prisma.BookingGetPayload<{ include: { seats: true } }>,
+  ) {
+    const schedule = await this.prisma.trainSchedule.findUnique({
+      where: { id: booking.scheduleId },
+      include: {
+        stopTimes: { include: { station: true }, orderBy: { sequence: "asc" } },
+      },
+    });
+    if (!schedule) return;
+
+    const stopTimes = schedule.stopTimes;
+    if (stopTimes.length < 2) return;
+
+    const originSequence = stopTimes.findIndex(
+      (st) => st.stationId === schedule.originStationId,
+    );
+    const destSequence = stopTimes.findIndex(
+      (st) => st.stationId === schedule.destinationStationId,
+    );
+
+    if (
+      originSequence < 0 ||
+      destSequence < 0 ||
+      originSequence >= destSequence
+    )
+      return;
+
+    const journey = await this.prisma.journey.create({
+      data: {
+        passengerId: booking.passengerId,
+        status: "CONFIRMED",
+        totalMinor: booking.totalMinor,
+        currency: booking.currency,
+      },
+    });
+
+    const journeySegments = [];
+    for (const bookingSeat of booking.seats) {
+      for (let i = originSequence; i < destSequence; i++) {
+        journeySegments.push({
+          journeyId: journey.id,
+          scheduleId: booking.scheduleId,
+          segmentOrder: i,
+          seatId: bookingSeat.seatId,
+          departureStationId: stopTimes[i].stationId,
+          arrivalStationId: stopTimes[i + 1].stationId,
+        });
+      }
+    }
+
+    if (journeySegments.length > 0) {
+      await this.prisma.journeySegment.createMany({ data: journeySegments });
+    }
   }
 }
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.types.ts b/apps/edr-passenger-api/src/modules/payments/payments.types.ts
index 686274065..2e9463ad3 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.types.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.types.ts
@@ -1,5 +1,6 @@
-// The payment provider contract now lives in @edr/types (consumed via @edr/payment-providers).
-// This file remains as a thin re-export so existing local imports keep working.
+// The payment provider contract lives in @edr/types; the gateways themselves now run only
+// inside apps/edr-payment-api. This file remains as a thin re-export so existing local
+// imports keep working.
 export type {
   PaymentProvider,
   ProviderInitiationInput,
@@ -7,5 +8,5 @@ export type {
   ProviderStatus,
   ClientAction,
   PaymentPlatform,
-} from '@edr/types';
-export { ProviderPaymentStatus, ProviderMethod } from '@edr/types';
+} from "@edr/types";
+export { ProviderPaymentStatus, ProviderMethod } from "@edr/types";
diff --git a/apps/edr-passenger-api/src/modules/payments/webhooks/card-webhook.service.ts b/apps/edr-passenger-api/src/modules/payments/webhooks/card-webhook.service.ts
deleted file mode 100644
index 5bf977107..000000000
--- a/apps/edr-passenger-api/src/modules/payments/webhooks/card-webhook.service.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { Prisma, PaymentIntentStatus, PaymentMethodType } from '@prisma/client';
-import {
-  CardProvider,
-  CardWebhookPayload,
-  ProviderPaymentStatus,
-} from '@edr/payment-providers';
-import { PrismaService } from '../../../common/prisma.service';
-import { PaymentsService } from '../payments.service';
-
-@Injectable()
-export class CardWebhookService {
-  private readonly logger = new Logger(CardWebhookService.name);
-
-  constructor(
-    private readonly prisma: PrismaService,
-    private readonly provider: CardProvider,
-    private readonly payments: PaymentsService,
-  ) {}
-
-  async handle(payload: CardWebhookPayload, signature: string): Promise<void> {
-    const merchantOrderId = payload.data.object.metadata.merchantOrderId;
-    const externalEventId = `${payload.id}_${payload.type}`;
-    const signatureValid = this.provider.verifyWebhookSignature(
-      payload as unknown as Record<string, unknown>,
-      signature,
-    );
-
-    const eventRow = await this.persistEvent({
-      externalEventId,
-      merchantOrderId,
-      providerTxnId: payload.data.object.transaction_id,
-      signatureValid,
-      status: payload.data.object.status,
-      payload,
-    });
-
-    if (!eventRow) {
-      this.logger.log(`Card webhook duplicate: ${externalEventId} — short-circuit OK`);
-      return;
-    }
-
-    if (!signatureValid) {
-      this.logger.warn(`Card webhook signature invalid for merchantOrderId=${merchantOrderId}`);
-      await this.markProcessed(eventRow.id, 'signature-invalid');
-      return;
-    }
-
-    const intent = await this.prisma.paymentIntent.findUnique({
-      where: { merchantOrderId },
-    });
-    if (!intent) {
-      this.logger.warn(`Card webhook: no PaymentIntent for merchantOrderId=${merchantOrderId}`);
-      await this.markProcessed(eventRow.id, 'intent-not-found');
-      return;
-    }
-
-    const mapped = this.provider.mapWebhookStatus(payload.data.object.status);
-
-    try {
-      if (mapped === ProviderPaymentStatus.SUCCEEDED) {
-        await this.payments.finalizePaymentSuccess({
-          intentId: intent.id,
-          providerTxnId: payload.data.object.transaction_id,
-          paidAt: payload.data.object.paid_at ? new Date(payload.data.object.paid_at * 1000) : undefined,
-        });
-      } else if (mapped === ProviderPaymentStatus.FAILED) {
-        await this.payments.markPaymentFailed({
-          intentId: intent.id,
-          failureCode: payload.data.object.failure_code,
-          failureMessage: payload.data.object.failure_message,
-        });
-      } else {
-        await this.prisma.paymentIntent.update({
-          where: { id: intent.id },
-          data: {
-            status: mapped as unknown as PaymentIntentStatus,
-            providerTxnId: payload.data.object.transaction_id ?? undefined,
-          },
-        });
-      }
-      await this.markProcessed(eventRow.id);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(`Card webhook processing failed for ${merchantOrderId}: ${message}`);
-      await this.markProcessed(eventRow.id, `processing-error: ${message}`);
-      throw err;
-    }
-  }
-
-  private async persistEvent(input: {
-    externalEventId: string;
-    merchantOrderId: string;
-    providerTxnId?: string;
-    signatureValid: boolean;
-    status: string;
-    payload: CardWebhookPayload;
-  }): Promise<{ id: string } | null> {
-    try {
-      return await this.prisma.paymentWebhookEvent.create({
-        data: {
-          provider: PaymentMethodType.CARD,
-          externalEventId: input.externalEventId,
-          merchantOrderId: input.merchantOrderId,
-          providerTxnId: input.providerTxnId,
-          signatureValid: input.signatureValid,
-          status: input.status,
-          payload: input.payload as unknown as Prisma.InputJsonValue,
-        },
-        select: { id: true },
-      });
-    } catch (err) {
-      if (
-        err instanceof Prisma.PrismaClientKnownRequestError &&
-        err.code === 'P2002'
-      ) {
-        return null;
-      }
-      throw err;
-    }
-  }
-
-  private async markProcessed(eventId: string, processingError?: string): Promise<void> {
-    await this.prisma.paymentWebhookEvent.update({
-      where: { id: eventId },
-      data: { processedAt: new Date(), processingError },
-    });
-  }
-}
diff --git a/apps/edr-passenger-api/src/modules/payments/webhooks/cbe-birr-webhook.service.ts b/apps/edr-passenger-api/src/modules/payments/webhooks/cbe-birr-webhook.service.ts
deleted file mode 100644
index 42502e941..000000000
--- a/apps/edr-passenger-api/src/modules/payments/webhooks/cbe-birr-webhook.service.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { Prisma, PaymentIntentStatus, PaymentMethodType } from '@prisma/client';
-import {
-  CbeBirrProvider,
-  CbeBirrWebhookPayload,
-  ProviderPaymentStatus,
-} from '@edr/payment-providers';
-import { PrismaService } from '../../../common/prisma.service';
-import { PaymentsService } from '../payments.service';
-
-@Injectable()
-export class CbeBirrWebhookService {
-  private readonly logger = new Logger(CbeBirrWebhookService.name);
-
-  constructor(
-    private readonly prisma: PrismaService,
-    private readonly provider: CbeBirrProvider,
-    private readonly payments: PaymentsService,
-  ) {}
-
-  async handle(payload: CbeBirrWebhookPayload): Promise<void> {
-    const merchantOrderId = payload.merchantOrderId;
-    const externalEventId = `${payload.orderId}_${payload.status}`;
-    const signatureValid = this.provider.verifyWebhookSignature(
-      payload as unknown as Record<string, unknown>,
-    );
-
-    const eventRow = await this.persistEvent({
-      externalEventId,
-      merchantOrderId,
-      providerTxnId: payload.transactionId ?? payload.orderId,
-      signatureValid,
-      status: payload.status,
-      payload,
-    });
-
-    if (!eventRow) {
-      this.logger.log(`CBE Birr webhook duplicate: ${externalEventId} — short-circuit OK`);
-      return;
-    }
-
-    if (!signatureValid) {
-      this.logger.warn(`CBE Birr webhook signature invalid for merchantOrderId=${merchantOrderId}`);
-      await this.markProcessed(eventRow.id, 'signature-invalid');
-      return;
-    }
-
-    const intent = await this.prisma.paymentIntent.findUnique({
-      where: { merchantOrderId },
-    });
-    if (!intent) {
-      this.logger.warn(`CBE Birr webhook: no PaymentIntent for merchantOrderId=${merchantOrderId}`);
-      await this.markProcessed(eventRow.id, 'intent-not-found');
-      return;
-    }
-
-    const mapped = this.provider.mapWebhookStatus(payload.status);
-
-    try {
-      if (mapped === ProviderPaymentStatus.SUCCEEDED) {
-        await this.payments.finalizePaymentSuccess({
-          intentId: intent.id,
-          providerTxnId: payload.transactionId ?? payload.orderId,
-          paidAt: payload.paidAt ? new Date(payload.paidAt) : undefined,
-        });
-      } else if (mapped === ProviderPaymentStatus.FAILED) {
-        await this.payments.markPaymentFailed({
-          intentId: intent.id,
-          failureCode: payload.status,
-        });
-      } else {
-        await this.prisma.paymentIntent.update({
-          where: { id: intent.id },
-          data: {
-            status: mapped as unknown as PaymentIntentStatus,
-            providerTxnId: payload.transactionId ?? undefined,
-          },
-        });
-      }
-      await this.markProcessed(eventRow.id);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(`CBE Birr webhook processing failed for ${merchantOrderId}: ${message}`);
-      await this.markProcessed(eventRow.id, `processing-error: ${message}`);
-      throw err;
-    }
-  }
-
-  private async persistEvent(input: {
-    externalEventId: string;
-    merchantOrderId: string;
-    providerTxnId?: string;
-    signatureValid: boolean;
-    status: string;
-    payload: CbeBirrWebhookPayload;
-  }): Promise<{ id: string } | null> {
-    try {
-      return await this.prisma.paymentWebhookEvent.create({
-        data: {
-          provider: PaymentMethodType.CBE_BIRR,
-          externalEventId: input.externalEventId,
-          merchantOrderId: input.merchantOrderId,
-          providerTxnId: input.providerTxnId,
-          signatureValid: input.signatureValid,
-          status: input.status,
-          payload: input.payload as unknown as Prisma.InputJsonValue,
-        },
-        select: { id: true },
-      });
-    } catch (err) {
-      if (
-        err instanceof Prisma.PrismaClientKnownRequestError &&
-        err.code === 'P2002'
-      ) {
-        return null;
-      }
-      throw err;
-    }
-  }
-
-  private async markProcessed(eventId: string, processingError?: string): Promise<void> {
-    await this.prisma.paymentWebhookEvent.update({
-      where: { id: eventId },
-      data: { processedAt: new Date(), processingError },
-    });
-  }
-}
diff --git a/apps/edr-passenger-api/src/modules/payments/webhooks/ebirr-webhook.service.ts b/apps/edr-passenger-api/src/modules/payments/webhooks/ebirr-webhook.service.ts
deleted file mode 100644
index ace727a2a..000000000
--- a/apps/edr-passenger-api/src/modules/payments/webhooks/ebirr-webhook.service.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { Prisma, PaymentIntentStatus, PaymentMethodType } from '@prisma/client';
-import {
-  EBirrProvider,
-  EBirrWebhookPayload,
-  ProviderPaymentStatus,
-} from '@edr/payment-providers';
-import { PrismaService } from '../../../common/prisma.service';
-import { PaymentsService } from '../payments.service';
-
-@Injectable()
-export class EBirrWebhookService {
-  private readonly logger = new Logger(EBirrWebhookService.name);
-
-  constructor(
-    private readonly prisma: PrismaService,
-    private readonly provider: EBirrProvider,
-    private readonly payments: PaymentsService,
-  ) {}
-
-  async handle(payload: EBirrWebhookPayload): Promise<void> {
-    const merchantOrderId = payload.orderNo;
-    const externalEventId = `${payload.orderNo}_${payload.tradeStatus}_${payload.timestamp}`;
-    const signatureValid = this.provider.verifyWebhookSignature(
-      payload as unknown as Record<string, unknown>,
-    );
-
-    const eventRow = await this.persistEvent({
-      externalEventId,
-      merchantOrderId,
-      providerTxnId: payload.tradeNo,
-      signatureValid,
-      status: payload.tradeStatus,
-      payload,
-    });
-
-    if (!eventRow) {
-      this.logger.log(`eBirr webhook duplicate: ${externalEventId} — short-circuit OK`);
-      return;
-    }
-
-    if (!signatureValid) {
-      this.logger.warn(`eBirr webhook signature invalid for orderNo=${merchantOrderId}`);
-      await this.markProcessed(eventRow.id, 'signature-invalid');
-      return;
-    }
-
-    const intent = await this.prisma.paymentIntent.findUnique({
-      where: { merchantOrderId },
-    });
-    if (!intent) {
-      this.logger.warn(`eBirr webhook: no PaymentIntent for orderNo=${merchantOrderId}`);
-      await this.markProcessed(eventRow.id, 'intent-not-found');
-      return;
-    }
-
-    const mapped = this.provider.mapWebhookStatus(payload.tradeStatus);
-
-    try {
-      if (mapped === ProviderPaymentStatus.SUCCEEDED) {
-        await this.payments.finalizePaymentSuccess({
-          intentId: intent.id,
-          providerTxnId: payload.tradeNo,
-          paidAt: payload.payTime ? new Date(payload.payTime) : undefined,
-        });
-      } else if (mapped === ProviderPaymentStatus.FAILED) {
-        await this.payments.markPaymentFailed({
-          intentId: intent.id,
-          failureCode: payload.tradeStatus,
-        });
-      } else {
-        await this.prisma.paymentIntent.update({
-          where: { id: intent.id },
-          data: {
-            status: mapped as unknown as PaymentIntentStatus,
-            providerTxnId: payload.tradeNo ?? undefined,
-          },
-        });
-      }
-      await this.markProcessed(eventRow.id);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(`eBirr webhook processing failed for ${merchantOrderId}: ${message}`);
-      await this.markProcessed(eventRow.id, `processing-error: ${message}`);
-      throw err;
-    }
-  }
-
-  private async persistEvent(input: {
-    externalEventId: string;
-    merchantOrderId: string;
-    providerTxnId?: string;
-    signatureValid: boolean;
-    status: string;
-    payload: EBirrWebhookPayload;
-  }): Promise<{ id: string } | null> {
-    try {
-      return await this.prisma.paymentWebhookEvent.create({
-        data: {
-          provider: PaymentMethodType.EBIRR,
-          externalEventId: input.externalEventId,
-          merchantOrderId: input.merchantOrderId,
-          providerTxnId: input.providerTxnId,
-          signatureValid: input.signatureValid,
-          status: input.status,
-          payload: input.payload as unknown as Prisma.InputJsonValue,
-        },
-        select: { id: true },
-      });
-    } catch (err) {
-      if (
-        err instanceof Prisma.PrismaClientKnownRequestError &&
-        err.code === 'P2002'
-      ) {
-        return null;
-      }
-      throw err;
-    }
-  }
-
-  private async markProcessed(eventId: string, processingError?: string): Promise<void> {
-    await this.prisma.paymentWebhookEvent.update({
-      where: { id: eventId },
-      data: { processedAt: new Date(), processingError },
-    });
-  }
-}
diff --git a/apps/edr-passenger-api/src/modules/payments/webhooks/telebirr-webhook.service.ts b/apps/edr-passenger-api/src/modules/payments/webhooks/telebirr-webhook.service.ts
deleted file mode 100644
index 1f2b06c3e..000000000
--- a/apps/edr-passenger-api/src/modules/payments/webhooks/telebirr-webhook.service.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { Prisma, PaymentIntentStatus, PaymentMethodType } from '@prisma/client';
-import {
-  TelebirrProvider,
-  TelebirrWebhookPayload,
-  ProviderPaymentStatus,
-} from '@edr/payment-providers';
-import { PrismaService } from '../../../common/prisma.service';
-import { PaymentsService } from '../payments.service';
-
-@Injectable()
-export class TelebirrWebhookService {
-  private readonly logger = new Logger(TelebirrWebhookService.name);
-
-  constructor(
-    private readonly prisma: PrismaService,
-    private readonly provider: TelebirrProvider,
-    private readonly payments: PaymentsService,
-  ) {}
-
-  async handle(payload: TelebirrWebhookPayload): Promise<void> {
-    const merchantOrderId = payload.merch_order_id;
-    const externalEventId = this.buildExternalEventId(payload);
-    // TODO: re-enable Telebirr public-key signature verification — skipped for now
-    // const signatureValid = this.provider.verifyWebhookSignature(
-    //   payload as unknown as Record<string, unknown>,
-    // );
-    const signatureValid = true;
-
-    const eventRow = await this.persistEvent({
-      externalEventId,
-      merchantOrderId,
-      providerTxnId: payload.trans_id ?? payload.payment_order_id,
-      signatureValid,
-      status: payload.trade_status,
-      payload,
-    });
-
-    if (!eventRow) {
-      this.logger.log(
-        `Telebirr webhook duplicate: ${externalEventId} — short-circuit OK`,
-      );
-      return;
-    }
-
-    // TODO: re-enable signature gate once verifyWebhookSignature is restored
-    // if (!signatureValid) {
-    //   this.logger.warn(
-    //     `Telebirr webhook signature invalid for merch_order_id=${merchantOrderId}`,
-    //   );
-    //   await this.markProcessed(eventRow.id, 'signature-invalid');
-    //   return;
-    // }
-
-    const intent = await this.prisma.paymentIntent.findUnique({
-      where: { merchantOrderId },
-    });
-    if (!intent) {
-      this.logger.warn(
-        `Telebirr webhook: no PaymentIntent for merch_order_id=${merchantOrderId}`,
-      );
-      await this.markProcessed(eventRow.id, 'intent-not-found');
-      return;
-    }
-
-    const mapped = this.provider.mapWebhookTradeStatus(payload.trade_status);
-
-    try {
-      if (mapped === ProviderPaymentStatus.SUCCEEDED) {
-        await this.payments.finalizePaymentSuccess({
-          intentId: intent.id,
-          providerTxnId: payload.trans_id ?? payload.payment_order_id,
-          paidAt: this.parseEpochSeconds(payload.trans_end_time),
-        });
-      } else if (mapped === ProviderPaymentStatus.FAILED) {
-        await this.payments.markPaymentFailed({
-          intentId: intent.id,
-          failureCode: payload.trade_status,
-        });
-      } else {
-        await this.prisma.paymentIntent.update({
-          where: { id: intent.id },
-          data: {
-            status: mapped as unknown as PaymentIntentStatus,
-            providerTxnId: payload.trans_id ?? undefined,
-          },
-        });
-      }
-      await this.markProcessed(eventRow.id);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(
-        `Telebirr webhook processing failed for ${merchantOrderId}: ${message}`,
-      );
-      await this.markProcessed(eventRow.id, `processing-error: ${message}`);
-      throw err;
-    }
-  }
-
-  private buildExternalEventId(payload: TelebirrWebhookPayload): string {
-    return `${payload.payment_order_id}_${payload.trade_status}`;
-  }
-
-  private async persistEvent(input: {
-    externalEventId: string;
-    merchantOrderId: string;
-    providerTxnId?: string;
-    signatureValid: boolean;
-    status: string;
-    payload: TelebirrWebhookPayload;
-  }): Promise<{ id: string } | null> {
-    try {
-      return await this.prisma.paymentWebhookEvent.create({
-        data: {
-          provider: PaymentMethodType.TELEBIRR,
-          externalEventId: input.externalEventId,
-          merchantOrderId: input.merchantOrderId,
-          providerTxnId: input.providerTxnId,
-          signatureValid: input.signatureValid,
-          status: input.status,
-          payload: input.payload as unknown as Prisma.InputJsonValue,
-        },
-        select: { id: true },
-      });
-    } catch (err) {
-      if (
-        err instanceof Prisma.PrismaClientKnownRequestError &&
-        err.code === 'P2002'
-      ) {
-        return null;
-      }
-      throw err;
-    }
-  }
-
-  private async markProcessed(eventId: string, processingError?: string): Promise<void> {
-    await this.prisma.paymentWebhookEvent.update({
-      where: { id: eventId },
-      data: { processedAt: new Date(), processingError },
-    });
-  }
-
-  private parseEpochSeconds(raw: string | undefined): Date | undefined {
-    if (!raw) return undefined;
-    const n = parseInt(raw, 10);
-    if (Number.isNaN(n)) return undefined;
-    return new Date(n * 1000);
-  }
-}
diff --git a/apps/edr-passenger-api/src/modules/payments/webhooks/waafi-webhook.service.ts b/apps/edr-passenger-api/src/modules/payments/webhooks/waafi-webhook.service.ts
deleted file mode 100644
index 972b09b3d..000000000
--- a/apps/edr-passenger-api/src/modules/payments/webhooks/waafi-webhook.service.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import {
-  WaafiProvider,
-  WaafiWebhookPayload,
-  ProviderPaymentStatus,
-} from '@edr/payment-providers';
-import { PaymentIntentStatus, PaymentMethodType } from '@prisma/client';
-import { PrismaService } from '../../../common/prisma.service';
-import { PaymentsService } from '../payments.service';
-
-@Injectable()
-export class WaafiWebhookService {
-  private readonly logger = new Logger(WaafiWebhookService.name);
-
-  constructor(
-    private prisma: PrismaService,
-    private paymentsService: PaymentsService,
-    private waafiProvider: WaafiProvider,
-  ) {}
-
-  async handleWebhook(payload: WaafiWebhookPayload): Promise<{ received: boolean }> {
-    this.logger.log(
-      `Waafi webhook received: event=${payload.eventType} ref=${payload.params?.referenceId}`,
-    );
-
-    const signatureValid = this.waafiProvider.verifyWebhookSignature(
-      payload as unknown as Record<string, unknown>,
-    );
-
-    const merchantOrderId = payload.params?.referenceId;
-    const transactionId = payload.params?.transactionId;
-    const state = payload.params?.state;
-
-    await this.prisma.paymentWebhookEvent.create({
-      data: {
-        provider: PaymentMethodType.WAAFI,
-        externalEventId: payload.requestId,
-        merchantOrderId,
-        providerTxnId: transactionId,
-        signatureValid,
-        status: state || 'UNKNOWN',
-        payload: payload as any,
-      },
-    });
-
-    if (!signatureValid) {
-      this.logger.warn(`Waafi webhook signature invalid for ref=${merchantOrderId}`);
-      return { received: true };
-    }
-
-    if (!merchantOrderId) {
-      this.logger.error('Waafi webhook missing referenceId');
-      return { received: true };
-    }
-
-    const intent = await this.prisma.paymentIntent.findFirst({
-      where: { merchantOrderId },
-    });
-
-    if (!intent) {
-      this.logger.warn(`No PaymentIntent found for merchantOrderId=${merchantOrderId}`);
-      return { received: true };
-    }
-
-    const mappedStatus = this.waafiProvider.mapState(state);
-
-    if (mappedStatus === ProviderPaymentStatus.SUCCEEDED) {
-      await this.paymentsService.finalizePaymentSuccess({
-        intentId: intent.id,
-        providerTxnId: transactionId,
-      });
-      this.logger.log(`Waafi payment succeeded: intent=${intent.id} txn=${transactionId}`);
-    } else if (mappedStatus === ProviderPaymentStatus.FAILED) {
-      await this.paymentsService.markPaymentFailed({
-        intentId: intent.id,
-        failureCode: state,
-        failureMessage: payload.params?.description,
-      });
-      this.logger.log(`Waafi payment failed: intent=${intent.id} state=${state}`);
-    } else {
-      await this.prisma.paymentIntent.update({
-        where: { id: intent.id },
-        data: {
-          status: mappedStatus as unknown as PaymentIntentStatus,
-          providerTxnId: transactionId,
-        },
-      });
-      this.logger.log(`Waafi payment status updated: intent=${intent.id} status=${mappedStatus}`);
-    }
-
-    return { received: true };
-  }
-}
diff --git a/apps/edr-passenger-api/src/modules/payments/webhooks/webhooks.controller.ts b/apps/edr-passenger-api/src/modules/payments/webhooks/webhooks.controller.ts
deleted file mode 100644
index 4dd340d06..000000000
--- a/apps/edr-passenger-api/src/modules/payments/webhooks/webhooks.controller.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import {All, Body, Controller, Headers, HttpCode, HttpStatus, Logger, Post} from '@nestjs/common';
-import { ApiOperation, ApiTags } from '@nestjs/swagger';
-import {
-  TelebirrWebhookPayload,
-  CbeBirrWebhookPayload,
-  EBirrWebhookPayload,
-  CardWebhookPayload,
-} from '@edr/payment-providers';
-import { TelebirrWebhookService } from './telebirr-webhook.service';
-import { CbeBirrWebhookService } from './cbe-birr-webhook.service';
-import { EBirrWebhookService } from './ebirr-webhook.service';
-import { CardWebhookService } from './card-webhook.service';
-import { WaafiWebhookService } from './waafi-webhook.service';
-
-@ApiTags('Payment Webhooks')
-@Controller('payments/webhooks')
-export class WebhooksController {
-  private readonly logger = new Logger(WebhooksController.name);
-
-  constructor(
-    private readonly telebirr: TelebirrWebhookService,
-    private readonly cbeBirr: CbeBirrWebhookService,
-    private readonly eBirr: EBirrWebhookService,
-    private readonly card: CardWebhookService,
-    private readonly waafi: WaafiWebhookService,
-  ) {}
-
-  @All('telebirr')
-  @HttpCode(HttpStatus.OK)
-  @ApiOperation({ 
-    summary: 'Telebirr payment notification callback (Ethiopia)',
-    description: 'Webhook endpoint for Telebirr payment status updates. Used by Ethiopian passengers.'
-  })
-  async receiveTelebirr(@Body() payload: TelebirrWebhookPayload) {
-
-    this.logger.log(
-        `Telebirr webhook Called`,
-    );
-
-    try {
-      await this.telebirr.handle(payload);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(`Telebirr webhook handler threw: ${message}`);
-    }
-    return { code: '0', message: 'OK' };
-  }
-
-  @Post('cbe-birr')
-  @HttpCode(HttpStatus.OK)
-  @ApiOperation({ 
-    summary: 'CBE Birr payment notification callback (Ethiopia)',
-    description: 'Webhook endpoint for Commercial Bank of Ethiopia payment status updates.'
-  })
-  async receiveCbeBirr(@Body() payload: CbeBirrWebhookPayload) {
-    try {
-      await this.cbeBirr.handle(payload);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(`CBE Birr webhook handler threw: ${message}`);
-    }
-    return { success: true };
-  }
-
-  @Post('ebirr')
-  @HttpCode(HttpStatus.OK)
-  @ApiOperation({ 
-    summary: 'eBirr payment notification callback (Ethiopia)',
-    description: 'Webhook endpoint for eBirr electronic payment gateway status updates.'
-  })
-  async receiveEBirr(@Body() payload: EBirrWebhookPayload) {
-    try {
-      await this.eBirr.handle(payload);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(`eBirr webhook handler threw: ${message}`);
-    }
-    return { code: '0000', message: 'success' };
-  }
-
-  @Post('card')
-  @HttpCode(HttpStatus.OK)
-  @ApiOperation({ 
-    summary: 'Card payment notification callback (International)',
-    description: 'Webhook endpoint for international card payments (Visa, Mastercard) via Stripe.'
-  })
-  async receiveCard(
-    @Body() payload: CardWebhookPayload,
-    @Headers('stripe-signature') signature: string,
-  ) {
-    try {
-      await this.card.handle(payload, signature);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(`Card webhook handler threw: ${message}`);
-    }
-    return { received: true };
-  }
-
-  @Post('waafi')
-  @HttpCode(HttpStatus.OK)
-  @ApiOperation({ 
-    summary: 'Waafi payment notification callback (Djibouti)',
-    description: 'Webhook endpoint for Waafi mobile money payment status updates. Used by Djiboutian passengers.'
-  })
-  async receiveWaafi(@Body() payload: any) {
-    try {
-      await this.waafi.handleWebhook(payload);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.logger.error(`Waafi webhook handler threw: ${message}`);
-    }
-    return { responseCode: '2001', responseMsg: 'Success' };
-  }
-}
diff --git a/apps/edr-passenger-api/src/modules/promos/promos.controller.ts b/apps/edr-passenger-api/src/modules/promos/promos.controller.ts
index ccb76e051..8bdf8f868 100644
--- a/apps/edr-passenger-api/src/modules/promos/promos.controller.ts
+++ b/apps/edr-passenger-api/src/modules/promos/promos.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common';
+import { Body, Controller, Get, Param, Post, UseGuards, Query, Patch, Delete } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth } from '@nestjs/swagger';
 import { PromosService } from './promos.service';
 import { CreatePromotionDto } from './promos.dto';
@@ -8,7 +8,66 @@ import { JwtGuard } from '../../common/jwt.guard';
 @Controller('promos')
 export class PromosController {
   constructor(private service: PromosService) {}
-  @Get()                  @ApiOperation({ summary: 'Get active promotions' })       getActive() { return this.service.getActive(); }
-  @Get('validate/:code')  @ApiOperation({ summary: 'Validate a promo code' })       validate(@Param('code') code: string) { return this.service.validate(code); }
-  @Post() @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth') @ApiOperation({ summary: 'Create promotion (admin)' }) create(@Body() dto: CreatePromotionDto) { return this.service.create(dto); }
+
+  @Get()
+  @ApiOperation({ summary: 'Get active promotions' })
+  getActive() {
+    return this.service.getActive();
+  }
+
+  @Get('all')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Get all promos with filters (admin)' })
+  getAll(
+    @Query('search') search?: string,
+    @Query('active') active?: string,
+    @Query('page') page?: string,
+    @Query('pageSize') pageSize?: string,
+  ) {
+    return this.service.getAll({
+      search,
+      active: active === 'true' ? true : active === 'false' ? false : undefined,
+      page: page ? parseInt(page) : 1,
+      pageSize: pageSize ? parseInt(pageSize) : 10,
+    });
+  }
+
+  @Get(':id')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Get promo by ID' })
+  getById(@Param('id') id: string) {
+    return this.service.getById(id);
+  }
+
+  @Get('validate/:code')
+  @ApiOperation({ summary: 'Validate a promo code' })
+  validate(@Param('code') code: string) {
+    return this.service.validate(code);
+  }
+
+  @Post()
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Create promotion (admin)' })
+  create(@Body() dto: CreatePromotionDto) {
+    return this.service.create(dto);
+  }
+
+  @Patch(':id')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Update promo (admin)' })
+  update(@Param('id') id: string, @Body() dto: Partial<CreatePromotionDto>) {
+    return this.service.update(id, dto);
+  }
+
+  @Delete(':id')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Delete promo (admin)' })
+  delete(@Param('id') id: string) {
+    return this.service.delete(id);
+  }
 }
diff --git a/apps/edr-passenger-api/src/modules/promos/promos.dto.ts b/apps/edr-passenger-api/src/modules/promos/promos.dto.ts
index 421269f5c..759fe371e 100644
--- a/apps/edr-passenger-api/src/modules/promos/promos.dto.ts
+++ b/apps/edr-passenger-api/src/modules/promos/promos.dto.ts
@@ -1,13 +1,46 @@
-import { IsString, IsOptional, IsInt } from 'class-validator';
+import { IsString, IsOptional, IsInt, IsBoolean } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 
 export class CreatePromotionDto {
-  @ApiProperty({ example: 'Weekend Special' }) @IsString() title: string;
-  @ApiPropertyOptional({ example: '15% off all routes' }) @IsOptional() @IsString() subtitle?: string;
-  @ApiProperty({ example: 'WEEKEND15' }) @IsString() code: string;
-  @ApiPropertyOptional({ example: 15 }) @IsOptional() @IsInt() percentOff?: number;
-  @ApiPropertyOptional({ example: 5000 }) @IsOptional() @IsInt() amountOffMinor?: number;
-  @ApiProperty({ example: '2026-12-31T23:59:59Z' }) @IsString() validUntil: string;
-  @ApiPropertyOptional({ example: 'Book Now' }) @IsOptional() @IsString() ctaLabel?: string;
-  @ApiPropertyOptional({ example: 'edr://search' }) @IsOptional() @IsString() deepLink?: string;
+  @ApiProperty({ example: 'SUMMER2024' })
+  @IsString()
+  code: string;
+
+  @ApiProperty({ example: 'Summer Discount' })
+  @IsString()
+  title: string;
+
+  @ApiPropertyOptional({ example: 'Get 15% off' })
+  @IsOptional()
+  @IsString()
+  subtitle?: string;
+
+  @ApiPropertyOptional({ example: 15 })
+  @IsOptional()
+  @IsInt()
+  percentOff?: number;
+
+  @ApiPropertyOptional({ example: 5000 })
+  @IsOptional()
+  @IsInt()
+  amountOffMinor?: number;
+
+  @ApiProperty({ example: '2026-12-31T23:59:59Z' })
+  @IsString()
+  validUntil: string;
+
+  @ApiPropertyOptional({ example: 'Book Now' })
+  @IsOptional()
+  @IsString()
+  ctaLabel?: string;
+
+  @ApiPropertyOptional({ example: 'edr://search' })
+  @IsOptional()
+  @IsString()
+  deepLink?: string;
+
+  @ApiPropertyOptional({ example: true })
+  @IsOptional()
+  @IsBoolean()
+  active?: boolean;
 }
diff --git a/apps/edr-passenger-api/src/modules/promos/promos.service.ts b/apps/edr-passenger-api/src/modules/promos/promos.service.ts
index 97a8ed275..141d80b57 100644
--- a/apps/edr-passenger-api/src/modules/promos/promos.service.ts
+++ b/apps/edr-passenger-api/src/modules/promos/promos.service.ts
@@ -1,20 +1,190 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, BadRequestException, NotFoundException } from '@nestjs/common';
 import { PrismaService } from '../../common/prisma.service';
 import { CreatePromotionDto } from './promos.dto';
+import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
 
 @Injectable()
 export class PromosService {
   constructor(private prisma: PrismaService) {}
 
-  getActive() { return this.prisma.promotion.findMany({ where: { active: true, validUntil: { gte: new Date() } }, orderBy: { createdAt: 'desc' } }); }
+  getActive() {
+    return this.prisma.promotion.findMany({
+      where: { active: true, validUntil: { gte: new Date() } },
+      orderBy: { createdAt: 'desc' },
+    });
+  }
+
+  async getAll(filters: { search?: string; active?: boolean; page?: number; pageSize?: number }) {
+    const { search, active, page = 1, pageSize = 10 } = filters;
+    const skip = (page - 1) * pageSize;
+
+    const where: any = {};
+    if (search) {
+      where.OR = [
+        { code: { contains: search, mode: 'insensitive' } },
+        { title: { contains: search, mode: 'insensitive' } },
+      ];
+    }
+    if (active !== undefined) {
+      where.active = active;
+    }
+
+    const [items, total] = await Promise.all([
+      this.prisma.promotion.findMany({
+        where,
+        skip,
+        take: pageSize,
+        orderBy: { createdAt: 'desc' },
+      }),
+      this.prisma.promotion.count({ where }),
+    ]);
+
+    return { items: this.formatItems(items), total, page, pageSize };
+  }
+
+  async getById(id: string) {
+    const promo = await this.prisma.promotion.findUnique({ where: { id } });
+    if (!promo) throw new NotFoundException('Promo not found');
+    return this.formatItem(promo);
+  }
 
   async validate(code: string) {
     const promo = await this.prisma.promotion.findUnique({ where: { code } });
-    if (!promo || !promo.active || promo.validUntil < new Date()) return { applicable: false, message: 'Promo code invalid or expired' };
-    return { code: promo.code, percentOff: promo.percentOff, amountOffMinor: promo.amountOffMinor, validUntil: promo.validUntil, applicable: true, message: promo.percentOff ? `${promo.percentOff}% off` : `ETB ${((promo.amountOffMinor ?? 0) / 100).toFixed(2)} off` };
+    if (!promo || !promo.active || promo.validUntil < new Date())
+      return { applicable: false, message: 'Promo code invalid or expired' };
+    return {
+      code: promo.code,
+      percentOff: promo.percentOff,
+      amountOffMinor: promo.amountOffMinor,
+      validUntil: promo.validUntil,
+      applicable: true,
+      message: promo.percentOff
+        ? `${promo.percentOff}% off`
+        : `ETB ${((promo.amountOffMinor ?? 0) / 100).toFixed(2)} off`,
+    };
   }
 
-  create(dto: CreatePromotionDto) {
-    return this.prisma.promotion.create({ data: { ...dto, validUntil: new Date(dto.validUntil) } });
+  async create(dto: CreatePromotionDto & { discountType?: string; discountValue?: number }) {
+    try {
+      // Map frontend fields to database fields
+      let percentOff: number | undefined;
+      let amountOffMinor: number | undefined;
+
+      if (dto.discountType && dto.discountValue !== undefined) {
+        if (dto.discountType === 'PERCENTAGE') {
+          percentOff = dto.discountValue;
+        } else if (dto.discountType === 'FIXED') {
+          amountOffMinor = dto.discountValue;
+        }
+      } else {
+        // Fallback to direct fields
+        percentOff = dto.percentOff;
+        amountOffMinor = dto.amountOffMinor;
+      }
+
+      const promo = await this.prisma.promotion.create({
+        data: {
+          code: dto.code,
+          title: dto.title,
+          subtitle: dto.subtitle,
+          percentOff,
+          amountOffMinor,
+          validUntil: new Date(dto.validUntil),
+          ctaLabel: dto.ctaLabel,
+          deepLink: dto.deepLink,
+          active: dto.active ?? true,
+        },
+      });
+      return this.formatItem(promo);
+    } catch (error) {
+      if (error instanceof PrismaClientKnownRequestError) {
+        if (error.code === 'P2002') {
+          const field = (error.meta?.target as string[])?.[0];
+          throw new BadRequestException(
+            `A promo code with this ${field} already exists. Please use a different ${field}.`,
+          );
+        }
+      }
+      throw error;
+    }
+  }
+
+  async update(id: string, dto: Partial<CreatePromotionDto> & { discountType?: string; discountValue?: number }) {
+    const promo = await this.prisma.promotion.findUnique({ where: { id } });
+    if (!promo) throw new NotFoundException('Promo not found');
+
+    const updateData: any = {};
+    
+    // Map frontend fields to database fields
+    if (dto.discountType && dto.discountValue !== undefined) {
+      // Clear existing discount fields
+      updateData.percentOff = null;
+      updateData.amountOffMinor = null;
+      
+      if (dto.discountType === 'PERCENTAGE') {
+        updateData.percentOff = dto.discountValue;
+      } else if (dto.discountType === 'FIXED') {
+        updateData.amountOffMinor = dto.discountValue;
+      }
+    } else {
+      // Only include fields that are explicitly provided
+      if (dto.percentOff !== undefined) updateData.percentOff = dto.percentOff;
+      if (dto.amountOffMinor !== undefined) updateData.amountOffMinor = dto.amountOffMinor;
+    }
+    
+    if (dto.title !== undefined) updateData.title = dto.title;
+    if (dto.subtitle !== undefined) updateData.subtitle = dto.subtitle;
+    if (dto.ctaLabel !== undefined) updateData.ctaLabel = dto.ctaLabel;
+    if (dto.deepLink !== undefined) updateData.deepLink = dto.deepLink;
+    if (dto.active !== undefined) updateData.active = dto.active;
+    if (dto.validUntil !== undefined) updateData.validUntil = new Date(dto.validUntil);
+
+    // Don't allow updating code - it's immutable after creation
+    
+    try {
+      const updated = await this.prisma.promotion.update({
+        where: { id },
+        data: updateData,
+      });
+      return this.formatItem(updated);
+    } catch (error) {
+      if (error instanceof PrismaClientKnownRequestError && error.code === 'P2002') {
+        const field = (error.meta?.target as string[])?.[0];
+        throw new BadRequestException(
+          `A promo code with this ${field} already exists. Please use a different ${field}.`,
+        );
+      }
+      throw error;
+    }
+  }
+
+  async delete(id: string) {
+    const promo = await this.prisma.promotion.findUnique({ where: { id } });
+    if (!promo) throw new NotFoundException('Promo not found');
+    return this.prisma.promotion.delete({ where: { id } });
+  }
+
+  private formatItem(promo: any) {
+    return {
+      id: promo.id,
+      code: promo.code,
+      title: promo.title,
+      discountType: promo.percentOff ? 'PERCENTAGE' : 'FIXED',
+      discountValue: promo.percentOff || promo.amountOffMinor || 0,
+      maxDiscount: undefined,
+      minBookingAmount: undefined,
+      maxUsagePerUser: undefined,
+      totalUsageLimit: undefined,
+      usageCount: 0,
+      validFrom: promo.createdAt,
+      validUntil: promo.validUntil,
+      isActive: promo.active,
+      createdAt: promo.createdAt,
+      updatedAt: promo.createdAt,
+    };
+  }
+
+  private formatItems(promos: any[]) {
+    return promos.map((promo) => this.formatItem(promo));
   }
 }
diff --git a/apps/edr-passenger-api/src/modules/schedules/schedules.controller.ts b/apps/edr-passenger-api/src/modules/schedules/schedules.controller.ts
index 3b3fd9b83..bb8792a5b 100644
--- a/apps/edr-passenger-api/src/modules/schedules/schedules.controller.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/schedules.controller.ts
@@ -1,7 +1,7 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Query, ParseIntPipe, UseGuards } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth, ApiParam, ApiQuery, ApiResponse } from '@nestjs/swagger';
 import { SchedulesService } from './schedules.service';
-import { CreateScheduleDto, CreateFareRuleDto, UpdateScheduleStatusDto, UpdateStopTimeDto, ListSchedulesDto } from './schedules.dto';
+import { CreateScheduleDto, UpdateScheduleDto, CreateFareRuleDto, UpdateScheduleStatusDto, UpdateStopTimeDto, ListSchedulesDto, BulkCreateSchedulesDto, BulkSchedulesResponseDto } from './schedules.dto';
 import { JwtGuard } from '../../common/jwt.guard';
 import { TripStatus } from '@prisma/client';
 
@@ -10,14 +10,23 @@ import { TripStatus } from '@prisma/client';
 export class SchedulesController {
   constructor(private service: SchedulesService) {}
 
+  @Post('bulk-generate')
+  @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth')
+  @ApiOperation({
+    summary: 'Bulk generate repetitive schedules',
+    description: 'Creates multiple schedules automatically by repeating every X days for the next Y days. Example: repeat every 2 days for 30 days = 15 schedules.',
+  })
+  @ApiResponse({ status: 201, description: 'Schedules generated successfully' })
+  @ApiResponse({ status: 400, description: 'Invalid parameters or route not found' })
+  bulkGenerateSchedules(@Body() dto: BulkCreateSchedulesDto) {
+    return this.service.bulkGenerateSchedules(dto);
+  }
+
   @Post()
   @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth')
   @ApiOperation({
     summary: 'Create a train schedule from a route template',
-    description: `Creates a schedule by referencing a Route (routeId).
-Stops are automatically copied from the route's RouteStop definitions.
-You supply the actual planned arrival/departure times per stop sequence.
-Origin and destination are derived from the first and last route stop — no need to specify them manually.`,
+    description: `Creates a schedule by referencing a Route (routeId).\nStops are automatically copied from the route's RouteStop definitions.\nYou supply the actual planned arrival/departure times per stop sequence.\nOrigin and destination are derived from the first and last route stop — no need to specify them manually.`,
   })
   @ApiResponse({ status: 201, description: 'Schedule created with stops copied from route template' })
   @ApiResponse({ status: 400, description: 'Invalid times, inactive route, or missing planned times for some stops' })
@@ -40,13 +49,42 @@ Origin and destination are derived from the first and last route stop — no nee
     return this.service.listSchedules({ date, routeId, trainId, status });
   }
 
-  // Static routes before parameterised ones
+  // ===== SPECIFIC ROUTES (must come BEFORE generic :id routes) =====
+
   @Post('fares')
   @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth')
   @ApiOperation({ summary: 'Create a fare rule scoped to a schedule or route code' })
   @ApiResponse({ status: 201, description: 'Fare rule created' })
   createFareRule(@Body() dto: CreateFareRuleDto) { return this.service.createFareRule(dto); }
 
+  @Post('segment-fares')
+  @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Create a segment fare rule (stop-to-stop pricing on a route)' })
+  @ApiResponse({ status: 201, description: 'Segment fare rule created' })
+  createSegmentFareRule(@Body() dto: any) { return this.service.createSegmentFareRule(dto); }
+
+  @Get('routes/:routeId/segment-fares')
+  @ApiOperation({ summary: 'List all segment fare rules for a route' })
+  @ApiParam({ name: 'routeId', description: 'Route UUID' })
+  @ApiResponse({ status: 200, description: 'List of segment fare rules' })
+  getSegmentFares(@Param('routeId') routeId: string) { return this.service.getSegmentFares(routeId); }
+
+  @Patch('segment-fares/:id')
+  @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Update a segment fare rule' })
+  @ApiParam({ name: 'id', description: 'SegmentFareRule UUID' })
+  @ApiResponse({ status: 200, description: 'Segment fare rule updated' })
+  updateSegmentFareRule(@Param('id') id: string, @Body() dto: any) { return this.service.updateSegmentFareRule(id, dto); }
+
+  @Delete('segment-fares/:id')
+  @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Delete a segment fare rule' })
+  @ApiParam({ name: 'id', description: 'SegmentFareRule UUID' })
+  @ApiResponse({ status: 200, description: 'Segment fare rule deleted' })
+  deleteSegmentFareRule(@Param('id') id: string) { return this.service.deleteSegmentFareRule(id); }
+
+  // ===== PARAMETRIZED ROUTES (generic :id routes come AFTER specific routes) =====
+
   @Get(':id')
   @ApiOperation({ summary: 'Get schedule with train, coaches, seats, and stop timeline' })
   @ApiParam({ name: 'id', description: 'TrainSchedule UUID' })
@@ -56,12 +94,12 @@ Origin and destination are derived from the first and last route stop — no nee
 
   @Patch(':id')
   @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth')
-  @ApiOperation({ summary: 'Update a schedule' })
+  @ApiOperation({ summary: 'Update a schedule (partial update - times, status, coaches)' })
   @ApiParam({ name: 'id', description: 'TrainSchedule UUID' })
   @ApiResponse({ status: 200, description: 'Schedule updated' })
   @ApiResponse({ status: 404, description: 'Schedule not found' })
-  updateSchedule(@Param('id') id: string, @Body() dto: CreateScheduleDto) {
-    return this.service.updateSchedule(id, dto);
+  updateSchedule(@Param('id') id: string, @Body() dto: UpdateScheduleDto) {
+    return this.service.updateSchedulePartial(id, dto);
   }
 
   @Patch(':id/status')
@@ -84,8 +122,6 @@ Origin and destination are derived from the first and last route stop — no nee
     return this.service.deleteSchedule(id);
   }
 
-  // ── Stop Times ─────────────────────────────────────────────────────────────
-
   @Get(':id/stops')
   @ApiOperation({ summary: 'List all stops for a schedule ordered by sequence' })
   @ApiParam({ name: 'id', description: 'TrainSchedule UUID' })
@@ -106,8 +142,6 @@ Origin and destination are derived from the first and last route stop — no nee
     @Body() dto: UpdateStopTimeDto,
   ) { return this.service.updateStop(id, sequence, dto); }
 
-  // ── Fares ──────────────────────────────────────────────────────────────────
-
   @Get(':scheduleId/fares')
   @ApiOperation({ summary: 'Get fare for a schedule and seat class from the fare engine' })
   @ApiParam({ name: 'scheduleId', description: 'TrainSchedule UUID' })
@@ -151,8 +185,6 @@ Origin and destination are derived from the first and last route stop — no nee
     return this.service.syncFaresFromEngine(id);
   }
 
-  // ── Coach Assignments ──────────────────────────────────────────────────────
-
   @Post(':id/coaches')
   @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth')
   @ApiOperation({ 
diff --git a/apps/edr-passenger-api/src/modules/schedules/schedules.dto.ts b/apps/edr-passenger-api/src/modules/schedules/schedules.dto.ts
index 64ab95384..0752e7565 100644
--- a/apps/edr-passenger-api/src/modules/schedules/schedules.dto.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/schedules.dto.ts
@@ -34,6 +34,13 @@ export class CreateScheduleDto {
   plannedTimes: PlannedStopTimeDto[];
 }
 
+export class UpdateScheduleDto {
+  @ApiPropertyOptional({ example: '2026-06-15T08:00:00Z', description: 'Scheduled departure from the first stop (origin)' }) @IsOptional() @IsDateString() departureAt?: string;
+  @ApiPropertyOptional({ example: '2026-06-15T20:00:00Z', description: 'Scheduled arrival at the last stop (destination)' }) @IsOptional() @IsDateString() arrivalAt?: string;
+  @ApiPropertyOptional({ enum: TripStatus, example: TripStatus.SCHEDULED }) @IsOptional() @IsEnum(TripStatus) status?: TripStatus;
+  @ApiPropertyOptional({ type: Array, description: 'List of coaches to assign' }) @IsOptional() @IsArray() coaches?: Array<{ coachId: string; positionNumber: number }>;
+}
+
 export class UpdateStopTimeDto {
   @ApiPropertyOptional({ example: '2026-06-15T09:30:00Z' }) @IsOptional() @IsDateString() plannedArrivalAt?: string;
   @ApiPropertyOptional({ example: '2026-06-15T09:45:00Z' }) @IsOptional() @IsDateString() plannedDepartureAt?: string;
@@ -50,6 +57,17 @@ export class CreateFareRuleDto {
   @ApiPropertyOptional({ example: '2026-12-31T23:59:59Z' }) @IsOptional() @IsDateString() validUntil?: string;
 }
 
+export class CreateSegmentFareRuleDto {
+  @ApiProperty({ example: 'route-uuid', description: 'Route UUID' }) @IsString() routeId: string;
+  @ApiProperty({ example: 1, description: 'Origin stop sequence number' }) @IsInt() @Min(1) originStopSequence: number;
+  @ApiProperty({ example: 2, description: 'Destination stop sequence number' }) @IsInt() @Min(1) destinationStopSequence: number;
+  @ApiProperty({ example: 'seat-class-uuid', description: 'Seat class UUID' }) @IsString() seatClassId: string;
+  @ApiProperty({ example: 45000, description: 'Base fare in minor currency units (ETB cents)' }) @IsInt() baseFareMinor: number;
+  @ApiPropertyOptional({ example: 'Ethiopian', description: 'Nationality scope (Ethiopian, Djiboutian, Other)' }) @IsOptional() @IsString() nationality?: string;
+  @ApiProperty({ example: '2026-01-01T00:00:00Z' }) @IsDateString() validFrom: string;
+  @ApiPropertyOptional({ example: '2026-12-31T23:59:59Z' }) @IsOptional() @IsDateString() validUntil?: string;
+}
+
 export class ListSchedulesDto {
   @ApiPropertyOptional({ example: '2026-06-15', description: 'Filter by departure date (YYYY-MM-DD). Returns all schedules departing on this calendar day.' })
   @IsOptional() @IsDateString() date?: string;
@@ -67,3 +85,21 @@ export class ListSchedulesDto {
 export class UpdateScheduleStatusDto {
   @ApiProperty({ enum: TripStatus, example: TripStatus.EN_ROUTE }) @IsEnum(TripStatus) status: TripStatus;
 }
+
+export class BulkCreateSchedulesDto {
+  @ApiProperty({ example: 'train-uuid', description: 'Train UUID' }) @IsString() trainId: string;
+  @ApiProperty({ example: 'route-uuid', description: 'Route UUID' }) @IsString() routeId: string;
+  @ApiProperty({ example: '2026-06-15T08:00:00Z', description: 'Start date and time for first schedule' }) @IsDateString() startDateTime: string;
+  @ApiProperty({ example: 12, description: 'Hours duration per schedule' }) @IsInt() @Min(1) durationHours: number;
+  @ApiProperty({ example: 2, description: 'Repeat every X days' }) @IsInt() @Min(1) repeatEveryDays: number;
+  @ApiProperty({ example: 30, description: 'Generate schedules for the next Y days' }) @IsInt() @Min(1) forNextDays: number;
+  @ApiPropertyOptional({ type: [PlannedStopTimeDto], description: 'Optional custom planned times per stop. If not provided, will auto-generate.' })
+  @IsOptional() @IsArray() @ValidateNested({ each: true }) @Type(() => PlannedStopTimeDto)
+  plannedTimes?: PlannedStopTimeDto[];
+}
+
+export class BulkSchedulesResponseDto {
+  @ApiProperty() schedulesCreated: number;
+  @ApiProperty() errors: string[];
+  @ApiProperty() scheduleIds: string[];
+}
diff --git a/apps/edr-passenger-api/src/modules/schedules/schedules.service.ts b/apps/edr-passenger-api/src/modules/schedules/schedules.service.ts
index 820c5b8a0..af03937f8 100644
--- a/apps/edr-passenger-api/src/modules/schedules/schedules.service.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/schedules.service.ts
@@ -2,7 +2,7 @@ import { Injectable, NotFoundException, BadRequestException } from '@nestjs/comm
 import { PrismaService } from '../../common/prisma.service';
 import { RoutesService } from './routes.service';
 import { FareEngineService } from '../fare-engine/fare-engine.service';
-import { CreateScheduleDto, CreateFareRuleDto, UpdateScheduleStatusDto, UpdateStopTimeDto, ListSchedulesDto } from './schedules.dto';
+import { CreateScheduleDto, UpdateScheduleDto, CreateFareRuleDto, UpdateScheduleStatusDto, UpdateStopTimeDto, ListSchedulesDto, BulkCreateSchedulesDto } from './schedules.dto';
 
 @Injectable()
 export class SchedulesService {
@@ -10,9 +10,55 @@ export class SchedulesService {
     private prisma: PrismaService,
     private routesService: RoutesService,
     private fareEngine: FareEngineService,
-  ) {}
+  ) { }
 
-  // ── Schedule CRUD ──────────────────────────────────────────────────────────
+  async bulkGenerateSchedules(dto: BulkCreateSchedulesDto) {
+    const startDate = new Date(dto.startDateTime);
+    const endDate = new Date(startDate.getTime() + dto.forNextDays * 24 * 60 * 60 * 1000);
+    const errors: string[] = [];
+    const scheduleIds: string[] = [];
+
+    // Validate route and get stops for plannedTimes generation
+    const route = await this.prisma.route.findUnique({
+      where: { id: dto.routeId },
+      include: { stops: { orderBy: { sequence: 'asc' } } },
+    });
+    if (!route) throw new NotFoundException('Route not found');
+    if (!route.active) throw new BadRequestException('Route is not active');
+
+    let currentDate = new Date(startDate);
+    let scheduleCount = 0;
+
+    while (currentDate < endDate) {
+      try {
+        const departureAt = new Date(currentDate);
+        const arrivalAt = new Date(departureAt.getTime() + dto.durationHours * 60 * 60 * 1000);
+
+        const createDto: CreateScheduleDto = {
+          trainId: dto.trainId,
+          routeId: dto.routeId,
+          departureAt: departureAt.toISOString(),
+          arrivalAt: arrivalAt.toISOString(),
+          plannedTimes: dto.plannedTimes || [],
+        };
+
+        const schedule = await this.createSchedule(createDto);
+        scheduleIds.push(schedule.id);
+        scheduleCount++;
+      } catch (error) {
+        errors.push(`Failed to create schedule for ${currentDate.toISOString()}: ${error instanceof Error ? error.message : String(error)}`);
+      }
+
+      // Move to next repetition
+      currentDate = new Date(currentDate.getTime() + dto.repeatEveryDays * 24 * 60 * 60 * 1000);
+    }
+
+    return {
+      schedulesCreated: scheduleCount,
+      errors,
+      scheduleIds,
+    };
+  }
 
   async listSchedules(dto: ListSchedulesDto) {
     const where: any = {};
@@ -58,28 +104,48 @@ export class SchedulesService {
     if (!route.active) throw new BadRequestException('Route is not active');
     if (route.stops.length < 2) throw new BadRequestException('Route must have at least 2 stops');
 
+    // Check for duplicate schedule with same train, route, and date
+    const depDate = new Date(dep);
+    depDate.setHours(0, 0, 0, 0);
+    const nextDay = new Date(depDate);
+    nextDay.setDate(nextDay.getDate() + 1);
+
+    const existingSchedule = await this.prisma.trainSchedule.findFirst({
+      where: {
+        trainId: dto.trainId,
+        routeId: dto.routeId,
+        departureAt: {
+          gte: depDate,
+          lt: nextDay,
+        },
+      },
+    });
+
+    if (existingSchedule) {
+      throw new BadRequestException(
+        `A schedule for this train, route, and date already exists. Departure: ${new Date(existingSchedule.departureAt).toLocaleString()}`,
+      );
+    }
+
     // Auto-generate plannedTimes if not provided or empty
     let plannedTimes = dto.plannedTimes;
     if (!plannedTimes || plannedTimes.length === 0) {
       const totalDuration = arr.getTime() - dep.getTime();
       const totalDistance = route.stops[route.stops.length - 1].distanceKm || 0;
-      
+
       plannedTimes = route.stops.map((stop, index) => {
         let stopTime: Date;
-        
+
         if (index === 0) {
-          // First stop - use departure time
           stopTime = dep;
         } else if (index === route.stops.length - 1) {
-          // Last stop - use arrival time
           stopTime = arr;
         } else {
-          // Intermediate stops - calculate based on distance proportion
           const stopDistance = stop.distanceKm || 0;
           const progress = totalDistance > 0 ? stopDistance / totalDistance : index / (route.stops.length - 1);
           stopTime = new Date(dep.getTime() + totalDuration * progress);
         }
-        
+
         return {
           sequence: stop.sequence,
           plannedArrivalAt: index === 0 ? undefined : stopTime.toISOString(),
@@ -113,7 +179,6 @@ export class SchedulesService {
       include: { train: true, originStation: true, destinationStation: true },
     });
 
-    // Copy route stops into TripStopTime with the provided planned times
     const plannedTimesMap = Object.fromEntries(
       plannedTimes.map(t => [t.sequence, t]),
     );
@@ -130,7 +195,7 @@ export class SchedulesService {
         originStation: true,
         destinationStation: true,
         coachAssignments: {
-          include: { coach: { include: { seats: { orderBy: [{ row: 'asc' }, { col: 'asc' }] }, seatClass: true } } },
+          include: { coach: { include: { seats: { orderBy: [{ row: 'asc' }, { col: 'asc' }] } } } },
           orderBy: { positionNumber: 'asc' },
         },
         stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } },
@@ -138,18 +203,16 @@ export class SchedulesService {
     });
     if (!schedule) throw new NotFoundException('Schedule not found');
 
-    // Compute effective seat statuses from SeatHold + JourneySegment
-    // (seat.status DB column is no longer written during booking)
-    const allSeatIds = schedule.coachAssignments.flatMap(a => a.coach.seats.map(s => s.id));
+    const allSeatIds = schedule.coachAssignments.flatMap((a: any) => a.coach.seats.map((s: any) => s.id));
     const effectiveStatuses = await this.resolveEffectiveStatuses(id, allSeatIds);
 
     return {
       ...schedule,
-      coachAssignments: schedule.coachAssignments.map(a => ({
+      coachAssignments: schedule.coachAssignments.map((a: any) => ({
         ...a,
         coach: {
           ...a.coach,
-          seats: a.coach.seats.map(s => ({
+          seats: a.coach.seats.map((s: any) => ({
             ...s,
             status: effectiveStatuses.get(s.id) ?? s.status,
           })),
@@ -158,12 +221,6 @@ export class SchedulesService {
     };
   }
 
-  /**
-   * Computes effective seat status for a schedule by checking active SeatHolds
-   * and confirmed JourneySegments. The DB seat.status column is not written
-   * during segment-based booking, so this overlay is required.
-   * Priority: BLOCKED (physical) > BOOKED (confirmed) > HELD (active hold) > AVAILABLE
-   */
   private async resolveEffectiveStatuses(
     scheduleId: string,
     seatIds: string[],
@@ -204,7 +261,6 @@ export class SchedulesService {
     const arr = new Date(dto.arrivalAt);
     if (arr <= dep) throw new BadRequestException('arrivalAt must be after departureAt');
 
-    // Validate route exists and has stops
     const route = await this.prisma.route.findUnique({
       where: { id: dto.routeId },
       include: { stops: { orderBy: { sequence: 'asc' } } },
@@ -213,7 +269,6 @@ export class SchedulesService {
     if (!route.active) throw new BadRequestException('Route is not active');
     if (route.stops.length < 2) throw new BadRequestException('Route must have at least 2 stops');
 
-    // Derive origin and destination from first and last route stop
     const firstStop = route.stops[0];
     const lastStop = route.stops[route.stops.length - 1];
 
@@ -231,18 +286,16 @@ export class SchedulesService {
       },
     });
 
-    // Delete existing stop times and recreate
     await this.prisma.tripStopTime.deleteMany({ where: { scheduleId: id } });
 
-    // Auto-generate plannedTimes if not provided
     let plannedTimes = dto.plannedTimes;
     if (!plannedTimes || plannedTimes.length === 0) {
       const totalDuration = arr.getTime() - dep.getTime();
       const totalDistance = route.stops[route.stops.length - 1].distanceKm || 0;
-      
+
       plannedTimes = route.stops.map((stop, index) => {
         let stopTime: Date;
-        
+
         if (index === 0) {
           stopTime = dep;
         } else if (index === route.stops.length - 1) {
@@ -252,7 +305,7 @@ export class SchedulesService {
           const progress = totalDistance > 0 ? stopDistance / totalDistance : index / (route.stops.length - 1);
           stopTime = new Date(dep.getTime() + totalDuration * progress);
         }
-        
+
         return {
           sequence: stop.sequence,
           plannedArrivalAt: index === 0 ? undefined : stopTime.toISOString(),
@@ -276,19 +329,53 @@ export class SchedulesService {
   async deleteSchedule(id: string) {
     const schedule = await this.prisma.trainSchedule.findUnique({ where: { id } });
     if (!schedule) throw new NotFoundException('Schedule not found');
-    
-    // Delete related records first (in dependency order)
+
     await this.prisma.journeySegment.deleteMany({ where: { scheduleId: id } });
     await this.prisma.seatHold.deleteMany({ where: { scheduleId: id } });
+
+    const bookings = await this.prisma.booking.findMany({
+      where: { scheduleId: id },
+      select: { id: true },
+    });
+    const bookingIds = bookings.map(b => b.id);
+
+    if (bookingIds.length > 0) {
+      const paymentIntents = await this.prisma.paymentIntent.findMany({
+        where: { bookingId: { in: bookingIds } },
+        select: { id: true },
+      });
+      const paymentIntentIds = paymentIntents.map(pi => pi.id);
+
+      if (paymentIntentIds.length > 0) {
+        await this.prisma.paymentRefund.deleteMany({
+          where: { paymentIntentId: { in: paymentIntentIds } },
+        });
+      }
+
+      await this.prisma.ticket.deleteMany({
+        where: { bookingId: { in: bookingIds } },
+      });
+      await this.prisma.bookingSeat.deleteMany({
+        where: { bookingId: { in: bookingIds } },
+      });
+      await this.prisma.bookingModification.deleteMany({
+        where: { bookingId: { in: bookingIds } },
+      });
+      await this.prisma.bookingCancellation.deleteMany({
+        where: { bookingId: { in: bookingIds } },
+      });
+      await this.prisma.paymentIntent.deleteMany({
+        where: { bookingId: { in: bookingIds } },
+      });
+    }
+
     await this.prisma.booking.deleteMany({ where: { scheduleId: id } });
     await this.prisma.tripStopTime.deleteMany({ where: { scheduleId: id } });
     await this.prisma.coachAssignment.deleteMany({ where: { scheduleId: id } });
-    
+
     return this.prisma.trainSchedule.delete({ where: { id } });
   }
 
-  // ── Stop Times (per-schedule overrides) ───────────────────────────────────
-
   getStops(scheduleId: string) {
     return this.prisma.tripStopTime.findMany({
       where: { scheduleId },
@@ -314,8 +401,6 @@ export class SchedulesService {
     });
   }
 
-  // ── Fare Rules ─────────────────────────────────────────────────────────────
-
   createFareRule(dto: CreateFareRuleDto) {
     const { validFrom, validUntil, scheduleId, nationality, ...rest } = dto;
     return this.prisma.fareRule.create({
@@ -329,6 +414,43 @@ export class SchedulesService {
     });
   }
 
+  createSegmentFareRule(dto: any) {
+    const { validFrom, validUntil, ...rest } = dto;
+    return this.prisma.segmentFareRule.create({
+      data: {
+        ...rest,
+        validFrom: new Date(validFrom),
+        validUntil: validUntil ? new Date(validUntil) : null,
+      },
+      include: { seatClass: true, route: true },
+    });
+  }
+
+  getSegmentFares(routeId: string) {
+    return this.prisma.segmentFareRule.findMany({
+      where: { routeId },
+      include: { seatClass: true, route: true },
+      orderBy: [{ originStopSequence: 'asc' }, { destinationStopSequence: 'asc' }],
+    });
+  }
+
+  deleteSegmentFareRule(id: string) {
+    return this.prisma.segmentFareRule.delete({ where: { id } });
+  }
+
+  updateSegmentFareRule(id: string, dto: any) {
+    const { validFrom, validUntil, ...rest } = dto;
+    return this.prisma.segmentFareRule.update({
+      where: { id },
+      data: {
+        ...rest,
+        validFrom: validFrom ? new Date(validFrom) : undefined,
+        validUntil: validUntil ? new Date(validUntil) : null,
+      },
+      include: { seatClass: true, route: true },
+    });
+  }
+
   getFareFromEngine(scheduleId: string, seatClassId: string, nationality?: string) {
     return this.fareEngine.calculateForSchedule(scheduleId, seatClassId, nationality);
   }
@@ -337,10 +459,6 @@ export class SchedulesService {
     return this.fareEngine.calculateAllForSchedule(scheduleId, nationality);
   }
 
-  /**
-   * Recalculate fares for all active seat classes on a schedule using the fare engine
-   * and upsert them as FareRule records scoped to this schedule.
-   */
   async syncFaresFromEngine(scheduleId: string): Promise<{ synced: number; errors: string[] }> {
     const results = await this.fareEngine.calculateAllForSchedule(scheduleId);
     const errors: string[] = [];
@@ -352,7 +470,6 @@ export class SchedulesService {
         const seatClass = await this.prisma.seatClass.findFirst({ where: { name: fare.seatClassName } });
         if (!seatClass) { errors.push(`Seat class not found: ${fare.seatClassName}`); continue; }
 
-        // Expire any existing active rule for this schedule + seat class
         await this.prisma.fareRule.updateMany({
           where: { tripId: scheduleId, seatClassId: seatClass.id, validUntil: null },
           data: { validUntil: now },
@@ -377,8 +494,6 @@ export class SchedulesService {
     return { synced, errors };
   }
 
-  // ── Coach Assignments ──────────────────────────────────────────────────────
-
   async assignCoaches(
     scheduleId: string,
     coaches: Array<{ coachId: string; positionNumber: number }>,
@@ -386,7 +501,6 @@ export class SchedulesService {
     const schedule = await this.prisma.trainSchedule.findUnique({ where: { id: scheduleId } });
     if (!schedule) throw new NotFoundException('Schedule not found');
 
-    // Validate all coaches exist
     const coachIds = coaches.map(c => c.coachId);
     const existingCoaches = await this.prisma.coach.findMany({
       where: { id: { in: coachIds } },
@@ -395,18 +509,16 @@ export class SchedulesService {
       throw new NotFoundException('One or more coaches not found');
     }
 
-    // Remove existing assignments
     await this.prisma.coachAssignment.deleteMany({ where: { scheduleId } });
 
-    // Create new assignments
-    await this.prisma.coachAssignment.createMany({
-      data: coaches.map(c => ({
-        scheduleId,
-        coachId: c.coachId,
-        positionNumber: c.positionNumber,
-        isOperational: true,
-      })),
-    });
+    const data = coaches.map((c, idx) => ({
+      scheduleId,
+      coachId: c.coachId,
+      positionNumber: idx + 1,
+      isOperational: true,
+    }));
+
+    await this.prisma.coachAssignment.createMany({ data });
 
     return { message: 'Coaches assigned successfully', count: coaches.length };
   }
@@ -417,7 +529,6 @@ export class SchedulesService {
       include: {
         coach: {
           include: {
-            seatClass: true,
             seats: { orderBy: [{ row: 'asc' }, { col: 'asc' }] },
           },
         },
@@ -426,6 +537,41 @@ export class SchedulesService {
     });
   }
 
+  async updateSchedulePartial(id: string, dto: UpdateScheduleDto) {
+    const schedule = await this.prisma.trainSchedule.findUnique({ where: { id } });
+    if (!schedule) throw new NotFoundException('Schedule not found');
+
+    const updateData: any = {};
+
+    if (dto.departureAt || dto.arrivalAt) {
+      const dep = dto.departureAt ? new Date(dto.departureAt) : new Date(schedule.departureAt);
+      const arr = dto.arrivalAt ? new Date(dto.arrivalAt) : new Date(schedule.arrivalAt);
+
+      if (arr <= dep) throw new BadRequestException('Arrival time must be after departure time');
+
+      updateData.departureAt = dep;
+      updateData.arrivalAt = arr;
+      updateData.durationMinutes = Math.round((arr.getTime() - dep.getTime()) / 60_000);
+    }
+
+    if (dto.status) {
+      updateData.status = dto.status;
+    }
+
+    if (Object.keys(updateData).length > 0) {
+      await this.prisma.trainSchedule.update({
+        where: { id },
+        data: updateData,
+      });
+    }
+
+    if (dto.coaches && dto.coaches.length > 0) {
+      await this.assignCoaches(id, dto.coaches);
+    }
+
+    return this.getSchedule(id);
+  }
+
   async removeCoachAssignment(scheduleId: string, coachId: string) {
     const assignment = await this.prisma.coachAssignment.findFirst({
       where: { scheduleId, coachId },
@@ -435,4 +581,4 @@ export class SchedulesService {
     await this.prisma.coachAssignment.delete({ where: { id: assignment.id } });
     return { message: 'Coach assignment removed' };
   }
-}
+}
\ No newline at end of file
diff --git a/apps/edr-passenger-api/src/modules/search/search.service.ts b/apps/edr-passenger-api/src/modules/search/search.service.ts
index 19eb25652..29254892d 100644
--- a/apps/edr-passenger-api/src/modules/search/search.service.ts
+++ b/apps/edr-passenger-api/src/modules/search/search.service.ts
@@ -22,8 +22,6 @@ export class SearchService {
     const nextDay = new Date(date.getTime() + 86_400_000);
     const totalPassengers = dto.adultCount + (dto.childCount ?? 0);
 
-    // Find all schedules that have BOTH origin and destination as stops
-    // (not just terminal-to-terminal) and depart on the requested date
     const schedules = await this.prisma.trainSchedule.findMany({
       where: {
         status: { in: ['SCHEDULED', 'BOARDING'] },
@@ -36,7 +34,7 @@ export class SearchService {
         destinationStation: true,
         stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } },
         coachAssignments: {
-          include: { coach: { include: { seats: true, seatClass: true } } },
+          include: { coach: { include: { seats: true, coachType: { include: { seatClasses: true } } } } },
         },
       },
     });
@@ -44,36 +42,71 @@ export class SearchService {
     const results = [];
 
     for (const schedule of schedules) {
-      const originStop = schedule.stopTimes.find(s => s.stationId === dto.originStationId);
-      const destStop = schedule.stopTimes.find(s => s.stationId === dto.destinationStationId);
+      const originStop = schedule.stopTimes.find((s: any) => s.stationId === dto.originStationId);
+      const destStop = schedule.stopTimes.find((s: any) => s.stationId === dto.destinationStationId);
 
-      // Both stops must exist and origin must come before destination
       if (!originStop || !destStop || originStop.sequence >= destStop.sequence) continue;
 
-      // Compute per-seat availability for the requested segment range
-      // A seat is available if no active booking/hold overlaps [originSeq, destSeq)
       const availabilityByClass: Record<string, number> = {};
 
       for (const assignment of schedule.coachAssignments) {
-        const className = assignment.coach.seatClass.name;
-        if (!availabilityByClass[className]) availabilityByClass[className] = 0;
+        const seatClassNames = assignment.coach.coachType?.seatClasses?.map((sc: any) => sc.name) || ['Standard'];
+        const isBedCoach = assignment.coach.seats.some((s: any) => s.bedPosition);
 
-        for (const seat of assignment.coach.seats) {
-          if (seat.status === 'BLOCKED') continue;
-          // Use segment-aware check — a seat booked A→B is still free for B→D
-          const free = await this.segmentsService.isSeatFreeForLeg(
-            schedule.id, seat.id,
-            originStop.sequence, destStop.sequence,
-          );
-          if (free) availabilityByClass[className]++;
+        if (isBedCoach) {
+          const bedPositions = ['upper', 'middle', 'lower'];
+          for (const bedPosition of bedPositions) {
+            let count = 0;
+            for (const seat of assignment.coach.seats) {
+              if (seat.bedPosition !== bedPosition) continue;
+              if (seat.status === 'BLOCKED') continue;
+              if (!seat.seatNumber || !seat.seatNumber.trim()) continue;
+              
+              const free = await this.segmentsService.isSeatFreeForLeg(
+                schedule.id, seat.id,
+                originStop.sequence, destStop.sequence,
+              );
+              if (free) count++;
+            }
+            
+            if (count > 0) {
+              const matchingClass = seatClassNames.find((className: string) => {
+                const classNameLower = className.toLowerCase();
+                return (
+                  (bedPosition === 'upper' && classNameLower.includes('upper')) ||
+                  (bedPosition === 'middle' && classNameLower.includes('middle')) ||
+                  (bedPosition === 'lower' && classNameLower.includes('lower'))
+                );
+              });
+              if (matchingClass) {
+                if (!availabilityByClass[matchingClass]) availabilityByClass[matchingClass] = 0;
+                availabilityByClass[matchingClass] += count;
+              }
+            }
+          }
+        } else {
+          let availableSeatsInCoach = 0;
+          for (const seat of assignment.coach.seats) {
+            if (seat.status === 'BLOCKED') continue;
+            if (!seat.seatNumber || !seat.seatNumber.trim()) continue;
+            
+            const free = await this.segmentsService.isSeatFreeForLeg(
+              schedule.id, seat.id,
+              originStop.sequence, destStop.sequence,
+            );
+            if (free) availableSeatsInCoach++;
+          }
+          
+          for (const seatClassName of seatClassNames) {
+            if (!availabilityByClass[seatClassName]) availabilityByClass[seatClassName] = 0;
+            availabilityByClass[seatClassName] += availableSeatsInCoach;
+          }
         }
       }
 
-      // Departure/arrival times for the requested leg (not the full schedule)
       const legDepartureAt = originStop.plannedDepartureAt ?? schedule.departureAt;
       const legArrivalAt = destStop.plannedArrivalAt ?? schedule.arrivalAt;
 
-      // Fetch fares for all seat classes - need to pass the SEARCH origin/destination, not schedule terminals
       const faresByClass = await this.calculateFaresForSegment(
         schedule,
         dto.originStationId,
@@ -106,14 +139,14 @@ export class SearchService {
         ),
         status: schedule.status,
         stops: schedule.stopTimes
-          .filter(st => st.sequence >= originStop.sequence && st.sequence <= destStop.sequence)
-          .map(st => ({
-          stationId: st.stationId,
-          stationName: st.station.name,
-          sequence: st.sequence,
-          plannedArrivalAt: st.plannedArrivalAt,
-          plannedDepartureAt: st.plannedDepartureAt,
-        })),
+          .filter((st: any) => st.sequence >= originStop.sequence && st.sequence <= destStop.sequence)
+          .map((st: any) => ({
+            stationId: st.stationId,
+            stationName: st.station.name,
+            sequence: st.sequence,
+            plannedArrivalAt: st.plannedArrivalAt,
+            plannedDepartureAt: st.plannedDepartureAt,
+          })),
         availabilityByClass,
         hasAvailability: Object.values(availabilityByClass).some(n => n >= totalPassengers),
         faresByClass,
@@ -134,51 +167,19 @@ export class SearchService {
     });
     if (!schedule) throw new NotFoundException('Schedule not found');
 
-    const originStop = schedule.stopTimes.find(s => s.stationId === dto.originStationId);
-    const destStop = schedule.stopTimes.find(s => s.stationId === dto.destinationStationId);
+    const originStop = schedule.stopTimes.find((s: any) => s.stationId === dto.originStationId);
+    const destStop = schedule.stopTimes.find((s: any) => s.stationId === dto.destinationStationId);
     if (!originStop || !destStop || originStop.sequence >= destStop.sequence) {
       throw new NotFoundException('Origin or destination not found on this schedule');
     }
 
     const seatClass = await this.prisma.seatClass.findFirst({ where: { name: dto.seatClassName } });
 
-    // Compute route codes for fare lookup
     const segmentRoute = `${originStop.station.code}-${destStop.station.code}`;
     const fullRoute = `${schedule.originStation.code}-${schedule.destinationStation.code}`;
     const now = new Date();
     const nationality = dto.nationality;
 
-    // Query fare rules with specificity ordering:
-    // 1. schedule+segment+nationality
-    // 2. schedule+segment
-    // 3. schedule+full-route+nationality
-    // 4. schedule+full-route
-    // 5. schedule+global
-    // 6. segment+nationality
-    // 7. segment
-    // 8. full-route+nationality
-    // 9. full-route
-    // 10. global
-    const fareRule = await this.prisma.fareRule.findFirst({
-      where: {
-        seatClassId: seatClass?.id,
-        validFrom: { lte: now },
-        OR: [
-          { validUntil: null },
-          { validUntil: { gte: now } },
-        ],
-      },
-      orderBy: [
-        // Prioritize schedule-specific rules
-        { tripId: { sort: 'desc', nulls: 'last' } },
-        // Then prioritize nationality match
-        { nationality: { sort: 'desc', nulls: 'last' } },
-        // Most recent validFrom
-        { validFrom: 'desc' },
-      ],
-    });
-
-    // Manual specificity filtering to find best match
     const candidates = await this.prisma.fareRule.findMany({
       where: {
         seatClassId: seatClass?.id,
@@ -243,38 +244,39 @@ export class SearchService {
     };
   }
 
-  /**
-   * Calculate fares for a specific segment of a schedule
-   */
   private async calculateFaresForSegment(
     schedule: any,
     originStationId: string,
     destinationStationId: string,
     nationality?: string,
   ): Promise<Array<{ seatClassName: string; baseFareMinor: number }>> {
-    // Get seat classes that are actually assigned to this schedule via coaches
-    const assignedSeatClassIds: string[] = Array.from(
+    const seatClassIds: string[] = Array.from(
       new Set(
-        schedule.coachAssignments.map((a: any) => a.coach.seatClass.id as string)
+        schedule.coachAssignments
+          .flatMap((a: any) => a.coach.coachType?.seatClasses || [])
+          .map((sc: any) => sc.id)
+          .filter((id: any) => id)
       )
     );
     
-    // Get only the seat classes that are assigned to this schedule
-    const seatClasses = await this.prisma.seatClass.findMany({
-      where: { 
-        isActive: true,
-        id: { in: assignedSeatClassIds }
-      },
-      orderBy: { basePrice: 'asc' },
-    });
-
-    // If no coaches assigned, return empty array
-    if (seatClasses.length === 0) {
+    if (seatClassIds.length === 0) {
       console.log(`No seat classes assigned to schedule ${schedule.id}`);
       return [];
     }
 
-    // If schedule has a route, use route-based calculation
+    const seatClasses = await this.prisma.seatClass.findMany({
+      where: { 
+        isActive: true,
+        id: { in: seatClassIds }
+      },
+      orderBy: { baseFareMinor: 'asc' },
+    });
+
+    if (seatClasses.length === 0) {
+      console.log(`No active seat classes for schedule ${schedule.id}`);
+      return [];
+    }
+
     if (schedule.routeId) {
       const results = await Promise.all(
         seatClasses.map(async (sc) => {
@@ -303,7 +305,6 @@ export class SearchService {
       }
     }
 
-    // Fallback: Try to get fares from FareRule table
     const originStation = await this.prisma.station.findUnique({ where: { id: originStationId } });
     const destStation = await this.prisma.station.findUnique({ where: { id: destinationStationId } });
     
@@ -314,26 +315,25 @@ export class SearchService {
       const fareRules = await this.prisma.fareRule.findMany({
         where: {
           route: segmentRoute,
-          seatClassId: { in: assignedSeatClassIds },
+          seatClassId: { in: seatClassIds },
           validFrom: { lte: now },
           OR: [
             { validUntil: null },
             { validUntil: { gte: now } },
           ],
         },
-        include: { seatClass: true },
       });
 
       if (fareRules.length > 0) {
         console.log(`Found ${fareRules.length} fare rules for segment ${segmentRoute}`);
+        const seatClassMap = Object.fromEntries(seatClasses.map(sc => [sc.id, sc.name]));
         return fareRules.map(rule => ({
-          seatClassName: rule.seatClass.name,
+          seatClassName: seatClassMap[rule.seatClassId] || 'Unknown',
           baseFareMinor: rule.baseFareMinor,
         }));
       }
     }
 
-    // Last resort: Return default fares only for assigned seat classes
     console.log(`No fares found, using defaults for ${originStationId} to ${destinationStationId}`);
     return seatClasses.map(sc => ({
       seatClassName: sc.name,
@@ -359,60 +359,6 @@ export class SearchService {
     return fares[seatClassName] ?? 45000;
   }
 
-  /**
-   * Fallback method to get fares from FareRule table when fare engine fails
-   */
-  private async getFallbackFares(
-    scheduleId: string,
-    originCode: string,
-    destCode: string,
-  ): Promise<Array<{ seatClassName: string; baseFareMinor: number }>> {
-    const segmentRoute = `${originCode}-${destCode}`;
-    const now = new Date();
-
-    // Try to find fare rules for this segment
-    const fareRules = await this.prisma.fareRule.findMany({
-      where: {
-        route: segmentRoute,
-        validFrom: { lte: now },
-        OR: [
-          { validUntil: null },
-          { validUntil: { gte: now } },
-        ],
-      },
-      include: { seatClass: true },
-    });
-
-    if (fareRules.length > 0) {
-      console.log(`Found ${fareRules.length} fare rules for segment ${segmentRoute}`);
-      return fareRules.map(rule => ({
-        seatClassName: rule.seatClass.name,
-        baseFareMinor: rule.baseFareMinor,
-      }));
-    }
-
-    // If no segment-specific rules, return default fares
-    console.log(`No fare rules found for ${segmentRoute}, using defaults`);
-    return [
-      { seatClassName: 'Economy Regular', baseFareMinor: 35000 },
-      { seatClassName: 'Economy Bed', baseFareMinor: 49000 },
-      { seatClassName: 'VIP Bed', baseFareMinor: 63000 },
-    ];
-  }
-
-  /**
-   * Select the best matching fare rule based on specificity:
-   * 1. schedule+segment+nationality
-   * 2. schedule+segment
-   * 3. schedule+full-route+nationality
-   * 4. schedule+full-route
-   * 5. schedule+global
-   * 6. segment+nationality
-   * 7. segment
-   * 8. full-route+nationality
-   * 9. full-route
-   * 10. global
-   */
   private selectBestFareRule(
     candidates: any[],
     scheduleId: string,
@@ -421,19 +367,16 @@ export class SearchService {
     nationality?: string,
   ): any | null {
     const priorities = [
-      // Schedule-specific rules
       { tripId: scheduleId, route: segmentRoute, nationality },
       { tripId: scheduleId, route: segmentRoute, nationality: null },
       { tripId: scheduleId, route: fullRoute, nationality },
       { tripId: scheduleId, route: fullRoute, nationality: null },
       { tripId: scheduleId, route: null, nationality },
       { tripId: scheduleId, route: null, nationality: null },
-      // Route-specific rules (no schedule)
       { tripId: null, route: segmentRoute, nationality },
       { tripId: null, route: segmentRoute, nationality: null },
       { tripId: null, route: fullRoute, nationality },
       { tripId: null, route: fullRoute, nationality: null },
-      // Global rules
       { tripId: null, route: null, nationality },
       { tripId: null, route: null, nationality: null },
     ];
diff --git a/apps/edr-passenger-api/src/modules/seat-classes/seat-classes.service.ts b/apps/edr-passenger-api/src/modules/seat-classes/seat-classes.service.ts
index 982c37209..3f2fafebf 100644
--- a/apps/edr-passenger-api/src/modules/seat-classes/seat-classes.service.ts
+++ b/apps/edr-passenger-api/src/modules/seat-classes/seat-classes.service.ts
@@ -1,41 +1,33 @@
 import { Injectable, NotFoundException, ConflictException } from '@nestjs/common';
 import { PrismaService } from '../../common/prisma.service';
-import { CreateSeatClassDto, UpdateSeatClassDto } from './seat-classes.dto';
 
 @Injectable()
 export class SeatClassesService {
   constructor(private prisma: PrismaService) {}
 
-  private readonly coachInclude = {
-    coaches: {
-      select: { id: true, coachNumber: true, label: true, mode: true, totalUnits: true, _count: { select: { seats: true } } },
-      orderBy: { label: 'asc' as const },
-    },
-  };
-
   listSeatClasses() {
-    return this.prisma.seatClass.findMany({ orderBy: { createdAt: 'asc' }, include: this.coachInclude });
+    return this.prisma.seatClass.findMany({ orderBy: { createdAt: 'asc' } });
   }
 
   async getSeatClass(id: string) {
-    const sc = await this.prisma.seatClass.findUnique({ where: { id }, include: this.coachInclude });
+    const sc = await this.prisma.seatClass.findUnique({ where: { id } });
     if (!sc) throw new NotFoundException('SeatClass not found');
     return sc;
   }
 
-  async createSeatClass(dto: CreateSeatClassDto) {
+  async createSeatClass(dto: any) {
     try {
-      return await this.prisma.seatClass.create({ data: dto, include: this.coachInclude });
+      return await this.prisma.seatClass.create({ data: dto });
     } catch (e: any) {
       if (e.code === 'P2002') throw new ConflictException(`Seat class "${dto.name}" already exists`);
       throw e;
     }
   }
 
-  async updateSeatClass(id: string, dto: UpdateSeatClassDto) {
+  async updateSeatClass(id: string, dto: any) {
     const sc = await this.prisma.seatClass.findUnique({ where: { id } });
     if (!sc) throw new NotFoundException('SeatClass not found');
-    return this.prisma.seatClass.update({ where: { id }, data: dto, include: this.coachInclude });
+    return this.prisma.seatClass.update({ where: { id }, data: dto });
   }
 
   async deleteSeatClass(id: string) {
diff --git a/apps/edr-passenger-api/src/modules/seats/seats.controller.ts b/apps/edr-passenger-api/src/modules/seats/seats.controller.ts
index e5d61c829..8914ca465 100644
--- a/apps/edr-passenger-api/src/modules/seats/seats.controller.ts
+++ b/apps/edr-passenger-api/src/modules/seats/seats.controller.ts
@@ -1,8 +1,9 @@
-import { Body, Controller, Delete, Get, Param, Post, Query, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post, Patch, Query, UseGuards } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth, ApiParam, ApiQuery, ApiResponse } from '@nestjs/swagger';
 import { SeatsService } from './seats.service';
 import { HoldSeatsDto } from './seats.dto';
 import { JwtGuard } from '../../common/jwt.guard';
+import { IamGuard } from '../../common/iam-adapter';
 
 @ApiTags('Seats')
 @Controller('seats')
@@ -78,6 +79,47 @@ This makes it clear which segment of the route each seat is held for, enabling s
   @ApiResponse({ status: 404, description: 'Hold not found' })
   releaseHold(@Param('holdId') holdId: string) { return this.service.releaseHold(holdId); }
 
+  // ── Seat Block / Unblock ───────────────────────────────────────────────────
+  @Post(':seatId/block')
+  @UseGuards(IamGuard) @ApiBearerAuth('IAM-auth')
+  @ApiOperation({ summary: 'Block a seat (e.g., maintenance, damage)' })
+  @ApiParam({ name: 'seatId', description: 'Seat UUID' })
+  @ApiResponse({ status: 200, description: 'Seat blocked' })
+  blockSeat(@Param('seatId') seatId: string, @Body() body: { reason: string }) {
+    return this.service.blockSeat(seatId, body.reason);
+  }
+
+  @Delete(':seatId/block')
+  @UseGuards(IamGuard) @ApiBearerAuth('IAM-auth')
+  @ApiOperation({ summary: 'Unblock a seat' })
+  @ApiParam({ name: 'seatId', description: 'Seat UUID' })
+  @ApiResponse({ status: 200, description: 'Seat unblocked' })
+  unblockSeat(@Param('seatId') seatId: string) {
+    return this.service.unblockSeat(seatId);
+  }
+
+  // ── Remove Seat ────────────────────────────────────────────────────────────
+  @Patch(':seatId/remove')
+  @UseGuards(IamGuard) @ApiBearerAuth('IAM-auth')
+  @ApiOperation({ summary: 'Remove a seat by marking with negative seatNumber' })
+  @ApiParam({ name: 'seatId', description: 'Seat UUID' })
+  @ApiResponse({ status: 200, description: 'Seat removed (seatNumber negated), shows as empty space' })
+  @ApiResponse({ status: 404, description: 'Seat not found' })
+  removeSeat(@Param('seatId') seatId: string) {
+    return this.service.removeSeat(seatId);
+  }
+
+  @Patch(':seatId/undo-remove')
+  @UseGuards(IamGuard) @ApiBearerAuth('IAM-auth')
+  @ApiOperation({ summary: 'Undo seat removal by restoring original seatNumber' })
+  @ApiParam({ name: 'seatId', description: 'Seat UUID' })
+  @ApiResponse({ status: 200, description: 'Seat restored (negative seatNumber removed)' })
+  @ApiResponse({ status: 404, description: 'Seat not found' })
+  @ApiResponse({ status: 400, description: 'Seat is not removed' })
+  undoRemoveSeat(@Param('seatId') seatId: string) {
+    return this.service.undoRemoveSeat(seatId);
+  }
+
   @Get('export/csv/:scheduleId') @UseGuards(JwtGuard) @ApiBearerAuth('JWT-auth') @ApiOperation({ summary: 'Export seats as CSV' })
   async exportCSV(@Param('scheduleId') scheduleId: string) {
     const csv = await this.service.exportSeatsCSV(scheduleId);
diff --git a/apps/edr-passenger-api/src/modules/seats/seats.module.ts b/apps/edr-passenger-api/src/modules/seats/seats.module.ts
index 014e0918a..a21797e0f 100644
--- a/apps/edr-passenger-api/src/modules/seats/seats.module.ts
+++ b/apps/edr-passenger-api/src/modules/seats/seats.module.ts
@@ -1,10 +1,12 @@
 import { Module } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
 import { SeatsController } from './seats.controller';
 import { SeatsService } from './seats.service';
 import { SegmentsModule } from '../segments/segments.module';
+import { IamModule } from '../../common/iam.module';
 
 @Module({
-  imports: [SegmentsModule],
+  imports: [SegmentsModule, HttpModule, IamModule],
   controllers: [SeatsController],
   providers: [SeatsService],
   exports: [SeatsService],
diff --git a/apps/edr-passenger-api/src/modules/seats/seats.service.ts b/apps/edr-passenger-api/src/modules/seats/seats.service.ts
index 6abd4e11a..88f9666bd 100644
--- a/apps/edr-passenger-api/src/modules/seats/seats.service.ts
+++ b/apps/edr-passenger-api/src/modules/seats/seats.service.ts
@@ -11,48 +11,68 @@ export class SeatsService {
     private segmentsService: SegmentsService,
   ) {}
 
-  // ── Seat Map ──────────────────────────────────────────────────────────────
   async getSeatMap(scheduleId: string, coachId?: string) {
     const assignments = await this.prisma.coachAssignment.findMany({
       where: { scheduleId, ...(coachId ? { coachId } : {}) },
-      include: { coach: { include: { seats: { orderBy: [{ row: 'asc' }, { col: 'asc' }] }, seatClass: true } } },
+      include: {
+        coach: {
+          include: {
+            seats: { orderBy: [{ row: 'asc' }, { col: 'asc' }] },
+            coachType: { include: { seatClasses: true } },
+          },
+        },
+      },
       orderBy: { positionNumber: 'asc' },
     });
 
-    const allSeatIds = assignments.flatMap(a => a.coach.seats.map(s => s.id));
+    console.log(`[getSeatMap] scheduleId=${scheduleId}, coachId=${coachId}, found ${assignments.length} coach assignments`);
+
+    const allSeatIds = assignments.flatMap((a: any) => a.coach.seats.map((s: any) => s.id));
     const effectiveStatuses = await this.resolveEffectiveStatuses(scheduleId, allSeatIds);
 
-    return {
-      coaches: assignments.map((a) => ({
-        id: a.coach.id,
-        assignmentId: a.id,
-        name: `Coach ${a.coach.label}`,
-        seatClass: a.coach.seatClass.name,
-        positionNumber: a.positionNumber,
-        seats: a.coach.seats.map((s) => ({
-          id: s.id,
-          number: s.label,
-          status: effectiveStatuses.get(s.id) ?? s.status,
-          kind: s.kind,
-          row: s.row,
-          col: s.col,
-          isWindow: s.isWindow,
-          isAisle: s.isAisle,
-          bedPosition: s.bedPosition,
-        })),
-      })),
+    const response = {
+      coaches: assignments.map((a) => {
+        const allSeats = a.coach.seats;
+        const seatClassNames = a.coach.coachType.seatClasses.map((sc: any) => sc.name);
+        
+        return {
+          id: a.coach.id,
+          assignmentId: a.id,
+          coachNumber: a.coach.number,
+          label: a.coach.number,
+          mode: a.coach.status,
+          name: `Coach ${a.coach.number}`,
+          seatClasses: seatClassNames,
+          seatClass: seatClassNames.length > 0 ? seatClassNames[0] : 'Standard',
+          positionNumber: a.positionNumber,
+          seatArrangement: a.coach.arrangement,
+          totalSeats: a.coach.capacity,
+          seats: allSeats.map((s) => ({
+            id: s.id,
+            seatNumber: s.seatNumber,
+            number: s.seatNumber,
+            label: s.seatNumber,
+            status: effectiveStatuses.get(s.id) ?? s.status,
+            kind: s.kind,
+            row: s.row,
+            col: s.col,
+            isWindow: s.isWindow,
+            isAisle: s.isAisle,
+            bedPosition: s.bedPosition,
+            coach: {
+              id: a.coach.id,
+              coachNumber: a.coach.number,
+              label: a.coach.number,
+            },
+          })),
+        };
+      }),
     };
+
+    console.log(`[getSeatMap] returning ${response.coaches.length} coaches with seats`);
+    return response;
   }
 
-  /**
-   * Computes the effective seat status for a set of seats on a specific schedule
-   * by checking active SeatHolds and confirmed JourneySegments.
-   *
-   * Priority: BLOCKED (physical) > BOOKED (confirmed journey) > HELD (active hold) > AVAILABLE
-   *
-   * This is needed because seat.status is no longer written during booking —
-   * availability is segment-scoped, so the DB column stays AVAILABLE even when held.
-   */
   async resolveEffectiveStatuses(
     scheduleId: string,
     seatIds: string[],
@@ -61,7 +81,6 @@ export class SeatsService {
 
     if (seatIds.length === 0) return statusMap;
 
-    // 1. Active holds — any seat in an unexpired SeatHold for this schedule is HELD
     const activeHolds = await this.prisma.seatHold.findMany({
       where: {
         scheduleId,
@@ -76,8 +95,6 @@ export class SeatsService {
       }
     }
 
-    // 2. Active bookings via JourneySegment — CONFIRMED or PENDING_PAYMENT → BOOKED
-    //    (overwrites HELD if the same seat has a confirmed booking)
     const bookedSegments = await this.prisma.journeySegment.findMany({
       where: {
         scheduleId,
@@ -93,24 +110,21 @@ export class SeatsService {
     return statusMap;
   }
 
-  // ── Hold / Release ────────────────────────────────────────────────────────
   async holdSeats(dto: HoldSeatsDto) {
-    // ── Validate request integrity ───────────────────────────────────────────
     const passengerIds = dto.passengers.map(p => p.passengerId);
     const seatIds      = dto.passengers.map(p => p.seatId);
 
     if (new Set(passengerIds).size !== passengerIds.length)
-      throw new BadRequestException('Duplicate passengerId in passengers list — each passenger must appear once');
+      throw new BadRequestException('Duplicate passengerId in passengers list');
     if (new Set(seatIds).size !== seatIds.length)
-      throw new BadRequestException('Duplicate seatId in passengers list — each seat can only be assigned to one passenger');
+      throw new BadRequestException('Duplicate seatId in passengers list');
 
     const expiresAt = new Date(Date.now() + 5 * 60 * 1000);
 
     const hold = await this.prisma.$transaction(async (tx) => {
-      // ── 1. Validate seats exist and none are BLOCKED ─────────────────────
       const seats = await tx.seat.findMany({
         where: { id: { in: seatIds } },
-        select: { id: true, status: true, label: true },
+        select: { id: true, status: true, seatNumber: true },
       });
 
       if (seats.length !== seatIds.length) {
@@ -121,11 +135,10 @@ export class SeatsService {
 
       const blocked = seats.filter(s => s.status === 'BLOCKED');
       if (blocked.length > 0)
-        throw new ConflictException(`Seat(s) ${blocked.map(s => s.label).join(', ')} are blocked`);
+        throw new ConflictException(`Seat(s) ${blocked.map(s => s.seatNumber).join(', ')} are blocked`);
 
-      const seatLabelById = Object.fromEntries(seats.map(s => [s.id, s.label]));
+      const seatLabelById = Object.fromEntries(seats.map(s => [s.id, s.seatNumber]));
 
-      // ── 2. Resolve requested leg sequences ──────────────────────────────
       const stopTimes = await tx.tripStopTime.findMany({
         where: { scheduleId: dto.scheduleId },
         select: { stationId: true, sequence: true },
@@ -137,17 +150,15 @@ export class SeatsService {
       const reqTo   = seqOf(dto.destinationStationId);
 
       if (reqFrom === undefined || reqTo === undefined)
-        throw new BadRequestException('Origin or destination station not found on this schedule');
+        throw new BadRequestException('Origin or destination station not found');
       if (reqFrom >= reqTo)
         throw new BadRequestException('Origin must come before destination');
 
-      // ── 3. Load active holds for this schedule ───────────────────────────
       const activeHolds = await tx.seatHold.findMany({
         where: { scheduleId: dto.scheduleId, expiresAt: { gt: new Date() } },
         select: { seatIds: true, createdBy: true },
       });
 
-      // Parse each hold's leg range and passenger list
       const parsedHolds: { seatIds: string[]; from: number; to: number; passengerIds: string[] }[] = [];
       for (const h of activeHolds) {
         try {
@@ -164,32 +175,28 @@ export class SeatsService {
               });
             }
           }
-        } catch { /* ignore malformed */ }
+        } catch { /* ignore */ }
       }
 
-      // ── 4. Per-passenger validation with overlap check ───────────────────
       for (const { passengerId, seatId } of dto.passengers) {
         for (const hold of parsedHolds) {
           const legsOverlap = hold.from < reqTo && reqFrom < hold.to;
-          if (!legsOverlap) continue; // non-overlapping leg — no conflict
+          if (!legsOverlap) continue;
 
-          // Rule A: seat is held on an overlapping leg
           if (hold.seatIds.includes(seatId)) {
             throw new ConflictException(
-              `Seat ${seatLabelById[seatId]} is already held for this leg. Please choose a different seat.`,
+              `Seat ${seatLabelById[seatId]} is already held for this leg`,
             );
           }
 
-          // Rule B: passenger already holds a seat on an overlapping leg
           if (hold.passengerIds.includes(passengerId)) {
             throw new ConflictException(
-              `Passenger already holds a seat on this journey leg. You can only hold one seat per journey.`,
+              `Passenger already holds a seat on this journey leg`,
             );
           }
         }
       }
 
-      // Store passenger→seat mapping AND leg in createdBy as JSON
       const holdMeta = {
         originStationId:      dto.originStationId,
         destinationStationId: dto.destinationStationId,
@@ -228,12 +235,7 @@ export class SeatsService {
     return this.enrichHold(hold);
   }
 
-  /**
-   * Resolves the opaque fareQuoteId leg encoding into human-readable station
-   * names and enriches the hold with schedule, seat, and leg details.
-   */
   private async enrichHold(hold: any) {
-    // Decode leg and passenger→seat mapping from createdBy JSON
     let originStationId: string | null = null;
     let destinationStationId: string | null = null;
     let passengerSeatMap: { passengerId: string; seatId: string }[] = [];
@@ -241,7 +243,6 @@ export class SeatsService {
     try {
       if (hold.createdBy) {
         const raw = hold.createdBy;
-        // Guard: only parse if it looks like a JSON object, not a plain number/string
         if (typeof raw === 'string' && raw.trimStart().startsWith('{')) {
           const meta = JSON.parse(raw);
           originStationId      = meta.originStationId      ?? null;
@@ -249,7 +250,7 @@ export class SeatsService {
           passengerSeatMap     = Array.isArray(meta.passengers) ? meta.passengers : [];
         }
       }
-    } catch { /* ignore malformed createdBy */ }
+    } catch { /* ignore */ }
 
     const seatIds = hold.seatIds as string[];
 
@@ -262,7 +263,7 @@ export class SeatsService {
       destinationStationId ? this.prisma.station.findUnique({ where: { id: destinationStationId } }) : null,
       this.prisma.seat.findMany({
         where: { id: { in: seatIds } },
-        include: { coach: { include: { seatClass: true } } },
+        include: { coach: true },
       }),
     ]);
 
@@ -277,10 +278,8 @@ export class SeatsService {
       destinationSequence = stopTimes.find(s => s.stationId === destinationStationId)?.sequence ?? null;
     }
 
-    // Build seat map keyed by seatId for quick lookup
     const seatById = Object.fromEntries(seats.map(s => [s.id, s]));
 
-    // Merge passenger→seat mapping with seat details
     const passengers = passengerSeatMap.length > 0
       ? passengerSeatMap.map(({ passengerId, seatId }) => {
           const s = seatById[seatId];
@@ -288,26 +287,25 @@ export class SeatsService {
             passengerId,
             seat: s ? {
               id:         s.id,
-              label:      s.label,
+              label:      s.seatNumber,
               seatNumber: s.seatNumber,
-              coach:      s.coach.label,
-              seatClass:  s.coach.seatClass.name,
+              coach:      s.coach.number,
+              seatClass:  'Standard',
               row:        s.row,
               col:        s.col,
             } : { id: seatId },
           };
         })
-      // Fallback for holds created before this change
       : seatIds.map(seatId => {
           const s = seatById[seatId];
           return {
             passengerId: hold.passengerId,
             seat: s ? {
               id:         s.id,
-              label:      s.label,
+              label:      s.seatNumber,
               seatNumber: s.seatNumber,
-              coach:      s.coach.label,
-              seatClass:  s.coach.seatClass.name,
+              coach:      s.coach.number,
+              seatClass:  'Standard',
               row:        s.row,
               col:        s.col,
             } : { id: seatId },
@@ -350,22 +348,26 @@ export class SeatsService {
   }
 
   async confirmSeats(seatIds: string[]) {
-    // No-op for status — availability is segment-scoped via JourneySegment
-    // seat.status = BLOCKED is the only hard gate; BOOKED is not used as a booking flag
-  }
-  async releaseSeats(seatIds: string[]) {
-    // Only reset seats that are physically BLOCKED back to AVAILABLE if needed
-    // For segment-based bookings, releasing is handled by JourneySegment deletion
+    // No-op
   }
 
-  async autoAssignSeats(scheduleId: string, count: number, seatClassName: string, eligibility?: string): Promise<string[]> {
+  async releaseSeats(seatIds: string[]) {
+    if (seatIds.length > 0) {
+      await this.prisma.journeySegment.deleteMany({
+        where: { seatId: { in: seatIds } },
+      });
+    }
+  }
+
+  async autoAssignSeats(scheduleId: string, count: number, seatClassName: string): Promise<string[]> {
     const seats = await this.prisma.seat.findMany({
       where: {
-        coach: { seatClass: { name: seatClassName }, assignments: { some: { scheduleId } } },
+        coach: { assignments: { some: { scheduleId } } },
         status: 'AVAILABLE',
-        ...(eligibility ? { eligibility } : {}),
+        seatNumber: { not: '' },
+        NOT: { seatNumber: { startsWith: '-' } },
       },
-      orderBy: [{ coach: { label: 'asc' } }, { row: 'asc' }, { col: 'asc' }],
+      orderBy: [{ coach: { number: 'asc' } }, { row: 'asc' }, { col: 'asc' }],
     });
 
     if (seats.length < count) {
@@ -400,10 +402,10 @@ export class SeatsService {
       where: { scheduleId },
       include: { coach: { include: { seats: { orderBy: [{ row: 'asc' }, { col: 'asc' }] } } } },
     });
-    const rows = ['coachId,coachLabel,row,col,label,kind,status,premiumFeeMinor,eligibility'];
+    const rows = ['coachId,coachLabel,row,col,seatNumber,kind,status,premiumFeeMinor'];
     for (const a of assignments) {
       for (const seat of a.coach.seats) {
-        rows.push(`${a.coach.id},${a.coach.label},${seat.row},${seat.col},${seat.label},${seat.kind},${seat.status},${seat.premiumFeeMinor},${seat.eligibility || ''}`);
+        rows.push(`${a.coach.id},${a.coach.number},${seat.row},${seat.col},${seat.seatNumber},${seat.kind},${seat.status},${seat.premiumFeeMinor}`);
       }
     }
     return rows.join('\n');
@@ -422,8 +424,8 @@ export class SeatsService {
         invalid++;
         continue;
       }
-      const [coachId, coachLabel, row, col, label, kind, status, premiumFeeMinor] = parts;
-      if (!coachId || !row || !col || !label) {
+      const [coachId, coachLabel, row, col, seatNumber, kind, status, premiumFeeMinor] = parts;
+      if (!coachId || !row || !col || !seatNumber) {
         errors.push(`Line ${i + 2}: Missing required fields`);
         invalid++;
         continue;
@@ -440,32 +442,30 @@ export class SeatsService {
     let imported = 0;
 
     if (!commit) {
-      return { imported: 0, errors: ['Preview mode - use commit=true to apply changes'] };
+      return { imported: 0, errors: ['Preview mode'] };
     }
 
     for (let i = 0; i < lines.length; i++) {
       try {
         const parts = lines[i].split(',');
-        const [coachId, coachLabel, row, col, label, kind, status, premiumFeeMinor, eligibility] = parts;
+        const [coachId, coachLabel, row, col, seatNumber, kind, status, premiumFeeMinor] = parts;
 
         await this.prisma.seat.upsert({
           where: { coachId_row_col: { coachId, row: parseInt(row), col } },
           update: {
-            label,
+            seatNumber,
             kind: kind as any,
             status: status as any,
             premiumFeeMinor: parseInt(premiumFeeMinor) || 0,
-            eligibility: eligibility || null,
           },
           create: {
             coachId,
             row: parseInt(row),
             col,
-            label,
+            seatNumber,
             kind: kind as any,
             status: status as any,
             premiumFeeMinor: parseInt(premiumFeeMinor) || 0,
-            eligibility: eligibility || null,
           },
         });
         imported++;
@@ -477,9 +477,86 @@ export class SeatsService {
     return { imported, errors: errors.slice(0, 10) };
   }
 
+  async blockSeat(seatId: string, reason: string) {
+    const seat = await this.prisma.seat.findUnique({ where: { id: seatId } });
+    if (!seat) throw new NotFoundException('Seat not found');
+
+    await this.prisma.seat.update({
+      where: { id: seatId },
+      data: { status: 'BLOCKED' },
+    });
+
+    await this.prisma.seatBlock.create({
+      data: {
+        seatId,
+        reason,
+        blockedBy: 'system',
+      },
+    });
+
+    return { blocked: true, seatId, reason };
+  }
+
+  async unblockSeat(seatId: string) {
+    const seat = await this.prisma.seat.findUnique({ where: { id: seatId } });
+    if (!seat) throw new NotFoundException('Seat not found');
+
+    await this.prisma.seat.update({
+      where: { id: seatId },
+      data: { status: 'AVAILABLE' },
+    });
+
+    await this.prisma.seatBlock.deleteMany({
+      where: { seatId },
+    });
+
+    return { unblocked: true, seatId };
+  }
+
+  async removeSeat(seatId: string) {
+    const seat = await this.prisma.seat.findUnique({ where: { id: seatId } });
+    if (!seat) throw new NotFoundException('Seat not found');
+    if (!seat.seatNumber) throw new BadRequestException('Seat already removed');
+
+    // Mark removed seat with negative seatNumber (e.g., '1' → '-1') to show empty space
+    const negatedNumber = `-${seat.seatNumber}`;
+    await this.prisma.seat.update({
+      where: { id: seatId },
+      data: { seatNumber: negatedNumber },
+    });
+
+    return { removed: true, seatId, originalSeatNumber: seat.seatNumber };
+  }
+
+  async undoRemoveSeat(seatId: string) {
+    const seat = await this.prisma.seat.findUnique({ where: { id: seatId } });
+    if (!seat) throw new NotFoundException('Seat not found');
+    if (!seat.seatNumber || !seat.seatNumber.startsWith('-')) {
+      throw new BadRequestException('Seat is not removed');
+    }
+
+    // Restore original seatNumber by removing the negative sign
+    const originalNumber = seat.seatNumber.slice(1);
+    await this.prisma.seat.update({
+      where: { id: seatId },
+      data: { seatNumber: originalNumber },
+    });
+
+    return { restored: true, seatId, seatNumber: originalNumber };
+  }
+
   @Cron(CronExpression.EVERY_MINUTE)
   async expireHolds() {
     const expired = await this.prisma.seatHold.findMany({ where: { expiresAt: { lt: new Date() } } });
-    for (const hold of expired) { await this.releaseSeats(hold.seatIds); await this.prisma.seatHold.delete({ where: { id: hold.id } }); }
+    for (const hold of expired) { 
+      await this.releaseSeats(hold.seatIds);
+      try {
+        await this.prisma.seatHold.delete({ where: { id: hold.id } });
+      } catch (err) {
+        if (err instanceof Error && !err.message.includes('P2025')) {
+          throw err;
+        }
+      }
+    }
   }
 }
diff --git a/apps/edr-passenger-api/src/modules/segments/booking-flow-example.ts b/apps/edr-passenger-api/src/modules/segments/booking-flow-example.ts
index 8b46a77d1..7e912a6e2 100644
--- a/apps/edr-passenger-api/src/modules/segments/booking-flow-example.ts
+++ b/apps/edr-passenger-api/src/modules/segments/booking-flow-example.ts
@@ -87,7 +87,7 @@ async function holdSeatsTransaction(scheduleId: string, seatIds: string[], passe
 
     for (const seat of seats) {
       if (seat.status !== 'AVAILABLE') {
-        throw new Error(`Seat ${seat.label} is not available (status: ${seat.status})`);
+        throw new Error(`Seat ${seat.seatNumber} is not available (status: ${seat.status})`);
       }
     }
 
diff --git a/apps/edr-passenger-api/src/modules/segments/enhanced-seats.service.ts b/apps/edr-passenger-api/src/modules/segments/enhanced-seats.service.ts
index 88fd636b6..406c9e61b 100644
--- a/apps/edr-passenger-api/src/modules/segments/enhanced-seats.service.ts
+++ b/apps/edr-passenger-api/src/modules/segments/enhanced-seats.service.ts
@@ -35,14 +35,12 @@ export class EnhancedSeatsService {
       for (const seatId of request.seatIds) {
         const seat = await tx.seat.findUnique({ where: { id: seatId } });
         if (!seat) throw new BadRequestException(`Seat ${seatId} not found`);
-        // Only BLOCKED seats are hard-rejected — BOOKED/HELD are fine if the
-        // segment does not overlap (another passenger may occupy a different leg)
-        if (seat.status === 'BLOCKED') throw new BadRequestException(`Seat ${seat.label} is blocked`);
+        if (seat.status === 'BLOCKED') throw new BadRequestException(`Seat ${seat.seatNumber} is blocked`);
 
         const free = await this.segmentsService.isSeatFreeForLeg(
           request.scheduleId, seatId, reqFrom, reqTo,
         );
-        if (!free) throw new ConflictException(`Seat ${seat.label} is not available for the requested leg`);
+        if (!free) throw new ConflictException(`Seat ${seat.seatNumber} is not available for the requested leg`);
       }
 
       const expiresAt = new Date(Date.now() + 10 * 60 * 1000);
@@ -51,7 +49,6 @@ export class EnhancedSeatsService {
           scheduleId:  request.scheduleId,
           seatIds:     request.seatIds,
           passengerId: request.passengerId,
-          // Store leg in createdBy JSON — no fareQuoteId needed
           createdBy: JSON.stringify({
             originStationId:      request.originStationId,
             destinationStationId: request.destinationStationId,
@@ -60,7 +57,6 @@ export class EnhancedSeatsService {
         },
       });
 
-      // Do NOT set seat.status = HELD globally — status is segment-scoped
       this.eventEmitter.emit('seats.held', { holdId: seatHold.id, scheduleId: request.scheduleId, seatIds: request.seatIds, segments });
       return { holdId: seatHold.id, expiresAt, segments, seats: request.seatIds };
     });
@@ -81,7 +77,6 @@ export class EnhancedSeatsService {
       });
       if (!schedule) throw new BadRequestException('Schedule not found');
 
-      // Resolve the passenger's leg from createdBy JSON
       let originStationId: string | undefined;
       let destinationStationId: string | undefined;
       try {
@@ -92,15 +87,15 @@ export class EnhancedSeatsService {
         }
       } catch { /* ignore */ }
 
-      const originStop = originStationId ? schedule.stopTimes.find(s => s.stationId === originStationId) : undefined;
-      const destStop = destinationStationId ? schedule.stopTimes.find(s => s.stationId === destinationStationId) : undefined;
+      const originStop = originStationId ? schedule.stopTimes.find((s: any) => s.stationId === originStationId) : undefined;
+      const destStop = destinationStationId ? schedule.stopTimes.find((s: any) => s.stationId === destinationStationId) : undefined;
       const fromSeq = originStop?.sequence ?? schedule.stopTimes[0].sequence;
       const toSeq = destStop?.sequence ?? schedule.stopTimes[schedule.stopTimes.length - 1].sequence;
 
       const segments: Segment[] = [];
       for (let i = fromSeq; i < toSeq; i++) {
-        const fromStop = schedule.stopTimes.find(s => s.sequence === i);
-        const toStop = schedule.stopTimes.find(s => s.sequence === i + 1);
+        const fromStop = schedule.stopTimes.find((s: any) => s.sequence === i);
+        const toStop = schedule.stopTimes.find((s: any) => s.sequence === i + 1);
         if (fromStop && toStop) {
           segments.push({
             fromStationId: fromStop.stationId,
@@ -132,7 +127,6 @@ export class EnhancedSeatsService {
         }
       }
 
-      // Do NOT set seat.status = BOOKED globally — availability is segment-scoped
       await tx.seatHold.delete({ where: { id: request.holdId } });
 
       this.eventEmitter.emit('booking.confirmed', { bookingId: request.bookingId, scheduleId: hold.scheduleId, seatIds: hold.seatIds, segments });
@@ -185,22 +179,20 @@ export class EnhancedSeatsService {
 
     const schedule = await this.prisma.trainSchedule.findUnique({
       where: { id: scheduleId },
-      include: { coachAssignments: { include: { coach: { include: { seats: true, seatClass: true } } } } },
+      include: { coachAssignments: { include: { coach: { include: { seats: true } } } } },
     });
     if (!schedule) throw new BadRequestException('Schedule not found');
 
     const availableSeats = [];
     for (const assignment of schedule.coachAssignments) {
       for (const seat of assignment.coach.seats) {
-        // Hard-blocked seats are never available
         if (seat.status === 'BLOCKED') continue;
-        // Availability is determined purely by segment overlap — not global seat.status
         const free = await this.segmentsService.isSeatFreeForLeg(scheduleId, seat.id, reqFrom, reqTo);
         if (free) {
           availableSeats.push({
-            id: seat.id, label: seat.label,
-            coach: assignment.coach.label,
-            seatClass: assignment.coach.seatClass.name,
+            id: seat.id, label: seat.seatNumber,
+            coach: assignment.coach.number,
+            seatClass: 'Standard',
             row: seat.row, col: seat.col,
             kind: seat.kind,
             isWindow: seat.isWindow,
diff --git a/apps/edr-passenger-api/src/modules/tickets/tickets.controller.ts b/apps/edr-passenger-api/src/modules/tickets/tickets.controller.ts
index 881b95e0a..5711355e0 100644
--- a/apps/edr-passenger-api/src/modules/tickets/tickets.controller.ts
+++ b/apps/edr-passenger-api/src/modules/tickets/tickets.controller.ts
@@ -1,16 +1,34 @@
-import { Body, Controller, Get, Param, Post, Query, UseGuards, Delete } from '@nestjs/common';
+import { Body, Controller, Get, Param, Post, Query, UseGuards, Delete, Patch } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth } from '@nestjs/swagger';
 import { TicketsService } from './tickets.service';
 import { JwtGuard } from '../../common/jwt.guard';
 
 @ApiTags('Tickets')
 @Controller('tickets')
-@UseGuards(JwtGuard)
-@ApiBearerAuth('JWT-auth')
 export class TicketsController {
   constructor(private service: TicketsService) {}
   
+  @Post('generate/:bookingId')
+  @ApiOperation({ 
+    summary: 'Generate ticket for booking (confirmation page)',
+    description: 'Creates a ticket when confirmation page is reached and permanently holds all associated seats with SeatBlock records.'
+  })
+  generateTicket(@Param('bookingId') bookingId: string) {
+    return this.service.generate(bookingId);
+  }
+
+  @Patch('update-seats/:bookingId')
+  @ApiOperation({
+    summary: 'Update ticket seats before final confirmation',
+    description: 'Allows users to change selected seats after ticket generation. Removes old seat blocks and creates new ones for updated seats.'
+  })
+  updateSeats(@Param('bookingId') bookingId: string, @Body() body: { seatIds: string[] }) {
+    return this.service.updateSeats(bookingId, body.seatIds);
+  }
+  
   @Get()
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ summary: 'List all tickets with optional filters' })
   listTickets(
     @Query('search') search?: string,
@@ -27,6 +45,8 @@ export class TicketsController {
   }
   
   @Get(':bookingRef')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ 
     summary: 'Get ticket with QR code and passenger details',
     description: `Returns ticket information including:
@@ -42,6 +62,8 @@ export class TicketsController {
   }
   
   @Post(':bookingRef/validate')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ 
     summary: 'Validate ticket at gate with audit logging',
     description: 'Validates ticket QR/barcode at station gate. Records validation in audit log with timestamp, gate, and validator.'
@@ -55,27 +77,35 @@ export class TicketsController {
   }
   
   @Get(':ticketId/validation-logs')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ summary: 'Get validation logs for ticket' })
   getValidationLogs(@Param('ticketId') ticketId: string) {
     return this.service.getValidationLogs(ticketId);
   }
 
   @Get('offline/export')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ summary: 'Export tickets for offline validation' })
   exportOfflineData(@Query('scheduleId') scheduleId: string) {
     return this.service.exportOfflineData(scheduleId);
   }
 
   @Post('validate/offline')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ summary: 'Batch import offline validations' })
   validateOfflineBatch(@Body() body: { validations: any[] }) {
     return this.service.validateOfflineBatch(body.validations);
   }
 
   @Delete(':id')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ 
     summary: 'Delete ticket (admin only)',
-    description: 'Permanently deletes a ticket record'
+    description: 'Permanently deletes a ticket record and removes associated seat blocks'
   })
   delete(@Param('id') id: string) {
     return this.service.delete(id);
diff --git a/apps/edr-passenger-api/src/modules/tickets/tickets.module.ts b/apps/edr-passenger-api/src/modules/tickets/tickets.module.ts
index f1c01ab9d..cd02974d3 100644
--- a/apps/edr-passenger-api/src/modules/tickets/tickets.module.ts
+++ b/apps/edr-passenger-api/src/modules/tickets/tickets.module.ts
@@ -1,6 +1,13 @@
 import { Module } from '@nestjs/common';
 import { TicketsController } from './tickets.controller';
 import { TicketsService } from './tickets.service';
+import { JwtGuard } from '../../common/jwt.guard';
 
-@Module({ controllers: [TicketsController], providers: [TicketsService], exports: [TicketsService] })
+@Module({
+  controllers: [TicketsController],
+  providers: [TicketsService, JwtGuard],
+  exports: [TicketsService, JwtGuard],
+})
 export class TicketsModule {}
+
+export { TicketsController } from './tickets.controller';
diff --git a/apps/edr-passenger-api/src/modules/tickets/tickets.service.ts b/apps/edr-passenger-api/src/modules/tickets/tickets.service.ts
index 54e994765..a77714cf3 100644
--- a/apps/edr-passenger-api/src/modules/tickets/tickets.service.ts
+++ b/apps/edr-passenger-api/src/modules/tickets/tickets.service.ts
@@ -19,6 +19,7 @@ export class TicketsService {
       where.OR = [
         { bookingRef: { contains: filters.search, mode: 'insensitive' } },
         { barcodePayload: { contains: filters.search, mode: 'insensitive' } },
+        { booking: { bookingRef: { contains: filters.search, mode: 'insensitive' } } },
       ];
     }
     if (filters.status) {
@@ -44,7 +45,13 @@ export class TicketsService {
       items: tickets.map((t) => ({
         id: t.id,
         ticketNumber: t.barcodePayload,
-        booking: t.booking,
+        bookingRef: t.bookingRef,
+        booking: {
+          bookingRef: t.booking.bookingRef,
+          status: t.booking.status,
+          passenger: t.booking.passenger?.user || { fullName: 'Guest', email: t.booking.contactEmail },
+          contactEmail: t.booking.contactEmail,
+        },
         schedule: t.booking.schedule,
         seat: t.booking.seats[0]?.seat,
         status: t.booking.status,
@@ -58,18 +65,96 @@ export class TicketsService {
   }
 
   async generate(bookingId: string) {
+    if (!bookingId) {
+      throw new BadRequestException('Booking ID is required');
+    }
+    
     const booking = await this.prisma.booking.findUnique({
       where: { id: bookingId },
-      include: { schedule: { include: { originStation: true, destinationStation: true, train: true } }, seats: { include: { seat: { include: { coach: true } } } } },
+      include: { 
+        schedule: { include: { originStation: true, destinationStation: true, train: true } }, 
+        seats: { include: { seat: { include: { coach: true } } } } 
+      },
     });
-    if (!booking) throw new NotFoundException('Booking not found');
+    if (!booking) throw new NotFoundException(`Booking ${bookingId} not found`);
+    
     const qrPayload = await QRCode.toDataURL(`edr:tkt:${booking.id}:${booking.bookingRef}`);
     const barcodePayload = `EDR${booking.bookingRef}${booking.id.substring(0, 8).toUpperCase()}`;
-    return this.prisma.ticket.upsert({ 
-      where: { bookingId }, 
-      update: { qrPayload, barcodePayload }, 
-      create: { bookingId, bookingRef: booking.bookingRef, qrPayload, barcodePayload } 
+    
+    const ticket = await this.prisma.ticket.upsert({
+      where: { bookingId },
+      update: { qrPayload, barcodePayload },
+      create: { bookingId, bookingRef: booking.bookingRef, qrPayload, barcodePayload },
     });
+
+    // Update all booked seats from HELD to BOOKED and create permanent seat blocks
+    const seatIds = booking.seats.map(bs => bs.seatId);
+    for (const seatId of seatIds) {
+      // Update seat status to BOOKED
+      await this.prisma.seat.update({
+        where: { id: seatId },
+        data: { status: 'BOOKED' },
+      });
+      // Create permanent seat blocks for all booked seats
+      await this.prisma.seatBlock.create({
+        data: {
+          seatId,
+          reason: `Permanently booked in ticket ${ticket.id}`,
+          blockedBy: 'SYSTEM',
+          approvedBy: 'SYSTEM',
+        }
+      }).catch(() => null); // Ignore if already exists
+    }
+    
+    return ticket;
+  }
+
+  async updateSeats(bookingId: string, newSeatIds: string[]) {
+    const booking = await this.prisma.booking.findUnique({
+      where: { id: bookingId },
+      include: { seats: true, ticket: true },
+    });
+    if (!booking) throw new NotFoundException(`Booking ${bookingId} not found`);
+    if (!booking.ticket) throw new BadRequestException('No ticket found for this booking');
+
+    // Remove old seat blocks
+    const oldSeatIds = booking.seats.map(bs => bs.seatId);
+    for (const seatId of oldSeatIds) {
+      await this.prisma.seatBlock.deleteMany({
+        where: { 
+          seatId,
+          reason: { contains: booking.ticket.id }
+        }
+      });
+    }
+
+    // Remove old booking seats
+    await this.prisma.bookingSeat.deleteMany({ where: { bookingId } });
+
+    // Create new seat blocks
+    for (const seatId of newSeatIds) {
+      await this.prisma.seatBlock.create({
+        data: {
+          seatId,
+          reason: `Permanently booked in ticket ${booking.ticket.id}`,
+          blockedBy: 'SYSTEM',
+          approvedBy: 'SYSTEM',
+        }
+      }).catch(() => null);
+    }
+
+    // Create new booking seats (placeholder with minimal data)
+    for (let i = 0; i < newSeatIds.length; i++) {
+      await this.prisma.bookingSeat.create({
+        data: {
+          bookingId,
+          seatId: newSeatIds[i],
+          passengerName: `Passenger ${i + 1}`,
+        }
+      });
+    }
+
+    return { success: true, updatedSeats: newSeatIds.length };
   }
 
   async getByRef(bookingRef: string) {
@@ -83,7 +168,7 @@ export class TicketsService {
       id: booking.ticket.id, bookingId: booking.id, bookingRef: booking.bookingRef, status: booking.status,
       fromStationName: booking.schedule.originStation.name, toStationName: booking.schedule.destinationStation.name,
       departureAt: booking.schedule.departureAt, trainName: booking.schedule.train.name,
-      coachLabel: seat?.seat.coach.label, seatLabel: seat?.seat.label, passengerName: seat?.passengerName,
+      coachLabel: seat?.seat.coach.number, seatLabel: seat?.seat.seatNumber, passengerName: seat?.passengerName,
       priceMinor: booking.totalMinor, currency: booking.currency, qrPayload: booking.ticket.qrPayload,
       barcodePayload: booking.ticket.barcodePayload
     };
@@ -128,8 +213,8 @@ export class TicketsService {
       bookingRef: b.bookingRef,
       ticketId: b.ticket?.id,
       passengerName: b.seats[0]?.passengerName,
-      seatLabel: b.seats[0]?.seat.label,
-      coachLabel: b.seats[0]?.seat.coach.label,
+      seatLabel: b.seats[0]?.seat.seatNumber,
+      coachLabel: b.seats[0]?.seat.coach.number,
       qrPayload: b.ticket?.qrPayload,
       status: b.status,
       validatedAt: b.ticket?.validatedAt,
@@ -197,6 +282,14 @@ export class TicketsService {
     if (!ticket) throw new NotFoundException('Ticket not found');
     
     await this.prisma.gateValidationLog.deleteMany({ where: { ticketId: id } });
+    
+    // Remove seat blocks associated with this ticket
+    await this.prisma.seatBlock.deleteMany({
+      where: { 
+        reason: { contains: id }
+      }
+    });
+    
     await this.prisma.ticket.delete({ where: { id } });
     
     return { deleted: true, ticketId: id };
diff --git a/apps/edr-passenger-web/backoffice/next.config.js b/apps/edr-passenger-web/backoffice/next.config.js
index a286d1a26..5690be409 100644
--- a/apps/edr-passenger-web/backoffice/next.config.js
+++ b/apps/edr-passenger-web/backoffice/next.config.js
@@ -1,13 +1,12 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  output: 'export',
   reactStrictMode: true,
   transpilePackages: ['@edr/types', '@edr/ui-common'],
   env: {
     NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4000',
   },
   images: {
-    unoptimized: true, // Required for static export
+    unoptimized: true,
   },
 };
 
diff --git a/apps/edr-passenger-web/backoffice/package.json b/apps/edr-passenger-web/backoffice/package.json
index a86c23f51..654e19ef9 100644
--- a/apps/edr-passenger-web/backoffice/package.json
+++ b/apps/edr-passenger-web/backoffice/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "next dev -p 5184",
     "build": "next build",
-    "start": "next start -p 5184",
+    "start": "next start",
     "lint": "next lint",
     "type-check": "tsc --noEmit"
   },
diff --git a/apps/edr-passenger-web/backoffice/src/app/seat-classes/layout.tsx b/apps/edr-passenger-web/backoffice/src/app/classes/layout.tsx
similarity index 100%
rename from apps/edr-passenger-web/backoffice/src/app/seat-classes/layout.tsx
rename to apps/edr-passenger-web/backoffice/src/app/classes/layout.tsx
diff --git a/apps/edr-passenger-web/backoffice/src/app/classes/page.tsx b/apps/edr-passenger-web/backoffice/src/app/classes/page.tsx
new file mode 100644
index 000000000..5939ab882
--- /dev/null
+++ b/apps/edr-passenger-web/backoffice/src/app/classes/page.tsx
@@ -0,0 +1,331 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { Plus, Edit, Trash2, Search } from 'lucide-react';
+import DataTable from '@/components/ui/DataTable';
+import Badge from '@/components/ui/Badge';
+import ActionButton from '@/components/ui/ActionButton';
+import Modal from '@/components/ui/Modal';
+import ConfirmDialog from '@/components/ui/ConfirmDialog';
+import { seatClassesApi, apiClient } from '@/lib/api';
+import { formatCurrency } from '@/lib/utils';
+
+export default function ClassesPage() {
+  const [filters, setFilters] = useState({ search: '' });
+  const [showModal, setShowModal] = useState(false);
+  const [editingClass, setEditingClass] = useState<any>(null);
+  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; class: any | null }>({ isOpen: false, class: null });
+  const [selectedCoachTypeId, setSelectedCoachTypeId] = useState<string>('');
+  const queryClient = useQueryClient();
+
+  const { data, isLoading } = useQuery({
+    queryKey: ['classes', filters],
+    queryFn: () => seatClassesApi.getAll(),
+  });
+
+  const { data: coachTypes } = useQuery<any>({
+    queryKey: ['coach-types'],
+    queryFn: () => apiClient.get('/fleet/coach-types'),
+  });
+
+  useEffect(() => {
+    if (showModal && editingClass) {
+      setSelectedCoachTypeId(editingClass.coachTypeId || '');
+    }
+  }, [showModal, editingClass]);
+
+  const createMutation = useMutation({
+    mutationFn: seatClassesApi.create,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['classes'] });
+      setShowModal(false);
+      setEditingClass(null);
+      setSelectedCoachTypeId('');
+    },
+  });
+
+  const updateMutation = useMutation({
+    mutationFn: ({ id, data }: { id: string; data: any }) => seatClassesApi.update(id, data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['classes'] });
+      setShowModal(false);
+      setEditingClass(null);
+      setSelectedCoachTypeId('');
+    },
+  });
+
+  const deleteMutation = useMutation({
+    mutationFn: seatClassesApi.delete,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['classes'] });
+    },
+  });
+
+  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    
+    if (!selectedCoachTypeId) {
+      alert('Please select a coach type');
+      return;
+    }
+    
+    const formData = new FormData(e.currentTarget);
+    const classData = {
+      coachTypeId: selectedCoachTypeId,
+      name: formData.get('name') as string,
+      description: formData.get('description') as string,
+      baseFareMinor: parseInt(formData.get('baseFareMinor') as string) || 0,
+      isActive: formData.get('isActive') === 'true',
+    };
+
+    if (editingClass) {
+      await updateMutation.mutateAsync({ id: editingClass.id, data: classData });
+    } else {
+      await createMutation.mutateAsync(classData);
+    }
+  };
+
+  const handleDelete = (cls: any) => {
+    setDeleteConfirm({ isOpen: true, class: cls });
+  };
+
+  const confirmDelete = async () => {
+    if (deleteConfirm.class) {
+      await deleteMutation.mutateAsync(deleteConfirm.class.id);
+      setDeleteConfirm({ isOpen: false, class: null });
+    }
+  };
+
+  const coachTypesArray = Array.isArray(coachTypes) ? coachTypes : ((coachTypes as any)?.data || (coachTypes as any)?.items || []);
+  const coachTypeMap = coachTypesArray.reduce((map: any, ct: any) => {
+    map[ct.id] = ct.name;
+    return map;
+  }, {});
+
+  const filteredClasses = (data as any)?.items || (Array.isArray(data) ? data : []);
+  const displayedClasses = filteredClasses.filter((cls: any) => {
+    if (!filters.search) return true;
+    const searchLower = filters.search.toLowerCase();
+    return (
+      cls.name?.toLowerCase().includes(searchLower) ||
+      cls.coachType?.name?.toLowerCase().includes(searchLower) ||
+      cls.description?.toLowerCase().includes(searchLower)
+    );
+  });
+
+  const columns = [
+    {
+      key: 'coachType',
+      label: 'Coach Type',
+      render: (cls: any) => (
+        <span className="text-sm">{cls.coachType?.name || coachTypeMap[cls.coachTypeId] || 'N/A'}</span>
+      ),
+    },
+    {
+      key: 'name',
+      label: 'Class Name',
+      render: (cls: any) => <span className="font-medium">{cls.name}</span>,
+    },
+    {
+      key: 'description',
+      label: 'Description',
+      render: (cls: any) => (
+        <span className="text-sm text-muted-foreground">{cls.description || '-'}</span>
+      ),
+    },
+    {
+      key: 'baseFareMinor',
+      label: 'Base Fare (ETB)',
+      render: (cls: any) => (
+        <span className="font-mono text-sm">{formatCurrency(cls.baseFareMinor, 'ETB')}</span>
+      ),
+    },
+    {
+      key: 'isActive',
+      label: 'Status',
+      render: (cls: any) => (
+        <Badge variant="status" status={cls.isActive ? 'CONFIRMED' : 'CANCELLED'}>
+          {cls.isActive ? 'Active' : 'Inactive'}
+        </Badge>
+      ),
+    },
+  ];
+
+  const handleOpenModal = (cls?: any) => {
+    if (cls) {
+      setEditingClass(cls);
+    } else {
+      setEditingClass(null);
+    }
+    setShowModal(true);
+  };
+
+  const actions = [
+    {
+      label: 'Edit',
+      onClick: (cls: any) => handleOpenModal(cls),
+      variant: 'secondary' as const,
+      icon: Edit,
+    },
+    {
+      label: 'Delete',
+      onClick: handleDelete,
+      variant: 'danger' as const,
+      icon: Trash2,
+    },
+  ];
+
+  return (
+    <div className="space-y-6">
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Classes</h1>
+          <p className="text-muted-foreground">Manage class configurations by coach type</p>
+        </div>
+        <ActionButton
+          icon={Plus}
+          onClick={() => handleOpenModal()}
+        >
+          Add Class
+        </ActionButton>
+      </div>
+
+      <div className="card">
+        <div className="relative mb-6">
+          <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+          <input
+            type="text"
+            placeholder="Search by name, coach type, or description..."
+            className="input pl-10 w-full"
+            value={filters.search}
+            onChange={(e) => setFilters({ ...filters, search: e.target.value })}
+          />
+        </div>
+      </div>
+
+      <DataTable
+        data={displayedClasses}
+        columns={columns}
+        actions={actions}
+        loading={isLoading}
+        emptyMessage={filters.search ? "No classes match your search" : "No classes found"}
+      />
+
+      {/* Delete Confirmation */}
+      <ConfirmDialog
+        isOpen={deleteConfirm.isOpen}
+        onClose={() => setDeleteConfirm({ isOpen: false, class: null })}
+        onConfirm={confirmDelete}
+        title="Delete Class"
+        message={`Are you sure you want to delete ${deleteConfirm.class?.name}?`}
+        confirmText="Delete"
+        isDanger={true}
+        warning="This class may be used by coaches and fare rules. Deleting it may impact seat assignments and pricing."
+      />
+
+      {/* Add/Edit Modal */}
+      <Modal
+        isOpen={showModal}
+        onClose={() => {
+          setShowModal(false);
+          setEditingClass(null);
+          setSelectedCoachTypeId('');
+        }}
+        title={`${editingClass ? 'Edit' : 'Add'} Class`}
+        size="lg"
+      >
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div className="grid grid-cols-1 gap-4">
+            <div>
+              <label className="label">Coach Type *</label>
+              <select
+                name="coachTypeId"
+                className="input"
+                value={selectedCoachTypeId}
+                onChange={(e) => setSelectedCoachTypeId(e.target.value)}
+                required
+              >
+                <option value="">Select Coach Type</option>
+                {coachTypesArray.map((ct: any) => (
+                  <option key={ct.id} value={ct.id}>
+                    {ct.code} - {ct.name}
+                  </option>
+                ))}
+              </select>
+            </div>
+
+            <div>
+              <label className="label">Class Name *</label>
+              <input
+                type="text"
+                name="name"
+                className="input"
+                defaultValue={editingClass?.name || ''}
+                required
+                placeholder="e.g., Economy Regular"
+              />
+            </div>
+
+            <div>
+              <label className="label">Description</label>
+              <textarea
+                name="description"
+                className="input"
+                rows={3}
+                defaultValue={editingClass?.description || ''}
+                placeholder="Describe this class..."
+              />
+            </div>
+
+            <div>
+              <label className="label">Base Fare (ETB cents) *</label>
+              <input
+                type="number"
+                name="baseFareMinor"
+                className="input"
+                defaultValue={editingClass?.baseFareMinor || ''}
+                required
+                min="0"
+                placeholder="e.g., 45000 (450 ETB)"
+              />
+              <p className="text-xs text-muted-foreground mt-1">Enter amount in cents (100 cents = 1 ETB)</p>
+            </div>
+
+            <div>
+              <label className="label">Status</label>
+              <select
+                name="isActive"
+                className="input"
+                defaultValue={editingClass?.isActive !== undefined ? editingClass.isActive.toString() : 'true'}
+              >
+                <option value="true">Active</option>
+                <option value="false">Inactive</option>
+              </select>
+            </div>
+          </div>
+
+          <div className="flex justify-end gap-2 pt-4">
+            <ActionButton
+              type="button"
+              variant="secondary"
+              onClick={() => {
+                setShowModal(false);
+                setEditingClass(null);
+                setSelectedCoachTypeId('');
+              }}
+            >
+              Cancel
+            </ActionButton>
+            <ActionButton
+              type="submit"
+              loading={createMutation.isPending || updateMutation.isPending}
+            >
+              {editingClass ? 'Update' : 'Create'} Class
+            </ActionButton>
+          </div>
+        </form>
+      </Modal>
+    </div>
+  );
+}
diff --git a/apps/edr-passenger-web/backoffice/src/app/coaches/page.tsx b/apps/edr-passenger-web/backoffice/src/app/coaches/page.tsx
index 2abe00723..91856f800 100644
--- a/apps/edr-passenger-web/backoffice/src/app/coaches/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/coaches/page.tsx
@@ -2,141 +2,251 @@
 
 import { useState } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { fleetApi } from '@/lib/api';
+import { Plus, Search, Grid3x3, Edit, Trash2 } from 'lucide-react';
 import DataTable from '@/components/ui/DataTable';
 import ActionButton from '@/components/ui/ActionButton';
 import Modal from '@/components/ui/Modal';
 import ConfirmDialog from '@/components/ui/ConfirmDialog';
-import { Plus, Search, Grid3x3, Train, Edit, Trash2 } from 'lucide-react';
+import { fleetApi, apiClient } from '@/lib/api';
+
+type Tab = 'types' | 'coaches';
 
 export default function CoachesPage() {
+  const [activeTab, setActiveTab] = useState<Tab>('coaches');
   const [search, setSearch] = useState('');
   const [showModal, setShowModal] = useState(false);
-  const [editingCoach, setEditingCoach] = useState<any>(null);
-  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; coach: any | null }>({ isOpen: false, coach: null });
+  const [editingItem, setEditingItem] = useState<any>(null);
+  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; item: any | null }>({ isOpen: false, item: null });
   const queryClient = useQueryClient();
 
-  const { data, isLoading } = useQuery({
-    queryKey: ['coaches', search],
-    queryFn: () => fleetApi.getCoaches({ search }),
+  // Coach Types Queries
+  const { data: coachTypesData, isLoading: typesLoading } = useQuery({
+    queryKey: ['coach-types'],
+    queryFn: () => apiClient.get('/fleet/coach-types'),
   });
 
-  const createMutation = useMutation({
+  // Coaches Queries
+  const { data: coachesData, isLoading: coachesLoading } = useQuery({
+    queryKey: ['coaches'],
+    queryFn: () => fleetApi.getCoaches({}),
+  });
+
+  // Coach Type Mutations
+  const createCoachTypeMutation = useMutation({
+    mutationFn: (data: any) => apiClient.post('/fleet/coach-types', data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['coach-types'] });
+      setShowModal(false);
+      setEditingItem(null);
+    },
+  });
+
+  const updateCoachTypeMutation = useMutation({
+    mutationFn: ({ id, data }: { id: string; data: any }) => apiClient.patch(`/fleet/coach-types/${id}`, data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['coach-types'] });
+      setShowModal(false);
+      setEditingItem(null);
+    },
+  });
+
+  const deleteCoachTypeMutation = useMutation({
+    mutationFn: (id: string) => apiClient.delete(`/fleet/coach-types/${id}`),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['coach-types'] });
+    },
+  });
+
+  // Coach Mutations
+  const createCoachMutation = useMutation({
     mutationFn: fleetApi.createCoach,
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['coaches'] });
       setShowModal(false);
-      setEditingCoach(null);
+      setEditingItem(null);
     },
   });
 
-  const updateMutation = useMutation({
+  const updateCoachMutation = useMutation({
     mutationFn: ({ id, data }: { id: string; data: any }) => fleetApi.updateCoach(id, data),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['coaches'] });
       setShowModal(false);
-      setEditingCoach(null);
+      setEditingItem(null);
     },
   });
 
-  const deleteMutation = useMutation({
+  const deleteCoachMutation = useMutation({
     mutationFn: fleetApi.deleteCoach,
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['coaches'] });
     },
   });
 
-  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
+  const handleCoachTypeSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     const formData = new FormData(e.currentTarget);
-    const coachData = {
-      coachNumber: formData.get('coachNumber') as string,
-      label: formData.get('label') as string,
-      seatClassId: formData.get('seatClassId') as string,
-      coachType: formData.get('coachType') as string,
-      mode: formData.get('mode') as string,
-      seatArrangement: formData.get('seatArrangement') as string,
-      totalUnits: parseInt(formData.get('totalUnits') as string),
-      isActive: formData.get('isActive') === 'true',
+    const data = {
+      code: formData.get('code') as string,
+      name: formData.get('name') as string,
+      type: formData.get('type') as string,
     };
 
-    if (editingCoach) {
-      await updateMutation.mutateAsync({ id: editingCoach.id, data: coachData });
+    if (editingItem?.isCoachType) {
+      await updateCoachTypeMutation.mutateAsync({ id: editingItem.id, data });
     } else {
-      await createMutation.mutateAsync(coachData);
+      await createCoachTypeMutation.mutateAsync(data);
     }
   };
 
-  const handleDelete = (coach: any) => {
-    setDeleteConfirm({ isOpen: true, coach });
+  const handleCoachSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    const formData = new FormData(e.currentTarget);
+    const data = {
+      number: formData.get('number') as string,
+      coachTypeId: formData.get('coachTypeId') as string,
+      arrangement: formData.get('arrangement') as string,
+      capacity: parseInt(formData.get('capacity') as string),
+      status: formData.get('status') as string,
+    };
+
+    if (editingItem?.isCoach) {
+      await updateCoachMutation.mutateAsync({ id: editingItem.id, data });
+    } else {
+      await createCoachMutation.mutateAsync(data);
+    }
+  };
+
+  const handleDelete = (item: any, isCoachType: boolean) => {
+    setDeleteConfirm({ isOpen: true, item: { ...item, isCoachType } });
   };
 
   const confirmDelete = async () => {
-    if (deleteConfirm.coach) {
-      await deleteMutation.mutateAsync(deleteConfirm.coach.id);
-      setDeleteConfirm({ isOpen: false, coach: null });
+    if (deleteConfirm.item?.isCoachType) {
+      await deleteCoachTypeMutation.mutateAsync(deleteConfirm.item.id);
+    } else {
+      await deleteCoachMutation.mutateAsync(deleteConfirm.item.id);
     }
+    setDeleteConfirm({ isOpen: false, item: null });
   };
 
-  const coaches = data?.items || data?.data || [];
+  const coachTypesArray = Array.isArray(coachTypesData) ? coachTypesData : (coachTypesData as any)?.items || (coachTypesData as any)?.data || [];
+  const coaches = coachesData?.items || coachesData?.data || [];
 
-  const columns = [
+  const filteredCoachTypes = coachTypesArray.filter((ct: any) => {
+    if (!search) return true;
+    const searchLower = search.toLowerCase();
+    return (
+      ct.code?.toLowerCase().includes(searchLower) ||
+      ct.name?.toLowerCase().includes(searchLower) ||
+      ct.type?.toLowerCase().includes(searchLower)
+    );
+  });
+
+  const filteredCoaches = coaches.filter((coach: any) => {
+    if (!search) return true;
+    const searchLower = search.toLowerCase();
+    return (
+      coach.number?.toLowerCase().includes(searchLower) ||
+      coach.coachNumber?.toLowerCase().includes(searchLower) ||
+      coach.coachType?.name?.toLowerCase().includes(searchLower) ||
+      coach.arrangement?.toLowerCase().includes(searchLower)
+    );
+  });
+
+  const typeColorMap: Record<string, string> = {
+    passenger: 'edr-badge-info',
+    sleeper: 'edr-badge-warning',
+    dining: 'edr-badge-success',
+    baggage: 'edr-badge-danger',
+  };
+
+  const statusMap: Record<string, string> = {
+    ACTIVE: 'edr-badge-success',
+    MAINTENANCE: 'edr-badge-warning',
+    INACTIVE: 'edr-badge-danger',
+  };
+
+  // Coach Types Columns
+  const coachTypeColumns = [
     {
-      key: 'coachNumber',
-      label: 'Coach Number',
+      key: 'code',
+      label: 'Code',
+      sortable: true,
+      render: (ct: any) => (
+        <div className="flex items-center gap-2">
+          <div className="flex h-8 w-8 items-center justify-center rounded-lg bg-[rgb(20,113,76)]">
+            <Grid3x3 className="h-4 w-4 text-white" />
+          </div>
+          <span className="font-mono font-medium">{ct.code}</span>
+        </div>
+      ),
+    },
+    {
+      key: 'name',
+      label: 'Name',
+      sortable: true,
+      render: (ct: any) => <span className="font-medium">{ct.name}</span>,
+    },
+    {
+      key: 'type',
+      label: 'Type',
+      render: (ct: any) => (
+        <span className={`edr-badge ${typeColorMap[ct.type] || 'edr-badge-info'}`}>
+          {ct.type}
+        </span>
+      ),
+    },
+    {
+      key: 'coaches',
+      label: 'Coaches',
+      render: (ct: any) => (
+        <span className="text-sm font-medium">{ct.coaches?.length || 0}</span>
+      ),
+    },
+  ];
+
+  // Coaches Columns
+  const coachColumns = [
+    {
+      key: 'number',
+      label: 'Number',
       sortable: true,
       render: (coach: any) => (
         <div className="flex items-center gap-2">
           <div className="flex h-8 w-8 items-center justify-center rounded-lg bg-[rgb(20,113,76)]">
             <Grid3x3 className="h-4 w-4 text-white" />
           </div>
-          <span className="font-medium">{coach.coachNumber}</span>
+          <span className="font-medium">{coach.number || coach.coachNumber}</span>
         </div>
       ),
     },
     {
-      key: 'seatClass',
-      label: 'Seat Class',
-      render: (coach: any) => {
-        const seatClass = coach.seatClass?.name || coach.serviceClass || 'N/A';
-        const colorMap: Record<string, string> = {
-          'ECONOMY_REGULAR': 'edr-badge-info',
-          'ECONOMY_BED': 'edr-badge-warning',
-          'VIP_BED': 'edr-badge-success',
-        };
-        return (
-          <span className={`edr-badge ${colorMap[seatClass] || 'edr-badge-info'}`}>
-            {seatClass.replace(/_/g, ' ')}
-          </span>
-        );
-      },
-    },
-    {
-      key: 'totalSeats',
-      label: 'Total Seats',
+      key: 'coachType',
+      label: 'Coach Type',
       render: (coach: any) => (
-        <span className="font-mono text-sm">{coach.totalSeats || coach.totalUnits || 0}</span>
+        <span className="text-sm">{coach.coachType?.name || 'N/A'}</span>
       ),
     },
     {
-      key: 'layout',
-      label: 'Layout',
+      key: 'arrangement',
+      label: 'Arrangement',
       render: (coach: any) => (
-        <span className="text-sm text-muted-foreground">
-          {coach.layout || coach.seatLayout || coach.seatArrangement || 'N/A'}
-        </span>
+        <span className="text-sm font-mono">{coach.arrangement || 'N/A'}</span>
+      ),
+    },
+    {
+      key: 'capacity',
+      label: 'Capacity',
+      render: (coach: any) => (
+        <span className="font-mono text-sm font-medium">{coach.capacity || 0}</span>
       ),
     },
     {
       key: 'status',
       label: 'Status',
       render: (coach: any) => {
-        const status = coach.isActive ? 'ACTIVE' : 'INACTIVE';
-        const statusMap: Record<string, string> = {
-          ACTIVE: 'edr-badge-success',
-          MAINTENANCE: 'edr-badge-warning',
-          INACTIVE: 'edr-badge-danger',
-        };
+        const status = coach.status || 'ACTIVE';
         return (
           <span className={`edr-badge ${statusMap[status] || 'edr-badge-info'}`}>
             {status}
@@ -146,11 +256,11 @@ export default function CoachesPage() {
     },
   ];
 
-  const actions = [
+  const coachTypeActions = [
     {
       label: 'Edit',
-      onClick: (coach: any) => {
-        setEditingCoach(coach);
+      onClick: (item: any) => {
+        setEditingItem({ ...item, isCoachType: true });
         setShowModal(true);
       },
       variant: 'secondary' as const,
@@ -158,7 +268,25 @@ export default function CoachesPage() {
     },
     {
       label: 'Delete',
-      onClick: handleDelete,
+      onClick: (item: any) => handleDelete(item, true),
+      variant: 'danger' as const,
+      icon: Trash2,
+    },
+  ];
+
+  const coachActions = [
+    {
+      label: 'Edit',
+      onClick: (item: any) => {
+        setEditingItem({ ...item, isCoach: true });
+        setShowModal(true);
+      },
+      variant: 'secondary' as const,
+      icon: Edit,
+    },
+    {
+      label: 'Delete',
+      onClick: (item: any) => handleDelete(item, false),
       variant: 'danger' as const,
       icon: Trash2,
     },
@@ -169,51 +297,112 @@ export default function CoachesPage() {
       <div className="flex items-center justify-between">
         <div>
           <h1 className="text-3xl font-bold text-foreground">Coach Management</h1>
-          <p className="text-muted-foreground mt-1">Manage train coaches and configurations</p>
+          <p className="text-muted-foreground mt-1">Manage coach types and train coaches</p>
         </div>
         <ActionButton
           icon={Plus}
           onClick={() => {
-            setEditingCoach(null);
+            setEditingItem(null);
+            setSearch('');
             setShowModal(true);
           }}
         >
-          Add Coach
+          {activeTab === 'types' ? 'Add Coach Type' : 'Add Coach'}
         </ActionButton>
       </div>
 
+      {/* Tabs */}
       <div className="card">
-        <div className="flex items-center gap-4 mb-6">
-          <div className="relative flex-1">
-            <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
-            <input
-              type="text"
-              placeholder="Search coaches..."
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-              className="input pl-10"
-            />
-          </div>
+        <div className="flex border-b border-border">
+          <button
+            onClick={() => {
+              setActiveTab('types');
+              setSearch('');
+            }}
+            className={`px-4 py-3 font-medium transition-colors ${
+              activeTab === 'types'
+                ? 'border-b-2 border-primary text-primary'
+                : 'text-muted-foreground hover:text-foreground'
+            }`}
+          >
+            Coach Types
+          </button>
+          <button
+            onClick={() => {
+              setActiveTab('coaches');
+              setSearch('');
+            }}
+            className={`px-4 py-3 font-medium transition-colors ${
+              activeTab === 'coaches'
+                ? 'border-b-2 border-primary text-primary'
+                : 'text-muted-foreground hover:text-foreground'
+            }`}
+          >
+            Coaches
+          </button>
         </div>
 
-        <DataTable
-          columns={columns}
-          data={coaches}
-          actions={actions}
-          loading={isLoading}
-        />
+        {/* Coach Types Tab */}
+        {activeTab === 'types' && (
+          <div className="pt-6 space-y-4">
+            <div className="relative">
+              <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+              <input
+                type="text"
+                placeholder="Search by code, name, or type..."
+                value={search}
+                onChange={(e) => setSearch(e.target.value)}
+                className="input pl-10 w-full"
+              />
+            </div>
+            <DataTable
+              columns={coachTypeColumns}
+              data={filteredCoachTypes}
+              actions={coachTypeActions}
+              loading={typesLoading}
+              emptyMessage={search ? "No coach types match your search" : "No coach types found. Create one to get started."}
+            />
+          </div>
+        )}
+
+        {/* Coaches Tab */}
+        {activeTab === 'coaches' && (
+          <div className="pt-6 space-y-4">
+            <div className="relative">
+              <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+              <input
+                type="text"
+                placeholder="Search by coach number, type, or arrangement..."
+                value={search}
+                onChange={(e) => setSearch(e.target.value)}
+                className="input pl-10 w-full"
+              />
+            </div>
+            <DataTable
+              columns={coachColumns}
+              data={filteredCoaches}
+              actions={coachActions}
+              loading={coachesLoading}
+              emptyMessage={search ? "No coaches match your search" : "No coaches found. Create one to get started."}
+            />
+          </div>
+        )}
       </div>
 
       {/* Delete Confirmation */}
       <ConfirmDialog
         isOpen={deleteConfirm.isOpen}
-        onClose={() => setDeleteConfirm({ isOpen: false, coach: null })}
+        onClose={() => setDeleteConfirm({ isOpen: false, item: null })}
         onConfirm={confirmDelete}
-        title="Delete Coach"
-        message={`Are you sure you want to delete coach ${deleteConfirm.coach?.coachNumber}?`}
+        title={`Delete ${deleteConfirm.item?.isCoachType ? 'Coach Type' : 'Coach'}`}
+        message={`Are you sure you want to delete ${deleteConfirm.item?.name || deleteConfirm.item?.number}?`}
         confirmText="Delete"
         isDanger={true}
-        warning="This coach may be assigned to schedules and trips. Deleting it may impact these systems."
+        warning={
+          deleteConfirm.item?.isCoachType
+            ? 'This coach type may have coaches assigned. Deleting it may impact these systems.'
+            : 'This coach may be assigned to schedules. Deleting it may impact these systems.'
+        }
       />
 
       {/* Add/Edit Modal */}
@@ -221,106 +410,170 @@ export default function CoachesPage() {
         isOpen={showModal}
         onClose={() => {
           setShowModal(false);
-          setEditingCoach(null);
+          setEditingItem(null);
         }}
-        title={`${editingCoach ? 'Edit' : 'Add'} Coach`}
-        size="lg"
+        title={
+          activeTab === 'types'
+            ? `${editingItem?.isCoachType ? 'Edit' : 'Add'} Coach Type`
+            : `${editingItem?.isCoach ? 'Edit' : 'Add'} Coach`
+        }
+        size={activeTab === 'types' ? 'md' : 'lg'}
       >
-        <form onSubmit={handleSubmit} className="space-y-4">
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <div>
-              <label className="label">Coach Number *</label>
-              <input
-                type="text"
-                name="coachNumber"
-                className="input"
-                defaultValue={editingCoach?.coachNumber}
-                required
-                placeholder="e.g., C001"
-              />
+        {/* Coach Type Form */}
+        {activeTab === 'types' && (
+          <form onSubmit={handleCoachTypeSubmit} className="space-y-4">
+            <div className="grid grid-cols-1 gap-4">
+              <div>
+                <label className="label">Code</label>
+                <input
+                  type="text"
+                  name="code"
+                  className="input"
+                  defaultValue={editingItem?.code || ''}
+                  required
+                  placeholder="e.g., HSC"
+                />
+              </div>
+
+              <div>
+                <label className="label">Name</label>
+                <input
+                  type="text"
+                  name="name"
+                  className="input"
+                  defaultValue={editingItem?.name || ''}
+                  required
+                  placeholder="e.g., Hard Seat Coach"
+                />
+              </div>
+
+              <div>
+                <label className="label">Type</label>
+                <input
+                  type="text"
+                  name="type"
+                  className="input"
+                  defaultValue={editingItem?.type || ''}
+                  required
+                  placeholder="e.g., Regular Seat"
+                />
+              </div>
             </div>
-            <div>
-              <label className="label">Label *</label>
-              <input
-                type="text"
-                name="label"
-                className="input"
-                defaultValue={editingCoach?.label}
-                required
-                placeholder="e.g., Coach 1"
-              />
-            </div>
-            <div>
-              <label className="label">Coach Type</label>
-              <select name="coachType" className="input" defaultValue={editingCoach?.coachType}>
-                <option value="passenger">Passenger</option>
-                <option value="sleeper">Sleeper</option>
-                <option value="dining">Dining</option>
-                <option value="baggage">Baggage</option>
-              </select>
-            </div>
-            <div>
-              <label className="label">Mode *</label>
-              <select name="mode" className="input" defaultValue={editingCoach?.mode || 'seat'}>
-                <option value="seat">Seat</option>
-                <option value="bed">Bed</option>
-                <option value="convertible">Convertible</option>
-              </select>
-            </div>
-            <div>
-              <label className="label">Seat Arrangement</label>
-              <input
-                type="text"
-                name="seatArrangement"
-                className="input"
-                defaultValue={editingCoach?.seatArrangement}
-                placeholder="e.g., 2+2"
-              />
-            </div>
-            <div>
-              <label className="label">Total Units *</label>
-              <input
-                type="number"
-                name="totalUnits"
-                className="input"
-                defaultValue={editingCoach?.totalUnits}
-                required
-                min="1"
-                placeholder="60"
-              />
-            </div>
-            <div>
-              <label className="label">Status</label>
-              <select
-                name="isActive"
-                className="input"
-                defaultValue={editingCoach?.isActive?.toString() || 'true'}
+
+            <div className="flex justify-end gap-2 pt-4">
+              <ActionButton
+                type="button"
+                variant="secondary"
+                onClick={() => {
+                  setShowModal(false);
+                  setEditingItem(null);
+                }}
               >
-                <option value="true">Active</option>
-                <option value="false">Inactive</option>
-              </select>
+                Cancel
+              </ActionButton>
+              <ActionButton
+                type="submit"
+                loading={createCoachTypeMutation.isPending || updateCoachTypeMutation.isPending}
+              >
+                {editingItem?.isCoachType ? 'Update' : 'Create'} Coach Type
+              </ActionButton>
             </div>
-          </div>
-          
-          <div className="flex justify-end gap-2 pt-4">
-            <ActionButton
-              type="button"
-              variant="secondary"
-              onClick={() => {
-                setShowModal(false);
-                setEditingCoach(null);
-              }}
-            >
-              Cancel
-            </ActionButton>
-            <ActionButton
-              type="submit"
-              loading={createMutation.isPending || updateMutation.isPending}
-            >
-              {editingCoach ? 'Update' : 'Create'} Coach
-            </ActionButton>
-          </div>
-        </form>
+          </form>
+        )}
+
+        {/* Coach Form */}
+        {activeTab === 'coaches' && (
+          <form onSubmit={handleCoachSubmit} className="space-y-4">
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+              <div>
+                <label className="label">Coach Type</label>
+                <select
+                  name="coachTypeId"
+                  className="input"
+                  defaultValue={editingItem?.coachTypeId || ''}
+                  required
+                >
+                  <option value="">Select Coach Type</option>
+                  {coachTypesArray.map((ct: any) => (
+                    <option key={ct.id} value={ct.id}>
+                      {ct.code} - {ct.name} - {ct.type}
+                    </option>
+                  ))}
+                </select>
+              </div>
+
+              <div>
+                <label className="label">Number</label>
+                <input
+                  type="text"
+                  name="number"
+                  className="input"
+                  defaultValue={editingItem?.number || editingItem?.coachNumber || ''}
+                  required
+                  placeholder="e.g., HSC-0001"
+                />
+              </div>
+
+              <div>
+                <label className="label">Arrangement</label>
+                <input
+                  type="text"
+                  name="arrangement"
+                  className="input"
+                  defaultValue={editingItem?.arrangement || editingItem?.seatArrangement || '2+2'}
+                  required
+                  placeholder="e.g., 2+2, 3+2"
+                />
+                <p className="text-xs text-muted-foreground mt-1">Format: separate columns with +</p>
+              </div>
+
+              <div>
+                <label className="label">Capacity</label>
+                <input
+                  type="number"
+                  name="capacity"
+                  className="input"
+                  defaultValue={editingItem?.capacity || editingItem?.totalUnits || ''}
+                  required
+                  min="1"
+                  placeholder="60"
+                />
+              </div>
+
+              <div className="md:col-span-2">
+                <label className="label">Status</label>
+                <select
+                  name="status"
+                  className="input"
+                  defaultValue={editingItem?.status || 'ACTIVE'}
+                >
+                  <option value="ACTIVE">Active</option>
+                  <option value="MAINTENANCE">Maintenance</option>
+                  <option value="INACTIVE">Inactive</option>
+                </select>
+              </div>
+            </div>
+
+            <div className="flex justify-end gap-2 pt-4">
+              <ActionButton
+                type="button"
+                variant="secondary"
+                onClick={() => {
+                  setShowModal(false);
+                  setEditingItem(null);
+                }}
+              >
+                Cancel
+              </ActionButton>
+              <ActionButton
+                type="submit"
+                loading={createCoachMutation.isPending || updateCoachMutation.isPending}
+              >
+                {editingItem?.isCoach ? 'Update' : 'Create'} Coach
+              </ActionButton>
+            </div>
+          </form>
+        )}
       </Modal>
     </div>
   );
diff --git a/apps/edr-passenger-web/backoffice/src/app/login/page.tsx b/apps/edr-passenger-web/backoffice/src/app/login/page.tsx
index a837b281d..4a6138f5a 100644
--- a/apps/edr-passenger-web/backoffice/src/app/login/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/login/page.tsx
@@ -6,8 +6,8 @@ import { useAuthStore } from '@/lib/auth-store';
 import { Train } from 'lucide-react';
 
 export default function LoginPage() {
-  const [email, setEmail] = useState('admin@edr-platform.com');
-  const [password, setPassword] = useState('admin123');
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState('');
   const router = useRouter();
diff --git a/apps/edr-passenger-web/backoffice/src/app/passengers/page.tsx b/apps/edr-passenger-web/backoffice/src/app/passengers/page.tsx
index 2f47cdb7a..36db98a34 100644
--- a/apps/edr-passenger-web/backoffice/src/app/passengers/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/passengers/page.tsx
@@ -18,6 +18,7 @@ export default function PassengersPage() {
     page: 1,
     pageSize: 20,
     search: '',
+    role: 'PASSENGER',
   });
   const [selectedPassenger, setSelectedPassenger] = useState<any>(null);
   const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; passenger: any | null }>({ isOpen: false, passenger: null });
diff --git a/apps/edr-passenger-web/backoffice/src/app/pricing/layout.tsx b/apps/edr-passenger-web/backoffice/src/app/pricing/layout.tsx
index 9a5bb12de..af7695ada 100644
--- a/apps/edr-passenger-web/backoffice/src/app/pricing/layout.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/pricing/layout.tsx
@@ -1,5 +1,54 @@
-import DashboardLayout from '../dashboard/layout';
+'use client';
+
+import { useEffect, useState } from 'react';
+import { useRouter } from 'next/navigation';
+import Sidebar from '@/components/layout/Sidebar';
+import Header from '@/components/layout/Header';
+import { useAuthStore } from '@/lib/auth-store';
 
 export default function PricingLayout({ children }: { children: React.ReactNode }) {
-  return <DashboardLayout>{children}</DashboardLayout>;
+  const router = useRouter();
+  const { isAuthenticated } = useAuthStore();
+  const [isLoading, setIsLoading] = useState(true);
+
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setIsLoading(false);
+    }, 100);
+    
+    return () => clearTimeout(timer);
+  }, []);
+
+  useEffect(() => {
+    if (!isLoading && !isAuthenticated) {
+      router.push('/login');
+    }
+  }, [isAuthenticated, router, isLoading]);
+
+  if (isLoading) {
+    return (
+      <div className="flex h-screen items-center justify-center bg-gray-50 dark:bg-slate-950">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-edr-green-600 mx-auto"></div>
+          <p className="mt-4 text-gray-600 dark:text-gray-400">Loading...</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (!isAuthenticated) {
+    return null;
+  }
+
+  return (
+    <div className="flex h-screen overflow-hidden bg-gray-50 dark:bg-slate-950">
+      <Sidebar />
+      <div className="flex flex-1 flex-col overflow-hidden">
+        <Header />
+        <main className="flex-1 overflow-y-auto bg-gray-50 dark:bg-slate-950 p-6">
+          {children}
+        </main>
+      </div>
+    </div>
+  );
 }
diff --git a/apps/edr-passenger-web/backoffice/src/app/pricing/page.tsx b/apps/edr-passenger-web/backoffice/src/app/pricing/page.tsx
index 36937946f..b27f559f8 100644
--- a/apps/edr-passenger-web/backoffice/src/app/pricing/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/pricing/page.tsx
@@ -1,93 +1,942 @@
 'use client';
 
 import { useState } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { Save } from 'lucide-react';
-import Table from '@/components/ui/Table';
-import { routesApi } from '@/lib/api/routes';
-import { formatCurrency } from '@/lib/utils';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { Plus, Trash2, Loader2, Edit } from 'lucide-react';
+import DataTable from '@/components/ui/DataTable';
+import Modal from '@/components/ui/Modal';
+import ActionButton from '@/components/ui/ActionButton';
+import ConfirmDialog from '@/components/ui/ConfirmDialog';
+import { apiClient } from '@/lib/api-client';
+
+interface Schedule {
+  id: string;
+  trainId: string;
+  departureAt: string;
+  arrivalAt: string;
+  train?: { id: string; name: string; number: string };
+  originStation?: { id: string; name: string };
+  destinationStation?: { id: string; name: string };
+}
+
+interface Route {
+  id: string;
+  code: string;
+  name: string;
+  stops?: Array<{ id: string; sequence: number; stationId: string; station?: { name: string } }>;
+}
+
+interface SeatClass {
+  id: string;
+  name: string;
+  baseFare?: number;
+  baseFareMinor?: number;
+}
 
 export default function PricingPage() {
-  const [selectedRoute, setSelectedRoute] = useState<string>('1');
-
-  const { data: fareRules } = useQuery({
-    queryKey: ['fare-rules', selectedRoute],
-    queryFn: () => routesApi.getFareRules(selectedRoute),
-    initialData: [
-      { id: '1', routeId: '1', passengerCategory: 'ADULT', serviceClass: 'ECONOMY_REGULAR', baseFare: 35000, currency: 'ETB' },
-      { id: '2', routeId: '1', passengerCategory: 'CHILD', serviceClass: 'ECONOMY_REGULAR', baseFare: 0, currency: 'ETB' },
-      { id: '3', routeId: '1', passengerCategory: 'ADULT', serviceClass: 'ECONOMY_BED', baseFare: 52500, currency: 'ETB' },
-      { id: '4', routeId: '1', passengerCategory: 'ADULT', serviceClass: 'VIP_BED', baseFare: 70000, currency: 'ETB' },
-    ],
+  const [tab, setTab] = useState<'schedule' | 'segment'>('schedule');
+  const [showModal, setShowModal] = useState(false);
+  const [selectedSchedule, setSelectedSchedule] = useState<string>('');
+  const [selectedRoute, setSelectedRoute] = useState<string>('');
+  const [editingFare, setEditingFare] = useState<any>(null);
+  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; id: string | null }>({
+    isOpen: false,
+    id: null,
   });
+  const [error, setError] = useState<string | null>(null);
+  const queryClient = useQueryClient();
+
+  const [fareForm, setFareForm] = useState({
+    seatClassId: '',
+    baseFare: '',
+    nationality: '',
+    route: '',
+    validFrom: new Date().toISOString().split('T')[0],
+    validUntil: '',
+  });
+
+  const [segmentForm, setSegmentForm] = useState({
+    seatClassId: '',
+    originStationId: '',
+    destinationStationId: '',
+    baseFare: '',
+    nationality: '',
+    validFrom: new Date().toISOString().split('T')[0],
+    validUntil: '',
+  });
+
+  const { data: schedules = [] } = useQuery({
+    queryKey: ['schedules'],
+    queryFn: () => apiClient.get('/schedules'),
+  });
+
+  const { data: routes = [] } = useQuery({
+    queryKey: ['routes'],
+    queryFn: () => apiClient.get('/routes'),
+  });
+
+  const { data: seatClasses = [] } = useQuery({
+    queryKey: ['seat-classes'],
+    queryFn: () => apiClient.get('/seat-classes'),
+  });
+
+  const { data: stations = [] } = useQuery({
+    queryKey: ['stations'],
+    queryFn: () => apiClient.get('/stations'),
+  });
+
+  const { data: fares = [], isLoading: faresLoading, refetch: refetchFares } = useQuery({
+    queryKey: ['schedule-fares', selectedSchedule],
+    queryFn: () => (selectedSchedule ? apiClient.get(`/schedules/${selectedSchedule}/fares/all`) : Promise.resolve([])),
+    enabled: !!selectedSchedule && tab === 'schedule',
+  });
+
+  const { data: segmentFares = [], isLoading: segmentFaresLoading, refetch: refetchSegmentFares } = useQuery({
+    queryKey: ['segment-fares', selectedRoute],
+    queryFn: () => (selectedRoute ? apiClient.get(`/schedules/routes/${selectedRoute}/segment-fares`) : Promise.resolve([])),
+    enabled: !!selectedRoute && tab === 'segment',
+  });
+
+  const createFareMutation = useMutation({
+    mutationFn: (data: any) => apiClient.post(`/schedules/fares`, data),
+    onSuccess: () => {
+      refetchFares();
+      resetForm();
+      setError(null);
+    },
+    onError: (err: any) => {
+      setError(err.response?.data?.message || 'Failed to create fare rule');
+    },
+  });
+
+  const updateFareMutation = useMutation({
+    mutationFn: (data: any) => apiClient.patch(`/schedules/fares/${data.id}`, data),
+    onSuccess: () => {
+      refetchFares();
+      setEditingFare(null);
+      resetForm();
+      setError(null);
+    },
+    onError: (err: any) => {
+      setError(err.response?.data?.message || 'Failed to update fare rule');
+    },
+  });
+
+  const deleteFareMutation = useMutation({
+    mutationFn: (id: string) => apiClient.delete(`/schedules/fares/${id}`),
+    onSuccess: () => {
+      refetchFares();
+      setDeleteConfirm({ isOpen: false, id: null });
+    },
+    onError: (err: any) => {
+      setError(err.response?.data?.message || 'Failed to delete fare rule');
+    },
+  });
+
+  const createSegmentFareMutation = useMutation({
+    mutationFn: (data: any) => apiClient.post(`/schedules/segment-fares`, data),
+    onSuccess: () => {
+      refetchSegmentFares();
+      resetSegmentForm();
+      setError(null);
+    },
+    onError: (err: any) => {
+      setError(err.response?.data?.message || 'Failed to create segment fare rule');
+    },
+  });
+
+  const updateSegmentFareMutation = useMutation({
+    mutationFn: (data: any) => apiClient.patch(`/schedules/segment-fares/${data.id}`, data),
+    onSuccess: () => {
+      refetchSegmentFares();
+      setEditingFare(null);
+      resetSegmentForm();
+      setError(null);
+    },
+    onError: (err: any) => {
+      setError(err.response?.data?.message || 'Failed to update segment fare rule');
+    },
+  });
+
+  const deleteSegmentFareMutation = useMutation({
+    mutationFn: (id: string) => apiClient.delete(`/schedules/segment-fares/${id}`),
+    onSuccess: () => {
+      refetchSegmentFares();
+      setDeleteConfirm({ isOpen: false, id: null });
+    },
+    onError: (err: any) => {
+      setError(err.response?.data?.message || 'Failed to delete segment fare rule');
+    },
+  });
+
+  const resetForm = () => {
+    setFareForm({
+      seatClassId: '',
+      baseFare: '',
+      nationality: '',
+      route: '',
+      validFrom: new Date().toISOString().split('T')[0],
+      validUntil: '',
+    });
+    setEditingFare(null);
+    setShowModal(false);
+  };
+
+  const resetSegmentForm = () => {
+    setSegmentForm({
+      seatClassId: '',
+      originStationId: '',
+      destinationStationId: '',
+      baseFare: '',
+      nationality: '',
+      validFrom: new Date().toISOString().split('T')[0],
+      validUntil: '',
+    });
+    setEditingFare(null);
+    setShowModal(false);
+  };
+
+  const handleEditFare = (fare: any) => {
+    setEditingFare(fare);
+    const fareValue = fare.baseFare || fare.baseFareMinor || 0;
+    const etbValue = fareValue > 100 ? (fareValue / 100).toString() : fareValue.toString();
+    
+    setFareForm({
+      seatClassId: fare.seatClassId || '',
+      baseFare: etbValue,
+      nationality: fare.nationality || '',
+      route: fare.route || '',
+      validFrom: fare.validFrom ? new Date(fare.validFrom).toISOString().split('T')[0] : new Date().toISOString().split('T')[0],
+      validUntil: fare.validUntil ? new Date(fare.validUntil).toISOString().split('T')[0] : '',
+    });
+    setError(null);
+    setShowModal(true);
+  };
+
+  const handleEditSegmentFare = (fare: any) => {
+    setEditingFare(fare);
+    const fareValue = fare.baseFare || fare.baseFareMinor || 0;
+    const etbValue = fareValue > 100 ? (fareValue / 100).toString() : fareValue.toString();
+    
+    const routeStops = currentRoute?.stops || [];
+    const originStop = routeStops.find((s: any) => s.sequence === fare.originStopSequence);
+    const destStop = routeStops.find((s: any) => s.sequence === fare.destinationStopSequence);
+    
+    setSegmentForm({
+      seatClassId: fare.seatClassId || '',
+      originStationId: originStop?.stationId || '',
+      destinationStationId: destStop?.stationId || '',
+      baseFare: etbValue,
+      nationality: fare.nationality || '',
+      validFrom: fare.validFrom ? new Date(fare.validFrom).toISOString().split('T')[0] : new Date().toISOString().split('T')[0],
+      validUntil: fare.validUntil ? new Date(fare.validUntil).toISOString().split('T')[0] : '',
+    });
+    setError(null);
+    setShowModal(true);
+  };
+
+  const handleSaveFare = async () => {
+    setError(null);
+    if (!fareForm.seatClassId || !fareForm.baseFare) {
+      setError('Seat class and base fare are required');
+      return;
+    }
+
+    const baseFareMinor = Math.round(parseFloat(fareForm.baseFare) * 100);
+
+    if (editingFare) {
+      await updateFareMutation.mutateAsync({
+        id: editingFare.id,
+        seatClassId: fareForm.seatClassId,
+        baseFareMinor,
+        nationality: fareForm.nationality || undefined,
+        route: fareForm.route || undefined,
+        validFrom: fareForm.validFrom,
+        validUntil: fareForm.validUntil || undefined,
+      });
+    } else {
+      await createFareMutation.mutateAsync({
+        scheduleId: selectedSchedule || undefined,
+        seatClassId: fareForm.seatClassId,
+        baseFareMinor,
+        nationality: fareForm.nationality || undefined,
+        route: fareForm.route || undefined,
+        validFrom: fareForm.validFrom,
+        validUntil: fareForm.validUntil || undefined,
+      });
+    }
+  };
+
+  const handleSaveSegmentFare = async () => {
+    setError(null);
+    if (!segmentForm.seatClassId || !segmentForm.baseFare || !segmentForm.originStationId || !segmentForm.destinationStationId) {
+      setError('Seat class, origin station, destination station, and fare are required');
+      return;
+    }
+
+    const routeStops = currentRoute?.stops || [];
+    const originStop = routeStops.find((s: any) => s.stationId === segmentForm.originStationId);
+    const destStop = routeStops.find((s: any) => s.stationId === segmentForm.destinationStationId);
+
+    if (!originStop || !destStop) {
+      setError('Selected stations must be on the route');
+      return;
+    }
+
+    if (originStop.sequence >= destStop.sequence) {
+      setError('Destination station must be after origin station');
+      return;
+    }
+
+    const baseFareMinor = Math.round(parseFloat(segmentForm.baseFare) * 100);
+
+    if (editingFare) {
+      await updateSegmentFareMutation.mutateAsync({
+        id: editingFare.id,
+        routeId: selectedRoute,
+        seatClassId: segmentForm.seatClassId,
+        originStopSequence: originStop.sequence,
+        destinationStopSequence: destStop.sequence,
+        baseFareMinor,
+        nationality: segmentForm.nationality || undefined,
+        validFrom: segmentForm.validFrom,
+        validUntil: segmentForm.validUntil || undefined,
+      });
+    } else {
+      await createSegmentFareMutation.mutateAsync({
+        routeId: selectedRoute,
+        seatClassId: segmentForm.seatClassId,
+        originStopSequence: originStop.sequence,
+        destinationStopSequence: destStop.sequence,
+        baseFareMinor,
+        nationality: segmentForm.nationality || undefined,
+        validFrom: segmentForm.validFrom,
+        validUntil: segmentForm.validUntil || undefined,
+      });
+    }
+  };
+
+  const confirmDelete = async () => {
+    if (deleteConfirm.id) {
+      if (tab === 'schedule') {
+        await deleteFareMutation.mutateAsync(deleteConfirm.id);
+      } else {
+        await deleteSegmentFareMutation.mutateAsync(deleteConfirm.id);
+      }
+    }
+  };
+
+  const schedulesArray = Array.isArray(schedules) ? schedules : (schedules as any)?.items || [];
+  const routesArray = Array.isArray(routes) ? routes : (routes as any)?.items || [];
+  const seatClassesArray = Array.isArray(seatClasses) ? seatClasses : (seatClasses as any)?.items || [];
+  const stationsArray = Array.isArray(stations) ? stations : (stations as any)?.items || [];
+  const faresArray = Array.isArray(fares) ? fares : (fares as any)?.items || [];
+  const segmentFaresArray = Array.isArray(segmentFares) ? segmentFares : (segmentFares as any)?.items || [];
+  const currentRoute = routesArray.find((r: Route) => r.id === selectedRoute);
+
+  const fareColumns = [
+    {
+      key: 'seatClass',
+      label: 'Seat Class',
+      render: (fare: any) => {
+        const className = fare.seatClass?.name || fare.seatClassName || 'N/A';
+        return <span className="font-medium">{className}</span>;
+      },
+    },
+    {
+      key: 'baseFare',
+      label: 'Fare (ETB)',
+      render: (fare: any) => {
+        const fareValue = fare.baseFare || fare.baseFareMinor;
+        if (!fareValue && fareValue !== 0) return <span>N/A</span>;
+        const etbValue = fareValue > 100 ? (fareValue / 100).toFixed(2) : parseFloat(fareValue).toFixed(2);
+        return <span className="font-mono font-medium">{etbValue} ETB</span>;
+      },
+    },
+    {
+      key: 'nationality',
+      label: 'Nationality',
+      render: (fare: any) => (
+        <span className="text-sm">{fare.nationality || 'All'}</span>
+      ),
+    },
+    {
+      key: 'route',
+      label: 'Route',
+      render: (fare: any) => (
+        <span className="text-sm font-mono">{fare.route || '-'}</span>
+      ),
+    },
+    {
+      key: 'validFrom',
+      label: 'Valid From',
+      render: (fare: any) => {
+        if (!fare.validFrom) return <span className="text-muted-foreground text-sm">Not set</span>;
+        return <span className="text-sm">{new Date(fare.validFrom).toLocaleDateString()}</span>;
+      },
+    },
+    {
+      key: 'validUntil',
+      label: 'Valid Until',
+      render: (fare: any) => {
+        if (!fare.validUntil) return <span className="text-sm text-muted-foreground">Indefinite</span>;
+        return <span className="text-sm">{new Date(fare.validUntil).toLocaleDateString()}</span>;
+      },
+    },
+  ];
+
+  const segmentFareColumns = [
+    {
+      key: 'segment',
+      label: 'Segment',
+      render: (fare: any) => {
+        const stops = currentRoute?.stops || [];
+        const originStop = stops.find((s: any) => s.sequence === fare.originStopSequence);
+        const destStop = stops.find((s: any) => s.sequence === fare.destinationStopSequence);
+        return (
+          <span className="text-sm font-medium">
+            Stop {fare.originStopSequence} → {fare.destinationStopSequence}
+          </span>
+        );
+      },
+    },
+    {
+      key: 'seatClass',
+      label: 'Seat Class',
+      render: (fare: any) => {
+        const className = fare.seatClass?.name || 'N/A';
+        return <span className="font-medium">{className}</span>;
+      },
+    },
+    {
+      key: 'baseFare',
+      label: 'Fare (ETB)',
+      render: (fare: any) => {
+        const fareValue = fare.baseFare || fare.baseFareMinor;
+        if (!fareValue && fareValue !== 0) return <span>N/A</span>;
+        const etbValue = fareValue > 100 ? (fareValue / 100).toFixed(2) : parseFloat(fareValue).toFixed(2);
+        return <span className="font-mono font-medium">{etbValue} ETB</span>;
+      },
+    },
+    {
+      key: 'nationality',
+      label: 'Nationality',
+      render: (fare: any) => (
+        <span className="text-sm">{fare.nationality || 'All'}</span>
+      ),
+    },
+    {
+      key: 'validFrom',
+      label: 'Valid From',
+      render: (fare: any) => {
+        if (!fare.validFrom) return <span className="text-muted-foreground text-sm">Not set</span>;
+        return <span className="text-sm">{new Date(fare.validFrom).toLocaleDateString()}</span>;
+      },
+    },
+    {
+      key: 'validUntil',
+      label: 'Valid Until',
+      render: (fare: any) => {
+        if (!fare.validUntil) return <span className="text-sm text-muted-foreground">Indefinite</span>;
+        return <span className="text-sm">{new Date(fare.validUntil).toLocaleDateString()}</span>;
+      },
+    },
+  ];
+
+  const fareActions = [
+    {
+      label: 'Edit',
+      onClick: tab === 'schedule' ? handleEditFare : handleEditSegmentFare,
+      variant: 'secondary' as const,
+      icon: Edit,
+    },
+    {
+      label: 'Delete',
+      onClick: (fare: any) => setDeleteConfirm({ isOpen: true, id: fare.id }),
+      variant: 'danger' as const,
+      icon: Trash2,
+    },
+  ];
 
   return (
     <div className="space-y-6">
       <div className="flex items-center justify-between">
         <div>
-          <h1 className="text-2xl font-bold text-gray-900">Pricing & Fare Rules</h1>
-          <p className="text-gray-600">Manage fare rules and pricing for different routes and classes</p>
+          <h1 className="text-3xl font-bold text-foreground">Pricing & Fares</h1>
+          <p className="text-muted-foreground mt-1">Manage fares by schedule and route segments</p>
         </div>
-        <button className="btn btn-primary flex items-center gap-2">
-          <Save className="h-4 w-4" />
-          Save Changes
-        </button>
+        <ActionButton
+          icon={Plus}
+          onClick={() => {
+            setError(null);
+            setEditingFare(null);
+            if (tab === 'schedule') {
+              setFareForm({
+                seatClassId: '',
+                baseFare: '',
+                nationality: '',
+                route: '',
+                validFrom: new Date().toISOString().split('T')[0],
+                validUntil: '',
+              });
+            } else {
+              setSegmentForm({
+                seatClassId: '',
+                originStationId: '',
+                destinationStationId: '',
+                baseFare: '',
+                nationality: '',
+                validFrom: new Date().toISOString().split('T')[0],
+                validUntil: '',
+              });
+            }
+            setShowModal(true);
+          }}
+        >
+          Add Fare Rule
+        </ActionButton>
       </div>
 
       <div className="card">
-        <div className="mb-6">
-          <label className="label">Select Route</label>
-          <select
-            className="input w-full max-w-md"
-            value={selectedRoute}
-            onChange={(e) => setSelectedRoute(e.target.value)}
+        <div className="flex gap-4 border-b mb-6">
+          <button
+            onClick={() => {
+              setTab('schedule');
+              setError(null);
+            }}
+            className={`px-4 py-2 font-medium border-b-2 transition-colors ${
+              tab === 'schedule' ? 'border-primary text-primary' : 'border-transparent text-muted-foreground'
+            }`}
           >
-            <option value="1">Addis Ababa - Djibouti</option>
-          </select>
+            Schedule Fares
+          </button>
+          <button
+            onClick={() => {
+              setTab('segment');
+              setError(null);
+            }}
+            className={`px-4 py-2 font-medium border-b-2 transition-colors ${
+              tab === 'segment' ? 'border-primary text-primary' : 'border-transparent text-muted-foreground'
+            }`}
+          >
+            Segment Fares
+          </button>
         </div>
 
-        <div className="mb-4">
-          <h3 className="text-lg font-semibold text-gray-900">Fare Rules</h3>
-          <p className="text-sm text-gray-600">Configure base fares for different passenger categories and service classes</p>
-        </div>
+        <div className="space-y-6">
+          {tab === 'schedule' && (
+            <>
+              <div>
+                <label className="label">Select Schedule</label>
+                <select
+                  value={selectedSchedule}
+                  onChange={(e) => {
+                    setSelectedSchedule(e.target.value);
+                    setError(null);
+                  }}
+                  className="input w-full max-w-md"
+                >
+                  <option value="">Choose a schedule...</option>
+                  {schedulesArray.map((schedule: Schedule) => (
+                    <option key={schedule.id} value={schedule.id}>
+                      {schedule.train?.name} ({schedule.train?.number}) - {schedule.originStation?.name} to {schedule.destinationStation?.name} ({new Date(schedule.departureAt).toLocaleDateString()})
+                    </option>
+                  ))}
+                </select>
+              </div>
 
-        <Table
-          data={fareRules}
-          columns={[
-            { key: 'passengerCategory', label: 'Passenger Category' },
-            { key: 'serviceClass', label: 'Service Class' },
-            { key: 'baseFare', label: 'Base Fare', render: (item) => (
-              <input
-                type="number"
-                defaultValue={item.baseFare}
-                className="input w-32"
-              />
-            )},
-            { key: 'currency', label: 'Currency' },
-          ]}
-        />
+              {selectedSchedule && (
+                <div>
+                  <h3 className="text-lg font-semibold mb-4">Fare Rules</h3>
+                  {faresLoading ? (
+                    <div className="flex items-center justify-center py-8">
+                      <Loader2 className="h-6 w-6 animate-spin" />
+                    </div>
+                  ) : faresArray.length === 0 ? (
+                    <div className="text-center py-8 text-muted-foreground">
+                      {`No fares defined. Click "Add Fare Rule" to create one.`}
+                    </div>
+                  ) : (
+                    <>
+                      <div className="mb-4 p-3 bg-muted/50 rounded text-sm text-muted-foreground">
+                        {faresArray.length} fare rule(s) found
+                      </div>
+                      <DataTable
+                        data={faresArray}
+                        columns={fareColumns}
+                        actions={fareActions}
+                        loading={false}
+                        emptyMessage="No fares found."
+                      />
+                    </>
+                  )}
+                </div>
+              )}
+            </>
+          )}
+
+          {tab === 'segment' && (
+            <>
+              <div>
+                <label className="label">Select Route</label>
+                <select
+                  value={selectedRoute}
+                  onChange={(e) => {
+                    setSelectedRoute(e.target.value);
+                    setError(null);
+                  }}
+                  className="input w-full max-w-md"
+                >
+                  <option value="">Choose a route...</option>
+                  {routesArray.map((route: Route) => (
+                    <option key={route.id} value={route.id}>
+                      {route.code} - {route.name}
+                    </option>
+                  ))}
+                </select>
+              </div>
+
+              {selectedRoute && (
+                <div>
+                  <h3 className="text-lg font-semibold mb-4">Segment Fare Rules</h3>
+                  {segmentFaresLoading ? (
+                    <div className="flex items-center justify-center py-8">
+                      <Loader2 className="h-6 w-6 animate-spin" />
+                    </div>
+                  ) : segmentFaresArray.length === 0 ? (
+                    <div className="text-center py-8 text-muted-foreground">
+                      {`No segment fares defined. Click "Add Fare Rule" to create one.`}
+                    </div>
+                  ) : (
+                    <>
+                      <div className="mb-4 p-3 bg-muted/50 rounded text-sm text-muted-foreground">
+                        {segmentFaresArray.length} segment fare rule(s) found
+                      </div>
+                      <DataTable
+                        data={segmentFaresArray}
+                        columns={segmentFareColumns}
+                        actions={fareActions}
+                        loading={false}
+                        emptyMessage="No segment fares found."
+                      />
+                    </>
+                  )}
+                </div>
+              )}
+            </>
+          )}
+        </div>
       </div>
 
-      <div className="card">
-        <h3 className="mb-4 text-lg font-semibold text-gray-900">Pricing Rules</h3>
+      <div className="card bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800">
+        <h3 className="font-semibold text-blue-900 dark:text-blue-200 mb-3">Pricing Structure</h3>
+        <ul className="text-sm text-blue-800 dark:text-blue-300 space-y-2">
+          <li>
+            • <strong>Schedule Fares:</strong> Set custom pricing for each schedule by seat class
+          </li>
+          <li>
+            • <strong>Segment Fares:</strong> Set fares for specific stop-to-stop segments (e.g., Addis → Dire Dawa)
+          </li>
+          <li>
+            • <strong>Nationality-based:</strong> Override fares for specific nationalities
+          </li>
+          <li>
+            • <strong>Age-Based Pricing:</strong> ADULT (5+ years) pays 100%, CHILD (&lt;5) first child FREE, subsequent children 100%
+          </li>
+        </ul>
+      </div>
+
+      {/* Delete Confirmation */}
+      <ConfirmDialog
+        isOpen={deleteConfirm.isOpen}
+        onClose={() => setDeleteConfirm({ isOpen: false, id: null })}
+        onConfirm={confirmDelete}
+        title={`Delete ${tab === 'schedule' ? 'Fare Rule' : 'Segment Fare Rule'}`}
+        message={`Are you sure you want to delete this ${tab === 'schedule' ? 'fare rule' : 'segment fare rule'}?`}
+        confirmText="Delete"
+        isDanger={true}
+        warning="This action cannot be undone."
+      />
+
+      {/* Add/Edit Modal */}
+      <Modal
+        isOpen={showModal}
+        onClose={() => {
+          if (tab === 'schedule') resetForm();
+          else resetSegmentForm();
+        }}
+        title={`${editingFare ? 'Edit' : 'Add'} ${tab === 'schedule' ? 'Fare Rule' : 'Segment Fare Rule'}`}
+        size="lg"
+      >
         <div className="space-y-4">
-          <div className="rounded-lg bg-blue-50 p-4">
-            <h4 className="font-medium text-blue-900">Age-Based Pricing</h4>
-            <ul className="mt-2 space-y-1 text-sm text-blue-700">
-              <li>• ADULT (≥5 years): Pay 100% of base fare</li>
-              <li>• CHILD (&lt;5 years): First child travels FREE, subsequent children pay 100%</li>
-            </ul>
+          {error && (
+            <div className="bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 p-3 rounded-lg text-sm text-red-800 dark:text-red-200">
+              {error}
+            </div>
+          )}
+
+          {tab === 'schedule' && (
+            <>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                  <label className="label">Schedule {editingFare ? '(View only)' : '(Optional)'}</label>
+                  <select
+                    value={selectedSchedule}
+                    onChange={(e) => !editingFare && setSelectedSchedule(e.target.value)}
+                    className="input w-full"
+                    disabled={!!editingFare}
+                  >
+                    <option value="">Not scoped to schedule</option>
+                    {schedulesArray.map((schedule: Schedule) => (
+                      <option key={schedule.id} value={schedule.id}>
+                        {schedule.train?.name} ({schedule.train?.number}) - {new Date(schedule.departureAt).toLocaleDateString()}
+                      </option>
+                    ))}
+                  </select>
+                  <p className="text-xs text-muted-foreground mt-1">Leave empty to apply to all schedules</p>
+                </div>
+
+                <div>
+                  <label className="label">Route Code (Optional)</label>
+                  <input
+                    type="text"
+                    value={fareForm.route}
+                    onChange={(e) => setFareForm({ ...fareForm, route: e.target.value })}
+                    className="input w-full"
+                    placeholder="e.g., ADD-DJI"
+                  />
+                  <p className="text-xs text-muted-foreground mt-1">e.g., ADD-DJI for full route</p>
+                </div>
+              </div>
+
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                  <label className="label">Seat Class *</label>
+                  <select
+                    value={fareForm.seatClassId}
+                    onChange={(e) => setFareForm({ ...fareForm, seatClassId: e.target.value })}
+                    className="input w-full"
+                    required
+                  >
+                    <option value="">Select seat class...</option>
+                    {seatClassesArray.map((sc: SeatClass) => (
+                      <option key={sc.id} value={sc.id}>
+                        {sc.name}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+
+                <div>
+                  <label className="label">Fare (ETB) *</label>
+                  <input
+                    type="number"
+                    min="0"
+                    step="0.01"
+                    value={fareForm.baseFare}
+                    onChange={(e) => setFareForm({ ...fareForm, baseFare: e.target.value })}
+                    className="input w-full"
+                    placeholder="e.g., 350.00"
+                    required
+                  />
+                </div>
+              </div>
+
+              <div>
+                <label className="label">Nationality (Optional)</label>
+                <select
+                  value={fareForm.nationality}
+                  onChange={(e) => setFareForm({ ...fareForm, nationality: e.target.value })}
+                  className="input w-full"
+                >
+                  <option value="">All Nationalities</option>
+                  <option value="Ethiopian">Ethiopian</option>
+                  <option value="Djiboutian">Djiboutian</option>
+                  <option value="Other">Other</option>
+                </select>
+              </div>
+
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                  <label className="label">Valid From *</label>
+                  <input
+                    type="date"
+                    value={fareForm.validFrom}
+                    onChange={(e) => setFareForm({ ...fareForm, validFrom: e.target.value })}
+                    className="input w-full"
+                    required
+                  />
+                </div>
+                <div>
+                  <label className="label">Valid Until (Optional)</label>
+                  <input
+                    type="date"
+                    value={fareForm.validUntil}
+                    onChange={(e) => setFareForm({ ...fareForm, validUntil: e.target.value })}
+                    className="input w-full"
+                  />
+                </div>
+              </div>
+            </>
+          )}
+
+          {tab === 'segment' && (
+            <>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                  <label className="label">Origin Station *</label>
+                  <select
+                    value={segmentForm.originStationId}
+                    onChange={(e) => setSegmentForm({ ...segmentForm, originStationId: e.target.value })}
+                    className="input w-full"
+                    required
+                  >
+                    <option value="">Select origin station...</option>
+                    {currentRoute?.stops?.map((stop: any) => {
+                      const station = stationsArray.find((s: any) => s.id === stop.stationId);
+                      return (
+                        <option key={stop.id} value={stop.stationId}>
+                          Stop {stop.sequence}: {station?.name || 'Unknown'}
+                        </option>
+                      );
+                    })}
+                  </select>
+                </div>
+                <div>
+                  <label className="label">Destination Station *</label>
+                  <select
+                    value={segmentForm.destinationStationId}
+                    onChange={(e) => setSegmentForm({ ...segmentForm, destinationStationId: e.target.value })}
+                    className="input w-full"
+                    required
+                  >
+                    <option value="">Select destination station...</option>
+                    {currentRoute?.stops?.map((stop: any) => {
+                      const station = stationsArray.find((s: any) => s.id === stop.stationId);
+                      return (
+                        <option key={stop.id} value={stop.stationId}>
+                          Stop {stop.sequence}: {station?.name || 'Unknown'}
+                        </option>
+                      );
+                    })}
+                  </select>
+                </div>
+              </div>
+
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                  <label className="label">Seat Class *</label>
+                  <select
+                    value={segmentForm.seatClassId}
+                    onChange={(e) => setSegmentForm({ ...segmentForm, seatClassId: e.target.value })}
+                    className="input w-full"
+                    required
+                  >
+                    <option value="">Select seat class...</option>
+                    {seatClassesArray.map((sc: SeatClass) => (
+                      <option key={sc.id} value={sc.id}>
+                        {sc.name}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+
+                <div>
+                  <label className="label">Fare (ETB) *</label>
+                  <input
+                    type="number"
+                    min="0"
+                    step="0.01"
+                    value={segmentForm.baseFare}
+                    onChange={(e) => setSegmentForm({ ...segmentForm, baseFare: e.target.value })}
+                    className="input w-full"
+                    placeholder="e.g., 150.00"
+                    required
+                  />
+                </div>
+              </div>
+
+              <div>
+                <label className="label">Nationality (Optional)</label>
+                <select
+                  value={segmentForm.nationality}
+                  onChange={(e) => setSegmentForm({ ...segmentForm, nationality: e.target.value })}
+                  className="input w-full"
+                >
+                  <option value="">All Nationalities</option>
+                  <option value="Ethiopian">Ethiopian</option>
+                  <option value="Djiboutian">Djiboutian</option>
+                  <option value="Other">Other</option>
+                </select>
+              </div>
+
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                  <label className="label">Valid From *</label>
+                  <input
+                    type="date"
+                    value={segmentForm.validFrom}
+                    onChange={(e) => setSegmentForm({ ...segmentForm, validFrom: e.target.value })}
+                    className="input w-full"
+                    required
+                  />
+                </div>
+                <div>
+                  <label className="label">Valid Until (Optional)</label>
+                  <input
+                    type="date"
+                    value={segmentForm.validUntil}
+                    onChange={(e) => setSegmentForm({ ...segmentForm, validUntil: e.target.value })}
+                    className="input w-full"
+                  />
+                </div>
+              </div>
+            </>
+          )}
+
+          <div className="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 p-3 rounded-lg text-xs text-blue-800 dark:text-blue-200">
+            <p className="font-semibold mb-1">{tab === 'schedule' ? 'Schedule Fare' : 'Segment Fare'} Options:</p>
+            {tab === 'schedule' && (
+              <ul className="space-y-1">
+                <li>• <strong>Schedule:</strong> Apply to specific schedule only</li>
+                <li>• <strong>Route Code:</strong> Apply to all schedules on that route</li>
+                <li>• <strong>Nationality:</strong> Override for specific passenger nationalities</li>
+                <li>• <strong>All empty:</strong> Apply globally to all schedules</li>
+              </ul>
+            )}
+            {tab === 'segment' && (
+              <ul className="space-y-1">
+                <li>• <strong>Segments:</strong> Define pricing for specific stop-to-stop segments</li>
+                <li>• <strong>Stops:</strong> Use sequence numbers from the route</li>
+                <li>• <strong>Nationality:</strong> Optional scope to specific nationalities</li>
+              </ul>
+            )}
           </div>
-          <div className="rounded-lg bg-green-50 p-4">
-            <h4 className="font-medium text-green-900">Multi-Currency Support</h4>
-            <ul className="mt-2 space-y-1 text-sm text-green-700">
-              <li>• Transaction Currency: ETB (Ethiopian Birr)</li>
-              <li>• Display Currencies: ETB, DJF, USD</li>
-              <li>• Exchange rates: ETB→DJF=3.25, ETB→USD=0.018</li>
-            </ul>
+
+          <div className="flex gap-2 justify-end pt-4">
+            <ActionButton 
+              variant="secondary" 
+              onClick={() => {
+                if (tab === 'schedule') resetForm();
+                else resetSegmentForm();
+              }}
+              type="button"
+            >
+              Cancel
+            </ActionButton>
+            <ActionButton 
+              onClick={tab === 'schedule' ? handleSaveFare : handleSaveSegmentFare} 
+              loading={
+                tab === 'schedule'
+                  ? createFareMutation.isPending || updateFareMutation.isPending
+                  : createSegmentFareMutation.isPending || updateSegmentFareMutation.isPending
+              }
+            >
+              {editingFare ? `Update ${tab === 'schedule' ? 'Fare' : 'Segment Fare'} Rule` : `Save ${tab === 'schedule' ? 'Fare' : 'Segment Fare'} Rule`}
+            </ActionButton>
           </div>
         </div>
-      </div>
+      </Modal>
     </div>
   );
 }
diff --git a/apps/edr-passenger-web/backoffice/src/app/promos/layout.tsx b/apps/edr-passenger-web/backoffice/src/app/promos/layout.tsx
new file mode 100644
index 000000000..df04c3b54
--- /dev/null
+++ b/apps/edr-passenger-web/backoffice/src/app/promos/layout.tsx
@@ -0,0 +1,7 @@
+'use client';
+
+import DashboardLayout from '../dashboard/layout';
+
+export default function PromosLayout({ children }: { children: React.ReactNode }) {
+  return <DashboardLayout>{children}</DashboardLayout>;
+}
diff --git a/apps/edr-passenger-web/backoffice/src/app/promos/page.tsx b/apps/edr-passenger-web/backoffice/src/app/promos/page.tsx
new file mode 100644
index 000000000..a578593e2
--- /dev/null
+++ b/apps/edr-passenger-web/backoffice/src/app/promos/page.tsx
@@ -0,0 +1,409 @@
+'use client';
+
+import { useState } from 'react';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { Plus, Edit, Trash2, Copy, Check } from 'lucide-react';
+import DataTable from '@/components/ui/DataTable';
+import Badge from '@/components/ui/Badge';
+import ActionButton from '@/components/ui/ActionButton';
+import Modal from '@/components/ui/Modal';
+import ConfirmDialog from '@/components/ui/ConfirmDialog';
+import { promosApi, PromoCode } from '@/lib/api/promos';
+
+export default function PromosPage() {
+  const [filters, setFilters] = useState({ search: '', active: '', page: 1, pageSize: 10 });
+  const [showModal, setShowModal] = useState(false);
+  const [editingPromo, setEditingPromo] = useState<any>(null);
+  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; promo: any | null }>({ isOpen: false, promo: null });
+  const [copiedCode, setCopiedCode] = useState<string | null>(null);
+  const queryClient = useQueryClient();
+
+  const { data, isLoading } = useQuery({
+    queryKey: ['promos', filters],
+    queryFn: () => promosApi.getAll(filters),
+  });
+
+  const createMutation = useMutation({
+    mutationFn: promosApi.create,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['promos'] });
+      setShowModal(false);
+      setEditingPromo(null);
+    },
+  });
+
+  const updateMutation = useMutation({
+    mutationFn: ({ id, data }: { id: string; data: any }) => promosApi.update(id, data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['promos'] });
+      setShowModal(false);
+      setEditingPromo(null);
+    },
+  });
+
+  const deleteMutation = useMutation({
+    mutationFn: promosApi.delete,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['promos'] });
+    },
+  });
+
+  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    const formData = new FormData(e.currentTarget);
+    
+    const promoData = {
+      code: formData.get('code') as string,
+      title: formData.get('title') as string,
+      discountType: formData.get('discountType') as 'PERCENTAGE' | 'FIXED',
+      discountValue: parseFloat(formData.get('discountValue') as string),
+      maxDiscount: formData.get('maxDiscount') ? parseFloat(formData.get('maxDiscount') as string) : undefined,
+      minBookingAmount: formData.get('minBookingAmount') ? parseFloat(formData.get('minBookingAmount') as string) : undefined,
+      maxUsagePerUser: formData.get('maxUsagePerUser') ? parseInt(formData.get('maxUsagePerUser') as string) : undefined,
+      totalUsageLimit: formData.get('totalUsageLimit') ? parseInt(formData.get('totalUsageLimit') as string) : undefined,
+      validFrom: formData.get('validFrom') as string,
+      validUntil: formData.get('validUntil') as string,
+      isActive: formData.get('isActive') === 'true',
+    };
+
+    if (editingPromo) {
+      await updateMutation.mutateAsync({ id: editingPromo.id, data: promoData });
+    } else {
+      await createMutation.mutateAsync(promoData);
+    }
+  };
+
+  const handleDelete = (promo: any) => {
+    setDeleteConfirm({ isOpen: true, promo });
+  };
+
+  const confirmDelete = async () => {
+    if (deleteConfirm.promo) {
+      await deleteMutation.mutateAsync(deleteConfirm.promo.id);
+      setDeleteConfirm({ isOpen: false, promo: null });
+    }
+  };
+
+  const copyToClipboard = (code: string) => {
+    navigator.clipboard.writeText(code);
+    setCopiedCode(code);
+    setTimeout(() => setCopiedCode(null), 2000);
+  };
+
+  const columns = [
+    {
+      key: 'code',
+      label: 'Promo Code',
+      render: (promo: PromoCode) => (
+        <div className="flex items-center gap-2">
+          <span className="font-mono font-semibold text-lg">{promo.code}</span>
+          <button
+            onClick={() => copyToClipboard(promo.code)}
+            className="p-1 hover:bg-gray-100 dark:hover:bg-gray-800 rounded transition-colors"
+            title="Copy code"
+          >
+            {copiedCode === promo.code ? (
+              <Check className="h-4 w-4 text-green-600" />
+            ) : (
+              <Copy className="h-4 w-4 text-muted-foreground" />
+            )}
+          </button>
+        </div>
+      ),
+    },
+    {
+      key: 'title',
+      label: 'Title',
+      render: (promo: PromoCode) => (
+        <span className="text-sm font-medium">{promo.title || '-'}</span>
+      ),
+    },
+    {
+      key: 'discount',
+      label: 'Discount',
+      render: (promo: PromoCode) => (
+        <span className="font-semibold">
+          {promo.discountType === 'PERCENTAGE' 
+            ? `${promo.discountValue}%` 
+            : `ETB ${promo.discountValue}`}
+        </span>
+      ),
+    },
+    {
+      key: 'validity',
+      label: 'Valid Period',
+      render: (promo: PromoCode) => (
+        <div className="text-sm">
+          <div>{new Date(promo.validFrom).toLocaleDateString()}</div>
+          <div className="text-muted-foreground">{new Date(promo.validUntil).toLocaleDateString()}</div>
+        </div>
+      ),
+    },
+    {
+      key: 'usage',
+      label: 'Usage',
+      render: (promo: PromoCode) => (
+        <div className="text-sm">
+          <div>{promo.usageCount} used</div>
+          {promo.totalUsageLimit && (
+            <div className="text-muted-foreground">/ {promo.totalUsageLimit} limit</div>
+          )}
+        </div>
+      ),
+    },
+    {
+      key: 'status',
+      label: 'Status',
+      render: (promo: PromoCode) => (
+        <Badge variant="status" status={promo.isActive ? 'CONFIRMED' : 'CANCELLED'}>
+          {promo.isActive ? 'Active' : 'Inactive'}
+        </Badge>
+      ),
+    },
+  ];
+
+  const actions = [
+    {
+      label: 'Edit',
+      onClick: (promo: PromoCode) => {
+        setEditingPromo(promo);
+        setShowModal(true);
+      },
+      variant: 'secondary' as const,
+      icon: Edit,
+    },
+    {
+      label: 'Delete',
+      onClick: handleDelete,
+      variant: 'danger' as const,
+      icon: Trash2,
+    },
+  ];
+
+  return (
+    <div className="space-y-6">
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Promo Codes</h1>
+          <p className="text-muted-foreground">Manage promotional codes and discounts</p>
+        </div>
+        <ActionButton
+          icon={Plus}
+          onClick={() => {
+            setEditingPromo(null);
+            setShowModal(true);
+          }}
+        >
+          Add Promo Code
+        </ActionButton>
+      </div>
+
+      {/* Filters */}
+      <div className="card">
+        <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+          <div>
+            <input
+              type="text"
+              placeholder="Search promo codes..."
+              className="input"
+              value={filters.search}
+              onChange={(e) => setFilters({ ...filters, search: e.target.value, page: 1 })}
+            />
+          </div>
+          <div>
+            <select
+              className="input"
+              value={filters.active}
+              onChange={(e) => setFilters({ ...filters, active: e.target.value, page: 1 })}
+            >
+              <option value="">All Status</option>
+              <option value="true">Active</option>
+              <option value="false">Inactive</option>
+            </select>
+          </div>
+        </div>
+      </div>
+
+      {/* Promos Table */}
+      <DataTable
+        data={data?.items || []}
+        columns={columns}
+        actions={actions}
+        loading={isLoading}
+        emptyMessage="No promo codes found"
+      />
+
+      {/* Delete Confirmation */}
+      <ConfirmDialog
+        isOpen={deleteConfirm.isOpen}
+        onClose={() => setDeleteConfirm({ isOpen: false, promo: null })}
+        onConfirm={confirmDelete}
+        title="Delete Promo Code"
+        message={`Are you sure you want to delete promo code "${deleteConfirm.promo?.code}"?`}
+        confirmText="Delete"
+        isDanger={true}
+      />
+
+      {/* Add/Edit Modal */}
+      <Modal
+        isOpen={showModal}
+        onClose={() => {
+          setShowModal(false);
+          setEditingPromo(null);
+        }}
+        title={`${editingPromo ? 'Edit' : 'Create'} Promo Code`}
+        size="lg"
+      >
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <div>
+              <label className="label">Promo Code *</label>
+              <input
+                type="text"
+                name="code"
+                className="input uppercase"
+                defaultValue={editingPromo?.code}
+                required
+                placeholder="e.g., SUMMER2024"
+                maxLength={20}
+                disabled={!!editingPromo}
+              />
+            </div>
+            <div>
+              <label className="label">Title *</label>
+              <input
+                type="text"
+                name="title"
+                className="input"
+                defaultValue={editingPromo?.title}
+                required
+                placeholder="e.g., Summer Discount"
+              />
+            </div>
+            <div>
+              <label className="label">Discount Type *</label>
+              <select
+                name="discountType"
+                className="input"
+                defaultValue={editingPromo?.discountType || 'PERCENTAGE'}
+                required
+              >
+                <option value="PERCENTAGE">Percentage (%)</option>
+                <option value="FIXED">Fixed Amount (ETB)</option>
+              </select>
+            </div>
+            <div>
+              <label className="label">Discount Value *</label>
+              <input
+                type="number"
+                name="discountValue"
+                className="input"
+                defaultValue={editingPromo?.discountValue}
+                required
+                placeholder="e.g., 15"
+                min="0"
+                step="0.01"
+              />
+            </div>
+            <div>
+              <label className="label">Max Discount (ETB)</label>
+              <input
+                type="number"
+                name="maxDiscount"
+                className="input"
+                defaultValue={editingPromo?.maxDiscount}
+                placeholder="e.g., 500"
+                min="0"
+                step="0.01"
+              />
+            </div>
+            <div>
+              <label className="label">Min Booking Amount (ETB)</label>
+              <input
+                type="number"
+                name="minBookingAmount"
+                className="input"
+                defaultValue={editingPromo?.minBookingAmount}
+                placeholder="e.g., 1000"
+                min="0"
+                step="0.01"
+              />
+            </div>
+            <div>
+              <label className="label">Max Usage Per User</label>
+              <input
+                type="number"
+                name="maxUsagePerUser"
+                className="input"
+                defaultValue={editingPromo?.maxUsagePerUser}
+                placeholder="Unlimited if empty"
+                min="1"
+              />
+            </div>
+            <div>
+              <label className="label">Total Usage Limit</label>
+              <input
+                type="number"
+                name="totalUsageLimit"
+                className="input"
+                defaultValue={editingPromo?.totalUsageLimit}
+                placeholder="Unlimited if empty"
+                min="1"
+              />
+            </div>
+            <div>
+              <label className="label">Valid From *</label>
+              <input
+                type="datetime-local"
+                name="validFrom"
+                className="input"
+                defaultValue={editingPromo?.validFrom?.slice(0, 16)}
+                required
+              />
+            </div>
+            <div>
+              <label className="label">Valid Until *</label>
+              <input
+                type="datetime-local"
+                name="validUntil"
+                className="input"
+                defaultValue={editingPromo?.validUntil?.slice(0, 16)}
+                required
+              />
+            </div>
+            <div>
+              <label className="label">Status</label>
+              <select
+                name="isActive"
+                className="input"
+                defaultValue={editingPromo?.isActive?.toString() || 'true'}
+              >
+                <option value="true">Active</option>
+                <option value="false">Inactive</option>
+              </select>
+            </div>
+          </div>
+
+          <div className="flex justify-end gap-2 pt-4">
+            <ActionButton
+              type="button"
+              variant="secondary"
+              onClick={() => {
+                setShowModal(false);
+                setEditingPromo(null);
+              }}
+            >
+              Cancel
+            </ActionButton>
+            <ActionButton
+              type="submit"
+              loading={createMutation.isPending || updateMutation.isPending}
+            >
+              {editingPromo ? 'Update' : 'Create'} Promo Code
+            </ActionButton>
+          </div>
+        </form>
+      </Modal>
+    </div>
+  );
+}
diff --git a/apps/edr-passenger-web/backoffice/src/app/routes/page.tsx b/apps/edr-passenger-web/backoffice/src/app/routes/page.tsx
index cc1638a1b..943b4fb5a 100644
--- a/apps/edr-passenger-web/backoffice/src/app/routes/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/routes/page.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { Plus, Edit, Trash2, X } from 'lucide-react';
+import { Plus, Edit, Trash2, X, Search } from 'lucide-react';
 import DataTable from '@/components/ui/DataTable';
 import Badge from '@/components/ui/Badge';
 import ActionButton from '@/components/ui/ActionButton';
@@ -26,6 +26,7 @@ export default function RoutesPage() {
   const [destinationStationId, setDestinationStationId] = useState('');
   const [destinationDistance, setDestinationDistance] = useState<number | undefined>(undefined);
   const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; route: any | null }>({ isOpen: false, route: null });
+  const [search, setSearch] = useState('');
   const queryClient = useQueryClient();
 
   const { data: routes, isLoading: routesLoading } = useQuery({
@@ -81,10 +82,8 @@ export default function RoutesPage() {
       return;
     }
 
-    // Sort middle stops by distance from origin
-    const sortedMiddleStops = [...stops].sort((a, b) => 
-      (a.distanceFromOrigin || 0) - (b.distanceFromOrigin || 0)
-    );
+    // Keep current stop order (already rearranged by user)
+    const sortedMiddleStops = stops;
 
     // Calculate distanceKm (distance from previous stop)
     const stopsArray = [
@@ -136,6 +135,30 @@ export default function RoutesPage() {
     setStops(updated);
   };
 
+  const handleDragStart = (e: React.DragEvent, index: number) => {
+    e.dataTransfer.setData('text/plain', index.toString());
+  };
+
+  const handleDragOver = (e: React.DragEvent) => {
+    e.preventDefault();
+    (e.currentTarget as HTMLElement).style.opacity = '0.5';
+  };
+
+  const handleDragLeave = (e: React.DragEvent) => {
+    (e.currentTarget as HTMLElement).style.opacity = '1';
+  };
+
+  const handleDrop = (e: React.DragEvent, targetIndex: number) => {
+    e.preventDefault();
+    (e.currentTarget as HTMLElement).style.opacity = '1';
+    const sourceIndex = parseInt(e.dataTransfer.getData('text/plain'));
+    if (sourceIndex === targetIndex) return;
+    const newStops = [...stops];
+    const [draggedStop] = newStops.splice(sourceIndex, 1);
+    newStops.splice(targetIndex, 0, draggedStop);
+    setStops(newStops);
+  };
+
   const generateRouteCode = (originId: string, destId: string) => {
     if (!originId || !destId) return '';
     const origin = stations?.items?.find((s: any) => s.id === originId);
@@ -176,6 +199,17 @@ export default function RoutesPage() {
     },
   ];
 
+  const filteredRoutes = (routes as any)?.items || (Array.isArray(routes) ? routes : []);
+  const displayedRoutes = filteredRoutes.filter((route: any) => {
+    if (!search) return true;
+    const searchLower = search.toLowerCase();
+    return (
+      route.code?.toLowerCase().includes(searchLower) ||
+      route.name?.toLowerCase().includes(searchLower) ||
+      route.description?.toLowerCase().includes(searchLower)
+    );
+  });
+
   const routeActions = [
     {
       label: 'Edit',
@@ -238,6 +272,7 @@ export default function RoutesPage() {
             setDestinationStationId('');
             setDestinationDistance(undefined);
             setStops([]);
+            setSearch('');
             setShowModal(true);
           }}
         >
@@ -245,15 +280,25 @@ export default function RoutesPage() {
         </ActionButton>
       </div>
 
+      <div className="relative mb-6">
+        <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+        <input
+          type="text"
+          placeholder="Search by code, name, or description..."
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+          className="input pl-10 w-full"
+        />
+      </div>
+
       <DataTable
-        data={(routes as any)?.items || (Array.isArray(routes) ? routes : [])}
+        data={displayedRoutes}
         columns={routeColumns}
         actions={routeActions}
         loading={routesLoading}
-        emptyMessage="No routes found"
+        emptyMessage={search ? "No routes match your search" : "No routes found"}
       />
 
-      {/* Delete Confirmation */}
       <ConfirmDialog
         isOpen={deleteConfirm.isOpen}
         onClose={() => setDeleteConfirm({ isOpen: false, route: null })}
@@ -265,7 +310,6 @@ export default function RoutesPage() {
         warning="This route may be referenced by schedules and bookings. Deleting it may impact these systems."
       />
 
-      {/* Add/Edit Modal */}
       <Modal
         isOpen={showModal}
         onClose={() => {
@@ -275,6 +319,7 @@ export default function RoutesPage() {
           setDestinationStationId('');
           setDestinationDistance(undefined);
           setStops([]);
+          setSearch('');
         }}
         title={`${editingRoute ? 'Edit' : 'Add'} Route`}
         size="lg"
@@ -358,7 +403,7 @@ export default function RoutesPage() {
               className="input"
               rows={2}
               defaultValue={editingRoute?.description}
-              placeholder="Main corridor via Dire Dawa"
+              placeholder="Outbound local route from [Origin] to [Destination]"
             />
           </div>
 
@@ -387,10 +432,10 @@ export default function RoutesPage() {
           <div className="border-t pt-4">
             <div className="flex items-center justify-between mb-3">
               <label className="label mb-0">Route Stops</label>
+              <span className="text-xs text-muted-foreground">Drag to rearrange intermediate stops</span>
             </div>
             
             <div className="space-y-2">
-              {/* Origin Stop */}
               <div className="flex gap-2 items-center p-3 bg-primary/10 rounded border-2 border-primary">
                 <div className="flex-shrink-0 w-8 h-8 bg-primary text-primary-foreground rounded-full flex items-center justify-center text-sm font-medium">
                   1
@@ -410,9 +455,16 @@ export default function RoutesPage() {
                 </div>
               </div>
 
-              {/* Intermediate Stops */}
               {stops.map((stop, index) => (
-                <div key={index} className="flex gap-2 items-center p-3 bg-muted/50 rounded">
+                <div
+                  key={index}
+                  draggable
+                  onDragStart={(e) => handleDragStart(e, index)}
+                  onDragOver={handleDragOver}
+                  onDragLeave={handleDragLeave}
+                  onDrop={(e) => handleDrop(e, index)}
+                  className="flex gap-2 items-center p-3 bg-muted/50 rounded cursor-move hover:bg-muted transition-colors"
+                >
                   <div className="flex-shrink-0 w-8 h-8 bg-secondary text-secondary-foreground rounded-full flex items-center justify-center text-sm font-medium">
                     {index + 2}
                   </div>
@@ -457,7 +509,6 @@ export default function RoutesPage() {
                 </div>
               ))}
 
-              {/* Add Intermediate Stop Button */}
               {originStationId && destinationStationId && (
                 <div className="flex justify-center py-2">
                   <ActionButton
@@ -472,7 +523,6 @@ export default function RoutesPage() {
                 </div>
               )}
 
-              {/* Destination Stop */}
               <div className="flex gap-2 items-center p-3 bg-primary/10 rounded border-2 border-primary">
                 <div className="flex-shrink-0 w-8 h-8 bg-primary text-primary-foreground rounded-full flex items-center justify-center text-sm font-medium">
                   {stops.length + 2}
@@ -516,6 +566,7 @@ export default function RoutesPage() {
                 setDestinationStationId('');
                 setDestinationDistance(undefined);
                 setStops([]);
+                setSearch('');
               }}
             >
               Cancel
diff --git a/apps/edr-passenger-web/backoffice/src/app/schedules/layout.tsx b/apps/edr-passenger-web/backoffice/src/app/schedules/layout.tsx
index 86d53715f..8f7bbc1c1 100644
--- a/apps/edr-passenger-web/backoffice/src/app/schedules/layout.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/schedules/layout.tsx
@@ -1,5 +1,54 @@
-import DashboardLayout from '../dashboard/layout';
+'use client';
 
-export default function Layout({ children }: { children: React.ReactNode }) {
-  return <DashboardLayout>{children}</DashboardLayout>;
+import { useEffect, useState } from 'react';
+import { useRouter } from 'next/navigation';
+import Sidebar from '@/components/layout/Sidebar';
+import Header from '@/components/layout/Header';
+import { useAuthStore } from '@/lib/auth-store';
+
+export default function SchedulesLayout({ children }: { children: React.ReactNode }) {
+  const router = useRouter();
+  const { isAuthenticated } = useAuthStore();
+  const [isLoading, setIsLoading] = useState(true);
+
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setIsLoading(false);
+    }, 100);
+    
+    return () => clearTimeout(timer);
+  }, []);
+
+  useEffect(() => {
+    if (!isLoading && !isAuthenticated) {
+      router.push('/login');
+    }
+  }, [isAuthenticated, router, isLoading]);
+
+  if (isLoading) {
+    return (
+      <div className="flex h-screen items-center justify-center bg-gray-50 dark:bg-slate-950">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-edr-green-600 mx-auto"></div>
+          <p className="mt-4 text-gray-600 dark:text-gray-400">Loading...</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (!isAuthenticated) {
+    return null;
+  }
+
+  return (
+    <div className="flex h-screen overflow-hidden bg-gray-50 dark:bg-slate-950">
+      <Sidebar />
+      <div className="flex flex-1 flex-col overflow-hidden">
+        <Header />
+        <main className="flex-1 overflow-y-auto bg-gray-50 dark:bg-slate-950 p-6">
+          {children}
+        </main>
+      </div>
+    </div>
+  );
 }
diff --git a/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx b/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
index d914f0f6f..a40fbbc02 100644
--- a/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
@@ -1,216 +1,380 @@
 'use client';
 
 import { useState } from 'react';
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { Download, Plus, Edit, Trash2, Train as TrainIcon } from 'lucide-react';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { Plus, Loader2, Zap, Trash2, Edit, Search, X } from 'lucide-react';
 import DataTable from '@/components/ui/DataTable';
-import Badge from '@/components/ui/Badge';
 import ActionButton from '@/components/ui/ActionButton';
 import Modal from '@/components/ui/Modal';
-import { schedulesApi, fleetApi } from '@/lib/api';
-import { routesApi } from '@/lib/api/routes';
-import { formatDateTime, formatCurrency } from '@/lib/utils';
+import ConfirmDialog from '@/components/ui/ConfirmDialog';
+import { apiClient } from '@/lib/api-client';
+
+interface Schedule {
+  id: string;
+  trainId: string;
+  routeId: string;
+  departureAt: string;
+  arrivalAt: string;
+  status: string;
+  stopsCount: number;
+  train?: { id: string; name: string; number: string };
+  originStation?: { id: string; name: string };
+  destinationStation?: { id: string; name: string };
+  coachAssignments?: Array<{ coachId: string; positionNumber: number; coach?: { id: string; number: string } }>;
+}
+
+interface Train {
+  id: string;
+  name: string;
+  number: string;
+}
+
+interface Route {
+  id: string;
+  name: string;
+  code: string;
+}
+
+interface Coach {
+  id: string;
+  number: string;
+  coachNumber?: string;
+  capacity: number;
+  coachType?: { name: string };
+}
 
 export default function SchedulesPage() {
-  const [filters, setFilters] = useState({ search: '', status: '' });
   const [showModal, setShowModal] = useState(false);
-  const [showCoachModal, setShowCoachModal] = useState(false);
-  const [editingSchedule, setEditingSchedule] = useState<any>(null);
-  const [selectedSchedule, setSelectedSchedule] = useState<any>(null);
-  const [selectedCoaches, setSelectedCoaches] = useState<Array<{ coachId: string; positionNumber: number }>>([]);
+  const [showEditModal, setShowEditModal] = useState(false);
+  const [editingSchedule, setEditingSchedule] = useState<Schedule | null>(null);
+  const [selectedSchedules, setSelectedSchedules] = useState<Set<string>>(new Set());
+  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; item: any | null; isBulk?: boolean }>(
+    { isOpen: false, item: null }
+  );
+  const [error, setError] = useState<string | null>(null);
   const queryClient = useQueryClient();
 
-  const { data, isLoading } = useQuery({
+  const [bulkForm, setBulkForm] = useState({
+    trainId: '',
+    routeId: '',
+    startDateTime: '',
+    durationHours: '12',
+    repeatEveryDays: '1',
+    forNextDays: '30',
+    coachIds: [] as string[],
+  });
+
+  const [editForm, setEditForm] = useState({
+    departureAt: '',
+    arrivalAt: '',
+    status: 'SCHEDULED',
+    coachIds: [] as string[],
+  });
+
+  const [filters, setFilters] = useState({
+    search: '',
+    trainId: '',
+    routeId: '',
+    date: '',
+  });
+
+  const { data: schedulesData, isLoading: schedulesLoading } = useQuery({
     queryKey: ['schedules', filters],
-    queryFn: () => schedulesApi.getAll(filters),
+    queryFn: () => {
+      const params = new URLSearchParams();
+      if (filters.trainId) params.append('trainId', filters.trainId);
+      if (filters.routeId) params.append('routeId', filters.routeId);
+      if (filters.date) params.append('date', filters.date);
+      return apiClient.get<Schedule[]>(`/schedules?${params.toString()}`);
+    },
+    retry: 1,
   });
 
   const { data: trainsData } = useQuery({
     queryKey: ['trains'],
-    queryFn: () => fleetApi.getTrains(),
+    queryFn: () => apiClient.get<Train[]>('/fleet/trains'),
+    retry: 1,
   });
 
   const { data: routesData } = useQuery({
     queryKey: ['routes'],
-    queryFn: () => routesApi.getAll(),
+    queryFn: () => apiClient.get<Route[]>('/routes'),
+    retry: 1,
   });
 
   const { data: coachesData } = useQuery({
     queryKey: ['coaches'],
-    queryFn: () => fleetApi.getCoaches(),
+    queryFn: () => apiClient.get<Coach[]>('/fleet/coaches'),
+    retry: 1,
   });
 
-  const createMutation = useMutation({
-    mutationFn: schedulesApi.create,
+  const bulkGenerateMutation = useMutation({
+    mutationFn: (data: any) => apiClient.post('/schedules/bulk-generate', data),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['schedules'] });
       setShowModal(false);
+      setBulkForm({
+        trainId: '',
+        routeId: '',
+        startDateTime: '',
+        durationHours: '12',
+        repeatEveryDays: '1',
+        forNextDays: '30',
+        coachIds: [],
+      });
+      setError(null);
+    },
+    onError: (err: any) => {
+      setError(err.response?.data?.message || 'Failed to generate schedules');
+    },
+  });
+
+  const updateScheduleMutation = useMutation({
+    mutationFn: (data: { id: string; payload: any }) =>
+      apiClient.patch(`/schedules/${data.id}`, data.payload),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['schedules'] });
+      setShowEditModal(false);
       setEditingSchedule(null);
+      setError(null);
+    },
+    onError: (err: any) => {
+      setError(err.response?.data?.message || 'Failed to update schedule');
     },
   });
 
-  const updateMutation = useMutation({
-    mutationFn: ({ id, data }: { id: string; data: any }) => schedulesApi.update(id, data),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['schedules'] });
-      setShowModal(false);
-      setEditingSchedule(null);
-    },
-  });
-
-  const deleteMutation = useMutation({
-    mutationFn: schedulesApi.delete,
+  const deleteScheduleMutation = useMutation({
+    mutationFn: (id: string) => apiClient.delete(`/schedules/${id}`),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['schedules'] });
     },
   });
 
-  const assignCoachesMutation = useMutation({
-    mutationFn: ({ scheduleId, coaches }: { scheduleId: string; coaches: Array<{ coachId: string; positionNumber: number }> }) =>
-      schedulesApi.assignCoaches(scheduleId, coaches),
+  const bulkDeleteMutation = useMutation({
+    mutationFn: async (ids: string[]) => {
+      await Promise.all(ids.map(id => apiClient.delete(`/schedules/${id}`)));
+    },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['schedules'] });
-      setShowCoachModal(false);
-      setSelectedSchedule(null);
-      setSelectedCoaches([]);
-      alert('Coaches assigned successfully');
+      setSelectedSchedules(new Set());
     },
   });
 
-  const removeCoachMutation = useMutation({
-    mutationFn: ({ scheduleId, coachId }: { scheduleId: string; coachId: string }) =>
-      schedulesApi.removeCoachAssignment(scheduleId, coachId),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['schedules'] });
-    },
-  });
-
-  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
+  const handleBulkSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-    const formData = new FormData(e.currentTarget);
-    
-    const departureAt = formData.get('departureAt') as string;
-    const arrivalAt = formData.get('arrivalAt') as string;
-    
-    const departureISO = new Date(departureAt).toISOString();
-    const arrivalISO = new Date(arrivalAt).toISOString();
-    
-    const scheduleData = {
-      trainId: formData.get('trainId') as string,
-      routeId: formData.get('routeId') as string,
-      departureAt: departureISO,
-      arrivalAt: arrivalISO,
-      plannedTimes: [],
-    };
+    setError(null);
 
-    if (editingSchedule) {
-      await updateMutation.mutateAsync({ id: editingSchedule.id, data: scheduleData });
-    } else {
-      await createMutation.mutateAsync(scheduleData);
-    }
-  };
-
-  const trains = trainsData?.items || trainsData?.data || [];
-  const routes = routesData?.items || routesData?.data || [];
-  const coaches = coachesData?.items || coachesData?.data || [];
-
-  const handleDelete = async (schedule: any) => {
-    if (confirm('Are you sure you want to delete this schedule?')) {
-      await deleteMutation.mutateAsync(schedule.id);
-    }
-  };
-
-  const handleAssignCoaches = (schedule: any) => {
-    setSelectedSchedule(schedule);
-    setSelectedCoaches([]);
-    setShowCoachModal(true);
-  };
-
-  const handleRemoveCoach = async (schedule: any, coachId: string) => {
-    if (confirm('Remove this coach from the schedule?')) {
-      await removeCoachMutation.mutateAsync({ scheduleId: schedule.id, coachId });
-    }
-  };
-
-  const handleToggleCoach = (coachId: string) => {
-    setSelectedCoaches(prev => {
-      const exists = prev.find(c => c.coachId === coachId);
-      if (exists) {
-        return prev.filter(c => c.coachId !== coachId);
-      } else {
-        const maxPosition = prev.length > 0 ? Math.max(...prev.map(c => c.positionNumber)) : 0;
-        return [...prev, { coachId, positionNumber: maxPosition + 1 }];
-      }
-    });
-  };
-
-  const handleSubmitCoaches = async () => {
-    if (selectedCoaches.length === 0) {
-      alert('Please select at least one coach');
+    if (!bulkForm.trainId || !bulkForm.routeId || !bulkForm.startDateTime) {
+      setError('Train, route, and start date/time are required');
       return;
     }
-    await assignCoachesMutation.mutateAsync({
-      scheduleId: selectedSchedule.id,
-      coaches: selectedCoaches,
+
+    const payload: any = {
+      trainId: bulkForm.trainId,
+      routeId: bulkForm.routeId,
+      startDateTime: bulkForm.startDateTime,
+      durationHours: parseInt(bulkForm.durationHours),
+      repeatEveryDays: parseInt(bulkForm.repeatEveryDays),
+      forNextDays: parseInt(bulkForm.forNextDays),
+    };
+
+    if (bulkForm.coachIds.length > 0) {
+      payload.coachIds = bulkForm.coachIds;
+    }
+
+    await bulkGenerateMutation.mutateAsync(payload);
+  };
+
+  const handleEditSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    setError(null);
+
+    if (!editingSchedule) return;
+
+    const depDate = new Date(editForm.departureAt);
+    const arrDate = new Date(editForm.arrivalAt);
+
+    if (arrDate <= depDate) {
+      setError('Arrival time must be after departure time');
+      return;
+    }
+
+    const payload: any = {
+      departureAt: editForm.departureAt,
+      arrivalAt: editForm.arrivalAt,
+      status: editForm.status,
+    };
+
+    if (editForm.coachIds.length > 0) {
+      payload.coaches = editForm.coachIds.map((coachId: string, idx: number) => ({
+        coachId,
+        positionNumber: idx + 1,
+      }));
+    }
+
+    await updateScheduleMutation.mutateAsync({
+      id: editingSchedule.id,
+      payload,
     });
   };
 
-  const columns = [
-    { key: 'train', label: 'Train', render: (schedule: any) => schedule.train?.name || 'N/A' },
-    { key: 'route', label: 'Route', render: (schedule: any) => schedule.route?.name || `${schedule.originStation?.name || 'N/A'} → ${schedule.destinationStation?.name || 'N/A'}` },
-    { key: 'departureAt', label: 'Departure', render: (schedule: any) => formatDateTime(schedule.departureAt) },
-    { 
-      key: 'coaches', 
-      label: 'Coaches', 
-      render: (schedule: any) => {
-        const coachCount = schedule._count?.coachAssignments || 0;
-        if (coachCount === 0) {
-          return <span className="text-sm text-muted-foreground">No coaches assigned</span>;
-        }
-        return (
-          <div className="flex flex-wrap gap-1">
-            {schedule.coachAssignments?.slice(0, 3).map((assignment: any) => (
-              <div key={assignment.id} className="group relative inline-flex">
-                <Badge variant="status" status="CONFIRMED">
-                  {assignment.coach?.coachNumber || 'N/A'}
-                </Badge>
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    handleRemoveCoach(schedule, assignment.coach.id);
-                  }}
-                  className="absolute -top-1 -right-1 hidden group-hover:flex items-center justify-center w-4 h-4 bg-destructive text-destructive-foreground rounded-full text-xs"
-                  title="Remove coach"
-                >
-                  ×
-                </button>
-              </div>
-            ))}
-            {coachCount > 3 && (
-              <Badge variant="status" status="PENDING">
-                +{coachCount - 3}
-              </Badge>
-            )}
-          </div>
-        );
-      }
-    },
-    { key: 'status', label: 'Status', render: (schedule: any) => <Badge variant="status" status={schedule.status}>{schedule.status}</Badge> },
-  ];
+  const handleDelete = (item: Schedule) => {
+    setDeleteConfirm({ isOpen: true, item, isBulk: false });
+  };
 
-  const actions = [
+  const handleBulkDelete = () => {
+    if (selectedSchedules.size === 0) return;
+    setDeleteConfirm({ isOpen: true, item: Array.from(selectedSchedules), isBulk: true });
+  };
+
+  const confirmDelete = async () => {
+    if (deleteConfirm.isBulk) {
+      const ids = deleteConfirm.item as string[];
+      await bulkDeleteMutation.mutateAsync(ids);
+    } else if (deleteConfirm.item) {
+      await deleteScheduleMutation.mutateAsync(deleteConfirm.item.id);
+    }
+    setDeleteConfirm({ isOpen: false, item: null });
+  };
+
+  const handleEditClick = (schedule: Schedule) => {
+    setEditingSchedule(schedule);
+
+    const dep = new Date(schedule.departureAt);
+    const arr = new Date(schedule.arrivalAt);
+
+    const depLocal = new Date(dep.getTime() - dep.getTimezoneOffset() * 60000).toISOString().slice(0, 16);
+    const arrLocal = new Date(arr.getTime() - arr.getTimezoneOffset() * 60000).toISOString().slice(0, 16);
+
+    setEditForm({
+      departureAt: depLocal,
+      arrivalAt: arrLocal,
+      status: schedule.status,
+      coachIds: schedule.coachAssignments?.map((ca: any) => ca.coachId) || [],
+    });
+    setError(null);
+    setShowEditModal(true);
+  };
+
+  const schedules = Array.isArray(schedulesData) ? schedulesData : (schedulesData as any)?.items || [];
+  const trains = Array.isArray(trainsData) ? trainsData : (trainsData as any)?.items || [];
+  const routes = Array.isArray(routesData) ? routesData : (routesData as any)?.items || [];
+  const coaches = Array.isArray(coachesData) ? coachesData : (coachesData as any)?.items || [];
+
+  const filteredSchedules = schedules.filter((schedule: Schedule) => {
+    if (!filters.search) return true;
+    const search = filters.search.toLowerCase();
+    return (
+      schedule.train?.name.toLowerCase().includes(search) ||
+      schedule.train?.number.toLowerCase().includes(search) ||
+      schedule.originStation?.name.toLowerCase().includes(search) ||
+      schedule.destinationStation?.name.toLowerCase().includes(search) ||
+      schedule.status.toLowerCase().includes(search)
+    );
+  });
+
+  const statusMap: Record<string, string> = {
+    SCHEDULED: 'edr-badge-info',
+    BOARDING: 'edr-badge-warning',
+    EN_ROUTE: 'edr-badge-success',
+    ARRIVED: 'edr-badge-secondary',
+    CANCELLED: 'edr-badge-danger',
+  };
+
+  const scheduleColumns = [
     {
-      label: 'Assign Coaches',
-      onClick: handleAssignCoaches,
-      variant: 'primary' as const,
-      icon: TrainIcon,
+      key: 'checkbox',
+      label: (
+        <input
+          type="checkbox"
+          checked={selectedSchedules.size === filteredSchedules.length && filteredSchedules.length > 0}
+          onChange={(e) => {
+            if (e.target.checked) {
+              setSelectedSchedules(new Set(filteredSchedules.map((s: Schedule) => s.id)));
+            } else {
+              setSelectedSchedules(new Set());
+            }
+          }}
+          className="rounded"
+        />
+      ),
+      render: (schedule: Schedule) => (
+        <input
+          type="checkbox"
+          checked={selectedSchedules.has(schedule.id)}
+          onChange={(e) => {
+            const newSelected = new Set(selectedSchedules);
+            if (e.target.checked) {
+              newSelected.add(schedule.id);
+            } else {
+              newSelected.delete(schedule.id);
+            }
+            setSelectedSchedules(newSelected);
+          }}
+          className="rounded"
+        />
+      ),
     },
+    {
+      key: 'train.name',
+      label: 'Train',
+      sortable: true,
+      render: (schedule: Schedule) => (
+        <div className="font-medium">
+          {schedule.train?.name} ({schedule.train?.number})
+        </div>
+      ),
+    },
+    {
+      key: 'originStation.name',
+      label: 'From',
+      render: (schedule: Schedule) => <span>{schedule.originStation?.name}</span>,
+    },
+    {
+      key: 'destinationStation.name',
+      label: 'To',
+      render: (schedule: Schedule) => <span>{schedule.destinationStation?.name}</span>,
+    },
+    {
+      key: 'departureAt',
+      label: 'Departure',
+      sortable: true,
+      render: (schedule: Schedule) => (
+        <span className="font-mono text-sm">{new Date(schedule.departureAt).toLocaleString()}</span>
+      ),
+    },
+    {
+      key: 'arrivalAt',
+      label: 'Arrival',
+      sortable: true,
+      render: (schedule: Schedule) => (
+        <span className="font-mono text-sm">{new Date(schedule.arrivalAt).toLocaleString()}</span>
+      ),
+    },
+    {
+      key: 'coachAssignments',
+      label: 'Coaches',
+      render: (schedule: Schedule) => (
+        <span className="text-sm font-medium">
+          {schedule.coachAssignments?.length || 0}
+        </span>
+      ),
+    },
+    {
+      key: 'status',
+      label: 'Status',
+      render: (schedule: Schedule) => (
+        <span className={`edr-badge ${statusMap[schedule.status] || 'edr-badge-info'}`}>
+          {schedule.status}
+        </span>
+      ),
+    },
+  ] as any;
+
+  const scheduleActions = [
     {
       label: 'Edit',
-      onClick: (schedule: any) => {
-        setEditingSchedule(schedule);
-        setShowModal(true);
-      },
+      onClick: handleEditClick,
       variant: 'secondary' as const,
       icon: Edit,
     },
@@ -226,241 +390,433 @@ export default function SchedulesPage() {
     <div className="space-y-6">
       <div className="flex items-center justify-between">
         <div>
-          <h1 className="text-2xl font-bold text-foreground">Schedules</h1>
-          <p className="text-muted-foreground">Manage train schedules and trips</p>
+          <h1 className="text-3xl font-bold text-foreground">Schedule Management</h1>
+          <p className="text-muted-foreground mt-1">Create and manage train schedules</p>
         </div>
         <div className="flex gap-2">
-          <ActionButton icon={Download} variant="secondary">Export</ActionButton>
+          {selectedSchedules.size > 0 && (
+            <ActionButton
+              onClick={handleBulkDelete}
+              variant="danger"
+              loading={bulkDeleteMutation.isPending}
+            >
+              Delete {selectedSchedules.size} Schedule{selectedSchedules.size !== 1 ? 's' : ''}
+            </ActionButton>
+          )}
           <ActionButton
-            icon={Plus}
+            icon={Zap}
             onClick={() => {
-              setEditingSchedule(null);
+              setError(null);
               setShowModal(true);
             }}
           >
-            Add Schedule
+            Bulk Generate
           </ActionButton>
         </div>
       </div>
 
       <div className="card">
-        <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-          <div>
-            <label className="label">Search</label>
-            <input type="text" placeholder="Search..." className="input" value={filters.search} onChange={(e) => setFilters({ ...filters, search: e.target.value })} />
-          </div>
-          <div>
-            <label className="label">Status</label>
-            <select className="input" value={filters.status} onChange={(e) => setFilters({ ...filters, status: e.target.value })}>
-              <option value="">All Status</option>
-              <option value="SCHEDULED">Scheduled</option>
-              <option value="ACTIVE">Active</option>
-              <option value="COMPLETED">Completed</option>
-              <option value="CANCELLED">Cancelled</option>
-            </select>
+        <div className="mb-6 p-4 border-b border-border">
+          <div className="space-y-4">
+            <div className="relative">
+              <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+              <input
+                type="text"
+                placeholder="Search by train name, number, station, or status..."
+                value={filters.search}
+                onChange={(e) => setFilters({ ...filters, search: e.target.value })}
+                className="input pl-10 w-full"
+              />
+            </div>
+
+            <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
+              <div>
+                <label className="label text-sm">Train</label>
+                <select
+                  value={filters.trainId}
+                  onChange={(e) => setFilters({ ...filters, trainId: e.target.value })}
+                  className="input"
+                >
+                  <option value="">All Trains</option>
+                  {trains.map((train: Train) => (
+                    <option key={train.id} value={train.id}>
+                      {train.name} ({train.number})
+                    </option>
+                  ))}
+                </select>
+              </div>
+
+              <div>
+                <label className="label text-sm">Route</label>
+                <select
+                  value={filters.routeId}
+                  onChange={(e) => setFilters({ ...filters, routeId: e.target.value })}
+                  className="input"
+                >
+                  <option value="">All Routes</option>
+                  {routes.map((route: Route) => (
+                    <option key={route.id} value={route.id}>
+                      {route.name} ({route.code})
+                    </option>
+                  ))}
+                </select>
+              </div>
+
+              <div>
+                <label className="label text-sm">Date</label>
+                <input
+                  type="date"
+                  value={filters.date}
+                  onChange={(e) => setFilters({ ...filters, date: e.target.value })}
+                  className="input"
+                />
+              </div>
+
+              <div className="flex items-end">
+                <ActionButton
+                  variant="secondary"
+                  onClick={() => setFilters({ search: '', trainId: '', routeId: '', date: '' })}
+                >
+                  Clear Filters
+                </ActionButton>
+              </div>
+            </div>
           </div>
         </div>
+
+        <div className="pt-6">
+          {schedulesLoading ? (
+            <div className="flex items-center justify-center py-8">
+              <Loader2 className="h-6 w-6 animate-spin" />
+            </div>
+          ) : filteredSchedules.length === 0 ? (
+            <div className="text-center py-8 text-muted-foreground">
+              No schedules found. {filters.search && 'Try adjusting your search.'}
+            </div>
+          ) : (
+            <DataTable
+              columns={scheduleColumns}
+              data={filteredSchedules}
+              actions={scheduleActions}
+              loading={false}
+              emptyMessage="No schedules found."
+            />
+          )}
+        </div>
       </div>
 
-      <DataTable
-        data={(data as any)?.items || (Array.isArray(data) ? data : [])}
-        columns={columns}
-        actions={actions}
-        loading={isLoading}
-        emptyMessage="No schedules found"
+      <ConfirmDialog
+        isOpen={deleteConfirm.isOpen}
+        onClose={() => setDeleteConfirm({ isOpen: false, item: null })}
+        onConfirm={confirmDelete}
+        title={deleteConfirm.isBulk ? 'Delete Multiple Schedules' : 'Delete Schedule'}
+        message={
+          deleteConfirm.isBulk
+            ? `Are you sure you want to delete ${Array.isArray(deleteConfirm.item) ? deleteConfirm.item.length : 0} schedule(s)? This action cannot be undone.`
+            : `Are you sure you want to delete this schedule departing on ${
+                deleteConfirm.item ? new Date(deleteConfirm.item.departureAt).toLocaleString() : ''
+              }?`
+        }
+        confirmText="Delete"
+        isDanger={true}
+        warning="This schedule may have bookings. Deleting it may impact these systems."
       />
 
-      {/* Add/Edit Modal */}
       <Modal
         isOpen={showModal}
         onClose={() => {
           setShowModal(false);
-          setEditingSchedule(null);
+          setError(null);
+          setBulkForm({
+            trainId: '',
+            routeId: '',
+            startDateTime: '',
+            durationHours: '12',
+            repeatEveryDays: '1',
+            forNextDays: '30',
+            coachIds: [],
+          });
         }}
-        title={`${editingSchedule ? 'Edit' : 'Add'} Schedule`}
+        title="Bulk Generate Schedules"
         size="lg"
       >
-        <form onSubmit={handleSubmit} className="space-y-4">
-          <div className="grid grid-cols-1 gap-4">
+        <form onSubmit={handleBulkSubmit} className="space-y-4">
+          {error && (
+            <div className="bg-red-50 p-3 rounded-lg text-sm text-red-800">
+              {error}
+            </div>
+          )}
+
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
               <label className="label">Train *</label>
               <select
-                name="trainId"
+                value={bulkForm.trainId}
+                onChange={(e) => setBulkForm({ ...bulkForm, trainId: e.target.value })}
                 className="input"
-                defaultValue={editingSchedule?.trainId}
                 required
               >
                 <option value="">Select Train</option>
-                {trains.map((train: any) => (
+                {trains.map((train: Train) => (
                   <option key={train.id} value={train.id}>
-                    {train.trainNumber || train.name}
+                    {train.name} ({train.number})
                   </option>
                 ))}
               </select>
             </div>
+
             <div>
               <label className="label">Route *</label>
               <select
-                name="routeId"
+                value={bulkForm.routeId}
+                onChange={(e) => setBulkForm({ ...bulkForm, routeId: e.target.value })}
                 className="input"
-                defaultValue={editingSchedule?.routeId}
                 required
               >
                 <option value="">Select Route</option>
-                {routes.map((route: any) => (
+                {routes.map((route: Route) => (
                   <option key={route.id} value={route.id}>
-                    {route.code} - {route.name}
+                    {route.name} ({route.code})
                   </option>
                 ))}
               </select>
             </div>
+          </div>
+
+          <div>
+            <label className="label">Start Date & Time *</label>
+            <input
+              type="datetime-local"
+              value={bulkForm.startDateTime}
+              onChange={(e) => setBulkForm({ ...bulkForm, startDateTime: e.target.value })}
+              className="input"
+              required
+            />
+          </div>
+
+          <div className="grid grid-cols-3 gap-4">
             <div>
-              <label className="label">Departure Time *</label>
+              <label className="label">Duration (Hours)</label>
               <input
-                type="datetime-local"
-                name="departureAt"
+                type="number"
+                min="1"
+                value={bulkForm.durationHours}
+                onChange={(e) => setBulkForm({ ...bulkForm, durationHours: e.target.value })}
                 className="input"
-                defaultValue={editingSchedule?.departureAt?.slice(0, 16)}
-                required
               />
             </div>
+
             <div>
-              <label className="label">Arrival Time *</label>
+              <label className="label">Repeat Every (Days)</label>
               <input
-                type="datetime-local"
-                name="arrivalAt"
+                type="number"
+                min="1"
+                value={bulkForm.repeatEveryDays}
+                onChange={(e) => setBulkForm({ ...bulkForm, repeatEveryDays: e.target.value })}
                 className="input"
-                defaultValue={editingSchedule?.arrivalAt?.slice(0, 16)}
-                required
               />
             </div>
+
             <div>
-              <label className="label">Status</label>
-              <select
-                name="status"
+              <label className="label">For Next (Days)</label>
+              <input
+                type="number"
+                min="1"
+                value={bulkForm.forNextDays}
+                onChange={(e) => setBulkForm({ ...bulkForm, forNextDays: e.target.value })}
                 className="input"
-                defaultValue={editingSchedule?.status || 'SCHEDULED'}
-              >
-                <option value="SCHEDULED">Scheduled</option>
-                <option value="ACTIVE">Active</option>
-                <option value="COMPLETED">Completed</option>
-                <option value="CANCELLED">Cancelled</option>
-              </select>
+              />
             </div>
           </div>
-          
+
+          <div>
+            <label className="label">Coaches (Optional)</label>
+            <div className="border border-border rounded-lg p-3 max-h-64 overflow-y-auto space-y-2">
+              {coaches.length === 0 ? (
+                <p className="text-sm text-muted-foreground">No coaches available</p>
+              ) : (
+                coaches.map((coach: Coach) => (
+                  <label key={coach.id} className="flex items-center gap-2 cursor-pointer">
+                    <input
+                      type="checkbox"
+                      checked={bulkForm.coachIds.includes(coach.id)}
+                      onChange={(e) => {
+                        if (e.target.checked) {
+                          setBulkForm({
+                            ...bulkForm,
+                            coachIds: [...bulkForm.coachIds, coach.id],
+                          });
+                        } else {
+                          setBulkForm({
+                            ...bulkForm,
+                            coachIds: bulkForm.coachIds.filter((id) => id !== coach.id),
+                          });
+                        }
+                      }}
+                      className="rounded"
+                    />
+                    <span className="text-sm">
+                      {coach.number || coach.coachNumber} - {coach.coachType?.name} (Cap: {coach.capacity})
+                    </span>
+                  </label>
+                ))
+              )}
+            </div>
+          </div>
+
+          <div className="bg-blue-50 p-4 rounded-lg">
+            <p className="text-sm text-blue-900">
+              <strong>Preview:</strong> Will create approximately{' '}
+              <strong>{Math.ceil(parseInt(bulkForm.forNextDays) / parseInt(bulkForm.repeatEveryDays))}</strong>{' '}
+              schedules, starting from the specified date, repeating every{' '}
+              <strong>{bulkForm.repeatEveryDays}</strong> days for the next{' '}
+              <strong>{bulkForm.forNextDays}</strong> days.
+              {bulkForm.coachIds.length > 0 && (
+                <>
+                  {' '}
+                  Each schedule will have <strong>{bulkForm.coachIds.length}</strong> coach(es) assigned.
+                </>
+              )}
+            </p>
+          </div>
+
           <div className="flex justify-end gap-2 pt-4">
             <ActionButton
               type="button"
               variant="secondary"
               onClick={() => {
                 setShowModal(false);
-                setEditingSchedule(null);
+                setError(null);
+                setBulkForm({
+                  trainId: '',
+                  routeId: '',
+                  startDateTime: '',
+                  durationHours: '12',
+                  repeatEveryDays: '1',
+                  forNextDays: '30',
+                  coachIds: [],
+                });
               }}
             >
               Cancel
             </ActionButton>
-            <ActionButton
-              type="submit"
-              loading={createMutation.isPending || updateMutation.isPending}
-            >
-              {editingSchedule ? 'Update' : 'Create'} Schedule
+            <ActionButton type="submit" loading={bulkGenerateMutation.isPending}>
+              Generate Schedules
             </ActionButton>
           </div>
         </form>
       </Modal>
 
-      {/* Coach Assignment Modal */}
       <Modal
-        isOpen={showCoachModal}
+        isOpen={showEditModal}
         onClose={() => {
-          setShowCoachModal(false);
-          setSelectedSchedule(null);
-          setSelectedCoaches([]);
+          setShowEditModal(false);
+          setEditingSchedule(null);
+          setError(null);
         }}
-        title="Assign Coaches to Schedule"
+        title={`Edit Schedule - ${editingSchedule?.train?.name} (${editingSchedule?.train?.number})`}
         size="lg"
       >
-        <div className="space-y-4">
-          <p className="text-sm text-muted-foreground">
-            Select coaches to assign to this schedule. Coaches will be ordered by selection.
-          </p>
+        {editingSchedule && (
+          <form onSubmit={handleEditSubmit} className="space-y-4">
+            {error && (
+              <div className="bg-red-50 p-3 rounded-lg text-sm text-red-800">
+                {error}
+              </div>
+            )}
 
-          <div className="grid grid-cols-1 gap-3 max-h-96 overflow-y-auto">
-            {coaches.map((coach: any) => {
-              const isSelected = selectedCoaches.some(c => c.coachId === coach.id);
-              const position = selectedCoaches.find(c => c.coachId === coach.id)?.positionNumber;
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+              <div>
+                <label className="label">Departure Date & Time *</label>
+                <input
+                  type="datetime-local"
+                  value={editForm.departureAt}
+                  onChange={(e) => setEditForm({ ...editForm, departureAt: e.target.value })}
+                  className="input"
+                  required
+                />
+              </div>
 
-              return (
-                <div
-                  key={coach.id}
-                  onClick={() => handleToggleCoach(coach.id)}
-                  className={`p-4 border rounded-lg cursor-pointer transition-colors ${
-                    isSelected
-                      ? 'border-edr-green-600 bg-edr-green-50 dark:bg-edr-green-900/20'
-                      : 'border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600'
-                  }`}
-                >
-                  <div className="flex items-center justify-between">
-                    <div>
-                      <div className="font-medium">{coach.label}</div>
-                      <div className="text-sm text-muted-foreground">
-                        {coach.coachNumber} • {coach.seatClass?.name || 'N/A'} • {coach.totalUnits} seats
-                      </div>
-                    </div>
-                    {isSelected && (
-                      <div className="flex items-center gap-2">
-                        <Badge variant="status" status="CONFIRMED">
-                          Position {position}
-                        </Badge>
-                      </div>
-                    )}
-                  </div>
-                </div>
-              );
-            })}
-          </div>
-
-          {selectedCoaches.length > 0 && (
-            <div className="p-3 bg-gray-50 dark:bg-gray-800 rounded-lg">
-              <div className="text-sm font-medium mb-2">Selected Coaches ({selectedCoaches.length}):</div>
-              <div className="flex flex-wrap gap-2">
-                {selectedCoaches
-                  .sort((a, b) => a.positionNumber - b.positionNumber)
-                  .map(sc => {
-                    const coach = coaches.find((c: any) => c.id === sc.coachId);
-                    return (
-                      <Badge key={sc.coachId} variant="status" status="CONFIRMED">
-                        {sc.positionNumber}. {coach?.label || 'Unknown'}
-                      </Badge>
-                    );
-                  })}
+              <div>
+                <label className="label">Arrival Date & Time *</label>
+                <input
+                  type="datetime-local"
+                  value={editForm.arrivalAt}
+                  onChange={(e) => setEditForm({ ...editForm, arrivalAt: e.target.value })}
+                  className="input"
+                  required
+                />
               </div>
             </div>
-          )}
 
-          <div className="flex justify-end gap-2 pt-4">
-            <ActionButton
-              type="button"
-              variant="secondary"
-              onClick={() => {
-                setShowCoachModal(false);
-                setSelectedSchedule(null);
-                setSelectedCoaches([]);
-              }}
-            >
-              Cancel
-            </ActionButton>
-            <ActionButton
-              type="button"
-              onClick={handleSubmitCoaches}
-              loading={assignCoachesMutation.isPending}
-              disabled={selectedCoaches.length === 0}
-            >
-              Assign {selectedCoaches.length} Coach{selectedCoaches.length !== 1 ? 'es' : ''}
-            </ActionButton>
-          </div>
-        </div>
+            <div>
+              <label className="label">Status</label>
+              <select
+                value={editForm.status}
+                onChange={(e) => setEditForm({ ...editForm, status: e.target.value })}
+                className="input"
+              >
+                <option value="SCHEDULED">Scheduled</option>
+                <option value="BOARDING">Boarding</option>
+                <option value="EN_ROUTE">En Route</option>
+                <option value="ARRIVED">Arrived</option>
+                <option value="CANCELLED">Cancelled</option>
+              </select>
+            </div>
+
+            <div>
+              <label className="label">Coaches</label>
+              <div className="border border-border rounded-lg p-3 max-h-64 overflow-y-auto space-y-2">
+                {coaches.length === 0 ? (
+                  <p className="text-sm text-muted-foreground">No coaches available</p>
+                ) : (
+                  coaches.map((coach: Coach) => (
+                    <label key={coach.id} className="flex items-center gap-2 cursor-pointer">
+                      <input
+                        type="checkbox"
+                        checked={editForm.coachIds.includes(coach.id)}
+                        onChange={(e) => {
+                          if (e.target.checked) {
+                            setEditForm({
+                              ...editForm,
+                              coachIds: [...editForm.coachIds, coach.id],
+                            });
+                          } else {
+                            setEditForm({
+                              ...editForm,
+                              coachIds: editForm.coachIds.filter((id) => id !== coach.id),
+                            });
+                          }
+                        }}
+                        className="rounded"
+                      />
+                      <span className="text-sm">
+                        {coach.number || coach.coachNumber} - {coach.coachType?.name} (Cap: {coach.capacity})
+                      </span>
+                    </label>
+                  ))
+                )}
+              </div>
+            </div>
+
+            <div className="flex justify-end gap-2 pt-4">
+              <ActionButton
+                type="button"
+                variant="secondary"
+                onClick={() => {
+                  setShowEditModal(false);
+                  setEditingSchedule(null);
+                  setError(null);
+                }}
+              >
+                Cancel
+              </ActionButton>
+              <ActionButton type="submit" loading={updateScheduleMutation.isPending}>
+                Update Schedule
+              </ActionButton>
+            </div>
+          </form>
+        )}
       </Modal>
     </div>
   );
diff --git a/apps/edr-passenger-web/backoffice/src/app/seat-classes/page.tsx b/apps/edr-passenger-web/backoffice/src/app/seat-classes/page.tsx
deleted file mode 100644
index 04af0f707..000000000
--- a/apps/edr-passenger-web/backoffice/src/app/seat-classes/page.tsx
+++ /dev/null
@@ -1,236 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { Download, Plus, Edit, Trash2 } from 'lucide-react';
-import DataTable from '@/components/ui/DataTable';
-import Badge from '@/components/ui/Badge';
-import ActionButton from '@/components/ui/ActionButton';
-import Modal from '@/components/ui/Modal';
-import ConfirmDialog from '@/components/ui/ConfirmDialog';
-import { seatClassesApi } from '@/lib/api';
-import { formatDateTime, formatCurrency } from '@/lib/utils';
-
-export default function SeatClassesPage() {
-  const [filters, setFilters] = useState({ search: '' });
-  const [showModal, setShowModal] = useState(false);
-  const [editingSeatClass, setEditingSeatClass] = useState<any>(null);
-  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; seatClass: any | null }>({ isOpen: false, seatClass: null });
-  const queryClient = useQueryClient();
-
-  const { data, isLoading } = useQuery({
-    queryKey: ['seat-classes', filters],
-    queryFn: () => seatClassesApi.getAll(),
-  });
-
-  const createMutation = useMutation({
-    mutationFn: seatClassesApi.create,
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['seat-classes'] });
-      setShowModal(false);
-      setEditingSeatClass(null);
-    },
-  });
-
-  const updateMutation = useMutation({
-    mutationFn: ({ id, data }: { id: string; data: any }) => seatClassesApi.update(id, data),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['seat-classes'] });
-      setShowModal(false);
-      setEditingSeatClass(null);
-    },
-  });
-
-  const deleteMutation = useMutation({
-    mutationFn: seatClassesApi.delete,
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['seat-classes'] });
-    },
-  });
-
-  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    const formData = new FormData(e.currentTarget);
-    const seatClassData = {
-      name: formData.get('name') as string,
-      description: formData.get('description') as string,
-      basePrice: Math.round(parseFloat(formData.get('basePrice') as string) * 100), // Convert to minor units
-      isActive: formData.get('isActive') === 'true',
-    };
-
-    if (editingSeatClass) {
-      await updateMutation.mutateAsync({ id: editingSeatClass.id, data: seatClassData });
-    } else {
-      await createMutation.mutateAsync(seatClassData);
-    }
-  };
-
-  const handleDelete = (seatClass: any) => {
-    setDeleteConfirm({ isOpen: true, seatClass });
-  };
-
-  const confirmDelete = async () => {
-    if (deleteConfirm.seatClass) {
-      await deleteMutation.mutateAsync(deleteConfirm.seatClass.id);
-      setDeleteConfirm({ isOpen: false, seatClass: null });
-    }
-  };
-
-  const columns = [
-    { key: 'name', label: 'Name', render: (cls: any) => <span className="font-medium">{cls.name}</span> },
-    { key: 'description', label: 'Description', render: (cls: any) => cls.description || 'N/A' },
-    { key: 'basePrice', label: 'Base Price', render: (cls: any) => formatCurrency(cls.basePrice, 'ETB') },
-    { key: 'isActive', label: 'Status', render: (cls: any) => <Badge variant="status" status={cls.isActive ? 'CONFIRMED' : 'CANCELLED'}>{cls.isActive ? 'Active' : 'Inactive'}</Badge> },
-  ];
-
-  const actions = [
-    {
-      label: 'Edit',
-      onClick: (seatClass: any) => {
-        setEditingSeatClass(seatClass);
-        setShowModal(true);
-      },
-      variant: 'secondary' as const,
-      icon: Edit,
-    },
-    {
-      label: 'Delete',
-      onClick: handleDelete,
-      variant: 'danger' as const,
-      icon: Trash2,
-    },
-  ];
-
-  return (
-    <div className="space-y-6">
-      <div className="flex items-center justify-between">
-        <div>
-          <h1 className="text-2xl font-bold text-foreground">Classes</h1>
-          <p className="text-muted-foreground">Manage seat class configurations</p>
-        </div>
-        <div className="flex gap-2">
-          <ActionButton icon={Download} variant="secondary">Export</ActionButton>
-          <ActionButton
-            icon={Plus}
-            onClick={() => {
-              setEditingSeatClass(null);
-              setShowModal(true);
-            }}
-          >
-            Add Seat Class
-          </ActionButton>
-        </div>
-      </div>
-
-      <div className="card">
-        <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-          <div>
-            <label className="label">Search</label>
-            <input type="text" placeholder="Search..." className="input" value={filters.search} onChange={(e) => setFilters({ ...filters, search: e.target.value })} />
-          </div>
-        </div>
-      </div>
-
-      <DataTable
-        data={(data as any)?.items || (Array.isArray(data) ? data : [])}
-        columns={columns}
-        actions={actions}
-        loading={isLoading}
-        emptyMessage="No seat classes found"
-      />
-
-      {/* Delete Confirmation */}
-      <ConfirmDialog
-        isOpen={deleteConfirm.isOpen}
-        onClose={() => setDeleteConfirm({ isOpen: false, seatClass: null })}
-        onConfirm={confirmDelete}
-        title="Delete Seat Class"
-        message={`Are you sure you want to delete ${deleteConfirm.seatClass?.name}?`}
-        confirmText="Delete"
-        isDanger={true}
-        warning="This seat class may be used by coaches and trips. Deleting it may impact fare calculations and seat assignments."
-      />
-
-      {/* Add/Edit Modal */}
-      <Modal
-        isOpen={showModal}
-        onClose={() => {
-          setShowModal(false);
-          setEditingSeatClass(null);
-        }}
-        title={`${editingSeatClass ? 'Edit' : 'Add'} Seat Class`}
-        size="lg"
-      >
-        <form onSubmit={handleSubmit} className="space-y-4">
-          <div className="grid grid-cols-1 gap-4">
-            <div>
-              <label className="label">Class Name *</label>
-              <input
-                type="text"
-                name="name"
-                className="input"
-                defaultValue={editingSeatClass?.name}
-                required
-                placeholder="e.g., Economy Regular"
-              />
-            </div>
-            <div>
-              <label className="label">Description</label>
-              <textarea
-                name="description"
-                className="input"
-                rows={3}
-                defaultValue={editingSeatClass?.description}
-                placeholder="Describe the seat class..."
-              />
-            </div>
-            <div>
-              <label className="label">Base Price (ETB) *</label>
-              <input
-                type="number"
-                name="basePrice"
-                className="input"
-                defaultValue={editingSeatClass?.basePrice ? (editingSeatClass.basePrice / 100).toFixed(2) : ''}
-                required
-                min="0"
-                step="0.01"
-                placeholder="e.g., 450.00"
-              />
-              <p className="text-xs text-gray-500 mt-1">Enter amount in ETB (e.g., 450.00)</p>
-            </div>
-            <div>
-              <label className="label">Status</label>
-              <select
-                name="isActive"
-                className="input"
-                defaultValue={editingSeatClass?.isActive?.toString() || 'true'}
-              >
-                <option value="true">Active</option>
-                <option value="false">Inactive</option>
-              </select>
-            </div>
-          </div>
-          
-          <div className="flex justify-end gap-2 pt-4">
-            <ActionButton
-              type="button"
-              variant="secondary"
-              onClick={() => {
-                setShowModal(false);
-                setEditingSeatClass(null);
-              }}
-            >
-              Cancel
-            </ActionButton>
-            <ActionButton
-              type="submit"
-              loading={createMutation.isPending || updateMutation.isPending}
-            >
-              {editingSeatClass ? 'Update' : 'Create'} Seat Class
-            </ActionButton>
-          </div>
-        </form>
-      </Modal>
-    </div>
-  );
-}
diff --git a/apps/edr-passenger-web/backoffice/src/app/seats/page.tsx b/apps/edr-passenger-web/backoffice/src/app/seats/page.tsx
index 605abc699..62056e21a 100644
--- a/apps/edr-passenger-web/backoffice/src/app/seats/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/seats/page.tsx
@@ -4,14 +4,13 @@ import { useState } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { seatsApi, schedulesApi } from '@/lib/api';
 import Modal from '@/components/ui/Modal';
-import ActionButton from '@/components/ui/ActionButton';
-import Badge from '@/components/ui/Badge';
-import { Search, Armchair, Lock, Unlock, ChevronRight } from 'lucide-react';
+import ActionButton from '@/components/ui/ActionButton'
+import { Armchair, Lock, Unlock, Bed, X, RotateCcw } from 'lucide-react';
 
 export default function SeatsPage() {
-  const [search, setSearch] = useState('');
   const [selectedSchedule, setSelectedSchedule] = useState('');
   const [showBlockModal, setShowBlockModal] = useState(false);
+  const [showRemoveModal, setShowRemoveModal] = useState(false);
   const [selectedSeat, setSelectedSeat] = useState<any>(null);
   const [blockReason, setBlockReason] = useState('');
   const queryClient = useQueryClient();
@@ -44,6 +43,22 @@ export default function SeatsPage() {
     },
   });
 
+  const removeSeatMutation = useMutation({
+    mutationFn: (seatId: string) => seatsApi.removeSeat(seatId),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['seatmap'] });
+      setShowRemoveModal(false);
+      setSelectedSeat(null);
+    },
+  });
+
+  const undoRemoveMutation = useMutation({
+    mutationFn: (seatId: string) => seatsApi.undoRemove(seatId),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['seatmap'] });
+    },
+  });
+
   const schedules = schedulesData?.items || schedulesData?.data || [];
   const coaches = seatMapData?.coaches || [];
 
@@ -58,6 +73,17 @@ export default function SeatsPage() {
     }
   };
 
+  const handleRemoveSeat = (seat: any) => {
+    setSelectedSeat(seat);
+    setShowRemoveModal(true);
+  };
+
+  const handleUndoRemove = async (seat: any) => {
+    if (confirm('Restore this removed seat?')) {
+      await undoRemoveMutation.mutateAsync(seat.id);
+    }
+  };
+
   const submitBlock = async () => {
     if (!blockReason.trim()) {
       alert('Please provide a reason for blocking');
@@ -66,6 +92,10 @@ export default function SeatsPage() {
     await blockMutation.mutateAsync({ seatId: selectedSeat.id, reason: blockReason });
   };
 
+  const submitRemoveSeat = async () => {
+    await removeSeatMutation.mutateAsync(selectedSeat.id);
+  };
+
   const getSeatStatus = (seat: any) => {
     if (seat.status === 'BLOCKED' || seat.isBlocked) return 'BLOCKED';
     if (seat.status === 'BOOKED' || seat.isBooked) return 'BOOKED';
@@ -83,9 +113,226 @@ export default function SeatsPage() {
     }
   };
 
-  const filteredCoaches = coaches.filter((coach: any) =>
-    search ? coach.coachNumber?.toLowerCase().includes(search.toLowerCase()) : true
-  );
+  const parseSeatArrangement = (arrangement: string | null): number[] => {
+    if (!arrangement) return [2, 2];
+    const parts = arrangement.split('+').map(p => parseInt(p.trim()));
+    return parts.length === 2 ? parts : [2, 2];
+  };
+
+  const getBedLabel = (bedPosition: string | null): string => {
+    if (bedPosition === 'upper') return 'U';
+    if (bedPosition === 'middle') return 'M';
+    if (bedPosition === 'lower') return 'L';
+    return '';
+  };
+
+  const renderCoachSeats = (coach: any, isBedCoach: boolean) => {
+    const allSeats = coach.seats || [];
+    const validSeats = allSeats.filter((s: any) => s.seatNumber && !s.seatNumber.startsWith('-'));
+    const removedSeats = allSeats.filter((s: any) => s.seatNumber && s.seatNumber.startsWith('-'));
+
+    if (validSeats.length === 0 && removedSeats.length === 0) {
+      return <div className="text-xs text-muted-foreground">No seats</div>;
+    }
+
+    const hasBedPositionData = validSeats.some((s: any) => s.bedPosition);
+
+    if (isBedCoach && hasBedPositionData) {
+      // Render bed coach with flipping effect and bed position labels
+      const arrangement = parseSeatArrangement(coach.seatArrangement);
+      const seatsPerRow = arrangement[0] + (arrangement[1] || 0);
+      const allSeatsForLayout = [...validSeats, ...removedSeats];
+      const rows = [];
+      const seatClassStr = typeof coach?.seatClass === 'string' ? coach.seatClass : (coach?.seatClass?.name || '');
+      const isVipBed = seatClassStr.toLowerCase().includes('vip');
+      const bedWidth = isVipBed ? 'w-24' : 'w-16';
+
+      for (let i = 0; i < allSeatsForLayout.length; i += seatsPerRow) {
+        rows.push(allSeatsForLayout.slice(i, i + seatsPerRow));
+      }
+
+      return (
+        <div className="space-y-0">
+          {rows.map((rowSeats: any[], idx: number) => {
+            const rowNumber = rowSeats[0]?.row || (idx + 1);
+            const shouldFlipIcon = rowNumber % 2 === 0;
+            const shouldFlipRow = rowNumber % 2 === 1;
+            const showSpacing = idx % 2 === 1;
+
+            return (
+              <div key={`bed-row-${idx}`}>
+                {shouldFlipIcon && (
+                  <div className="flex gap-0.5 justify-start text-xs text-muted-foreground mb-1">
+                    {rowSeats.map((seat: any) => (
+                      <div key={`num-before-${seat.id}`} className={`${bedWidth} h-4 flex items-center justify-center text-xs font-bold mb-0.5 h-3 leading-3 text-foreground`}>
+                        {seat.seatNumber && !seat.seatNumber.startsWith('-') ? `${seat.seatNumber}${getBedLabel(seat.bedPosition)}` : ''}
+                      </div>
+                    ))}
+                  </div>
+                )}
+                <div className="flex gap-0.5 justify-start">
+                  {rowSeats.map((seat: any) => (
+                    <SeatIcon
+                      key={seat.id}
+                      seat={seat}
+                      coach={coach}
+                      isBedCoach={true}
+                      shouldFlipIcon={shouldFlipIcon}
+                      getSeatStatus={getSeatStatus}
+                      getSeatColor={getSeatColor}
+                      handleBlock={handleBlock}
+                      handleRemoveSeat={handleRemoveSeat}
+                      handleUnblock={handleUnblock}
+                      handleUndoRemove={handleUndoRemove}
+                      hideNumber={true}
+                    />
+                  ))}
+                </div>
+                {!shouldFlipIcon && (
+                  <div className="flex gap-0.5 justify-start text-xs text-muted-foreground mb-1">
+                    {rowSeats.map((seat: any) => (
+                      <div key={`num-after-${seat.id}`} className={`${bedWidth} h-4 flex items-center justify-center text-xs font-bold mb-0.5 h-3 leading-3 text-foreground`}>
+                        {seat.seatNumber && !seat.seatNumber.startsWith('-') ? `${seat.seatNumber}${getBedLabel(seat.bedPosition)}` : ''}
+                      </div>
+                    ))}
+                  </div>
+                )}
+                {showSpacing && <div className="h-2" />}
+              </div>
+            );
+          })}
+        </div>
+      );
+    }
+
+    // Regular armchair layout
+    const arrangement = parseSeatArrangement(coach.seatArrangement);
+    const leftCount = arrangement[0];
+    const rightCount = arrangement[1] || 0;
+
+    const rows = [];
+    const processedRows = new Set();
+    const allSeatsForLayout = [...validSeats, ...removedSeats];
+    for (const seat of allSeatsForLayout) {
+      if (!processedRows.has(seat.row)) {
+        rows.push(allSeatsForLayout.filter((s: any) => s.row === seat.row).sort((a: any, b: any) => {
+          const colA = a.col.charCodeAt(0);
+          const colB = b.col.charCodeAt(0);
+          return colA - colB;
+        }));
+        processedRows.add(seat.row);
+      }
+    }
+
+    return (
+      <div className="space-y-0">
+        {rows.map((rowSeats: any[], rowIdx: number) => {
+          const leftSeats = rowSeats.slice(0, leftCount);
+          const rightSeats = rowSeats.slice(leftCount);
+          const rowNumber = rowSeats[0]?.row || 1;
+          const shouldFlipArmchair = rowNumber % 2 === 0;
+          const shouldFlipRow = rowNumber % 2 === 0;
+          const showSpacing = rowIdx % 2 === 1;
+
+          return (
+            <div key={`row-${rowSeats[0]?.id}`}>
+              {shouldFlipArmchair && (
+                <div className="flex gap-0.5 justify-start text-xs text-muted-foreground mb-1">
+                  <div className="flex gap-0.5">
+                    {leftSeats.map((seat: any) => (
+                      <div key={`num-before-left-${seat.id}`} className="w-11 h-4 flex items-center justify-center text-xs font-bold mb-0.5 h-3 leading-3 text-foreground">
+                        {seat.seatNumber && !seat.seatNumber.startsWith('-') ? seat.seatNumber : ''}
+                      </div>
+                    ))}
+                  </div>
+                  {rightSeats.length > 0 && <div className="w-3" />}
+                  {rightSeats.length > 0 && (
+                    <div className="flex gap-0.5">
+                      {rightSeats.map((seat: any) => (
+                        <div key={`num-before-right-${seat.id}`} className="w-11 h-4 flex items-center justify-center text-xs font-bold mb-0.5 h-3 leading-3 text-foreground">
+                          {seat.seatNumber && !seat.seatNumber.startsWith('-') ? seat.seatNumber : ''}
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
+              <div className="flex gap-0.5 justify-start">
+                <div className="flex gap-0.5">
+                  {leftSeats.map((seat: any) => (
+                    <SeatIcon
+                      key={seat.id}
+                      seat={seat}
+                      coach={coach}
+                      isBedCoach={false}
+                      shouldFlipIcon={shouldFlipArmchair}
+                      getSeatStatus={getSeatStatus}
+                      getSeatColor={getSeatColor}
+                      handleBlock={handleBlock}
+                      handleRemoveSeat={handleRemoveSeat}
+                      handleUnblock={handleUnblock}
+                      handleUndoRemove={handleUndoRemove}
+                      hideNumber={true}
+                    />
+                  ))}
+                </div>
+                {rightSeats.length > 0 && <div className="w-3" />}
+                {rightSeats.length > 0 && (
+                  <div className="flex gap-0.5">
+                    {rightSeats.map((seat: any) => (
+                      <SeatIcon
+                        key={seat.id}
+                        seat={seat}
+                        coach={coach}
+                        isBedCoach={false}
+                        shouldFlipIcon={shouldFlipArmchair}
+                        getSeatStatus={getSeatStatus}
+                        getSeatColor={getSeatColor}
+                        handleBlock={handleBlock}
+                        handleRemoveSeat={handleRemoveSeat}
+                        handleUnblock={handleUnblock}
+                        handleUndoRemove={handleUndoRemove}
+                        hideNumber={true}
+                      />
+                    ))}
+                  </div>
+                )}
+              </div>
+
+              {!shouldFlipArmchair && (
+                <div className="flex gap-0.5 justify-start text-xs text-muted-foreground mb-1">
+                  <div className="flex gap-0.5">
+                    {leftSeats.map((seat: any) => (
+                      <div key={`num-left-${seat.id}`} className="w-11 h-4 flex items-center justify-center text-xs font-bold mb-0.5 h-3 leading-3 text-foreground">
+                        {seat.seatNumber && !seat.seatNumber.startsWith('-') ? seat.seatNumber : ''}
+                      </div>
+                    ))}
+                  </div>
+                  {rightSeats.length > 0 && <div className="w-3" />}
+                  {rightSeats.length > 0 && (
+                    <div className="flex gap-0.5">
+                      {rightSeats.map((seat: any) => (
+                        <div key={`num-right-${seat.id}`} className="w-11 h-4 flex items-center justify-center text-xs font-bold mb-0.5 h-3 leading-3 text-foreground">
+                          {seat.seatNumber && !seat.seatNumber.startsWith('-') ? seat.seatNumber : ''}
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
+
+              {showSpacing && <div className="h-2" />}
+            </div>
+          );
+        })}
+      </div>
+    );
+  };
+
+  const coachesWithSeats = coaches.filter((coach: any) => {
+    const seats = (coach.seats || []).filter((s: any) => s.seatNumber);
+    return seats.length > 0;
+  });
 
   return (
     <div className="space-y-6">
@@ -97,40 +344,25 @@ export default function SeatsPage() {
       </div>
 
       <div className="card">
-        <div className="flex items-center gap-4 mb-6">
-          <div className="flex-1">
-            <label className="label">Select Schedule</label>
-            <select
-              value={selectedSchedule}
-              onChange={(e) => setSelectedSchedule(e.target.value)}
-              className="input"
-            >
-              <option value="">Select a schedule...</option>
-              {schedules.map((schedule: any) => {
-                const trainNumber = schedule.train?.trainNumber || schedule.train?.name || 'N/A';
-                const routeName = schedule.route?.name || 'N/A';
-                const date = schedule.departureAt ? new Date(schedule.departureAt).toLocaleDateString() : 'N/A';
-                return (
-                  <option key={schedule.id} value={schedule.id}>
-                    {trainNumber} - {routeName} - {date}
-                  </option>
-                );
-              })}
-            </select>
-          </div>
-          <div className="relative flex-1">
-            <label className="label">Search Coaches</label>
-            <div className="relative">
-              <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
-              <input
-                type="text"
-                placeholder="Search by coach number..."
-                value={search}
-                onChange={(e) => setSearch(e.target.value)}
-                className="input pl-10"
-              />
-            </div>
-          </div>
+        <div className="mb-6">
+          <label className="label">Select Schedule</label>
+          <select
+            value={selectedSchedule}
+            onChange={(e) => setSelectedSchedule(e.target.value)}
+            className="input"
+          >
+            <option value="">Select a schedule...</option>
+            {schedules.map((schedule: any) => {
+              const trainNumber = schedule.train?.trainNumber || schedule.train?.name || 'N/A';
+              const routeName = schedule.route?.name || 'N/A';
+              const date = schedule.departureAt ? new Date(schedule.departureAt).toLocaleDateString() : 'N/A';
+              return (
+                <option key={schedule.id} value={schedule.id}>
+                  {trainNumber} - {routeName} - {date}
+                </option>
+              );
+            })}
+          </select>
         </div>
 
         {!selectedSchedule ? (
@@ -143,13 +375,12 @@ export default function SeatsPage() {
             <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto"></div>
             <p className="text-muted-foreground mt-3">Loading seats...</p>
           </div>
-        ) : filteredCoaches.length === 0 ? (
+        ) : coachesWithSeats.length === 0 ? (
           <div className="text-center py-12 text-muted-foreground">
-            <p>No coaches found for this schedule</p>
+            <p>No coaches with seats found for this schedule</p>
           </div>
         ) : (
           <div className="space-y-6">
-            {/* Legend */}
             <div className="flex items-center gap-6 p-4 bg-muted/50 rounded-lg">
               <div className="flex items-center gap-2">
                 <div className="w-4 h-4 rounded bg-green-500"></div>
@@ -167,86 +398,35 @@ export default function SeatsPage() {
                 <div className="w-4 h-4 rounded bg-gray-500"></div>
                 <span className="text-sm">Blocked</span>
               </div>
+              <div className="flex items-center gap-2">
+                <div className="w-4 h-4 rounded border-2 border-dashed border-gray-400"></div>
+                <span className="text-sm">Removed</span>
+              </div>
             </div>
 
-            {/* Coaches */}
-            {filteredCoaches.map((coach: any) => {
-              const seats = coach.seats || [];
-              const seatClass = coach.seatClass?.name || 'N/A';
-              const availableCount = seats.filter((s: any) => getSeatStatus(s) === 'AVAILABLE').length;
-              const bookedCount = seats.filter((s: any) => getSeatStatus(s) === 'BOOKED').length;
-              const blockedCount = seats.filter((s: any) => getSeatStatus(s) === 'BLOCKED').length;
+            <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
+              {coachesWithSeats.map((coach: any) => {
+                const isBedCoach = (coach.seatClass && coach.seatClass.toLowerCase().includes('bed')) ||
+                  (coach.mode && coach.mode.toLowerCase().includes('bed'));
+                const seats = (coach.seats || []).filter((s: any) => s.seatNumber);
 
-              return (
-                <div key={coach.id} className="border rounded-lg p-4">
-                  <div className="flex items-center justify-between mb-4">
-                    <div>
-                      <h3 className="text-lg font-semibold">
-                        Coach {coach.coachNumber} - {coach.label}
-                      </h3>
-                      <p className="text-sm text-muted-foreground">
-                        {seatClass} • {seats.length} seats
-                      </p>
+                return (
+                  <div key={coach.id} className="flex flex-col gap-4">
+                    <div className="mb-3">
+                      <h3 className="font-semibold text-sm">Coach {coach.coachNumber}</h3>
                     </div>
-                    <div className="flex gap-3 text-sm">
-                      <span className="text-green-600">Available: {availableCount}</span>
-                      <span className="text-red-600">Booked: {bookedCount}</span>
-                      <span className="text-gray-600">Blocked: {blockedCount}</span>
+
+                    <div className="bg-gray-50 dark:bg-gray-900/30 rounded-lg w-64 border border-gray-200 dark:border-gray-700 p-2">
+                      {renderCoachSeats(coach, isBedCoach)}
                     </div>
                   </div>
-
-                  <div className="grid grid-cols-8 gap-2">
-                    {seats.map((seat: any) => {
-                      const status = getSeatStatus(seat);
-                      const color = getSeatColor(status);
-                      const canBlock = status === 'AVAILABLE';
-                      const canUnblock = status === 'BLOCKED';
-
-                      return (
-                        <div
-                          key={seat.id}
-                          className="relative group"
-                        >
-                          <div
-                            className={`${color} text-white rounded-lg p-2 text-center text-sm font-medium cursor-pointer hover:opacity-80 transition-opacity`}
-                            title={`${seat.seatNumber} - ${status}`}
-                          >
-                            {seat.seatNumber}
-                          </div>
-                          {(canBlock || canUnblock) && (
-                            <div className="absolute inset-0 bg-black/60 rounded-lg opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-1">
-                              {canBlock && (
-                                <button
-                                  onClick={() => handleBlock(seat)}
-                                  className="p-1 bg-white rounded hover:bg-gray-100"
-                                  title="Block seat"
-                                >
-                                  <Lock className="h-3 w-3 text-gray-700" />
-                                </button>
-                              )}
-                              {canUnblock && (
-                                <button
-                                  onClick={() => handleUnblock(seat)}
-                                  className="p-1 bg-white rounded hover:bg-gray-100"
-                                  title="Unblock seat"
-                                >
-                                  <Unlock className="h-3 w-3 text-gray-700" />
-                                </button>
-                              )}
-                            </div>
-                          )}
-                        </div>
-                      );
-                    })}
-                  </div>
-                </div>
-              );
-            })}
+                );
+              })}
+            </div>
           </div>
         )}
       </div>
 
-      {/* Block Modal */}
       <Modal
         isOpen={showBlockModal}
         onClose={() => {
@@ -293,6 +473,168 @@ export default function SeatsPage() {
           </div>
         </div>
       </Modal>
+
+      <Modal
+        isOpen={showRemoveModal}
+        onClose={() => {
+          setShowRemoveModal(false);
+          setSelectedSeat(null);
+        }}
+        title="Remove Seat"
+        size="md"
+      >
+        <div className="space-y-4">
+          <p className="text-sm text-muted-foreground">
+            Remove seat <strong>{selectedSeat?.seatNumber}</strong> from Coach{' '}
+            <strong>{selectedSeat?.coach?.coachNumber}</strong>
+          </p>
+          <div className="bg-yellow-50 border border-yellow-200 rounded-lg p-3">
+            <p className="text-sm text-yellow-800">
+              This will mark the seat as removed. The seat will show as an empty space on the seat map.
+              You can undo this action anytime by clicking the undo button on the removed seat.
+            </p>
+          </div>
+          <div className="flex justify-end gap-2">
+            <ActionButton
+              variant="secondary"
+              onClick={() => {
+                setShowRemoveModal(false);
+                setSelectedSeat(null);
+              }}
+            >
+              Cancel
+            </ActionButton>
+            <ActionButton
+              variant="danger"
+              onClick={submitRemoveSeat}
+              loading={removeSeatMutation.isPending}
+            >
+              Remove Seat
+            </ActionButton>
+          </div>
+        </div>
+      </Modal>
+    </div>
+  );
+}
+
+interface SeatIconProps {
+  seat: any;
+  coach: any;
+  isBedCoach: boolean;
+  shouldFlipIcon?: boolean;
+  hideNumber?: boolean;
+  getSeatStatus: (seat: any) => string;
+  getSeatColor: (status: string) => string;
+  handleBlock: (seat: any) => void;
+  handleRemoveSeat: (seat: any) => void;
+  handleUnblock: (seat: any) => void;
+  handleUndoRemove: (seat: any) => void;
+}
+
+function SeatIcon({
+  seat,
+  coach,
+  isBedCoach,
+  shouldFlipIcon = false,
+  hideNumber = false,
+  getSeatStatus,
+  getSeatColor,
+  handleBlock,
+  handleRemoveSeat,
+  handleUnblock,
+  handleUndoRemove,
+}: SeatIconProps) {
+  const isRemoved = seat.seatNumber && seat.seatNumber.startsWith('-');
+  const seatClassStr = typeof coach?.seatClass === 'string' ? coach.seatClass : (coach?.seatClass?.name || coach?.coachClass || '');
+  const isVipBed = isBedCoach && seatClassStr.toLowerCase().includes('vip');
+  const bedWidth = isVipBed ? 'w-24' : 'w-16';
+  const width = isBedCoach ? bedWidth : 'w-10';
+
+  if (!seat.seatNumber) {
+    return <div className="w-7 h-7" />;
+  }
+
+  if (isRemoved) {
+    return (
+      <div className="relative group flex flex-col items-center">
+        <div className="w-11 h-11 rounded border-2 border-dashed border-gray-400 flex items-center justify-center hover:opacity-80 transition-opacity" title="Removed seat">
+        </div>
+        <div className="absolute top-full mt-1 bg-black/80 rounded shadow-lg flex items-center gap-1 p-1 z-20 opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none group-hover:pointer-events-auto">
+          <button
+            onClick={() => handleUndoRemove(seat)}
+            className="p-1 bg-white rounded hover:bg-gray-100 pointer-events-auto"
+            title="Undo remove"
+          >
+            <RotateCcw className="h-3 w-3 text-gray-700" />
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+  const status = getSeatStatus(seat);
+  const color = getSeatColor(status);
+  const canBlock = status === 'AVAILABLE';
+  const canUnblock = status === 'BLOCKED';
+
+  return (
+    <div className="relative group flex flex-col items-center">
+      {!hideNumber && (
+        <span className="text-xs font-bold mb-0.5 h-3 leading-3 text-foreground">
+          {seat.seatNumber}
+        </span>
+      )}
+
+      {isBedCoach ? (
+        <div
+          className={`${width} h-11 rounded flex items-center justify-center cursor-pointer hover:opacity-80 transition-opacity ${color}`}
+          title={`${seat.seatNumber} - ${seat.bedPosition} - ${status}`}
+          style={seat.row % 2 === 1 ? { transform: 'scaleY(-1)' } : undefined}
+        >
+          <Bed className="w-7 h-7 text-white" />
+        </div>
+      ) : (
+        <div
+          className={`w-11 h-11 rounded flex items-center justify-center cursor-pointer hover:opacity-80 transition-opacity ${color}`}
+          title={`${seat.seatNumber} - ${status}`}
+          style={seat.row % 2 === 0 ? { transform: 'scaleY(-1)' } : undefined}
+        >
+          <Armchair className="w-7 h-7 text-white" />
+        </div>
+      )}
+
+      {(canBlock || canUnblock) && (
+        <div className="absolute top-full mt-1 bg-black/80 rounded shadow-lg flex items-center gap-1 p-1 z-20 opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none group-hover:pointer-events-auto">
+          {canBlock && (
+            <>
+              <button
+                onClick={() => handleBlock(seat)}
+                className="p-1 bg-white rounded hover:bg-gray-100 pointer-events-auto"
+                title="Block seat"
+              >
+                <Lock className="h-3 w-3 text-gray-700" />
+              </button>
+              <button
+                onClick={() => handleRemoveSeat(seat)}
+                className="p-1 bg-white rounded hover:bg-gray-100 pointer-events-auto"
+                title="Remove seat"
+              >
+                <X className="h-3 w-3 text-gray-700" />
+              </button>
+            </>
+          )}
+          {canUnblock && (
+            <button
+              onClick={() => handleUnblock(seat)}
+              className="p-1 bg-white rounded hover:bg-gray-100 pointer-events-auto"
+              title="Unblock seat"
+            >
+              <Unlock className="h-3 w-3 text-gray-700" />
+            </button>
+          )}
+        </div>
+      )}
     </div>
   );
 }
diff --git a/apps/edr-passenger-web/backoffice/src/app/settings/users/page.tsx b/apps/edr-passenger-web/backoffice/src/app/settings/users/page.tsx
index ca24d9472..05120eb15 100644
--- a/apps/edr-passenger-web/backoffice/src/app/settings/users/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/settings/users/page.tsx
@@ -2,57 +2,388 @@
 
 import { useState } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { Search, Edit, Trash2 } from 'lucide-react';
+import { Plus, Edit, Trash2, RefreshCw } from 'lucide-react';
+import DataTable from '@/components/ui/DataTable';
+import Badge from '@/components/ui/Badge';
 import ActionButton from '@/components/ui/ActionButton';
+import Modal from '@/components/ui/Modal';
+import ConfirmDialog from '@/components/ui/ConfirmDialog';
+import { usersApi, BackofficeUser } from '@/lib/api/users';
 
 export default function UserManagementPage() {
-  const [searchTerm, setSearchTerm] = useState('');
+  const [filters, setFilters] = useState({ search: '', role: '', status: '', page: 1, pageSize: 10 });
+  const [showModal, setShowModal] = useState(false);
+  const [editingUser, setEditingUser] = useState<any>(null);
+  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; user: any | null }>({ isOpen: false, user: null });
+  const [resetPasswordModal, setResetPasswordModal] = useState<{ isOpen: boolean; user: any | null }>({ isOpen: false, user: null });
+  const [newPassword, setNewPassword] = useState('');
+  const queryClient = useQueryClient();
+
+  const { data, isLoading } = useQuery({
+    queryKey: ['users', filters],
+    queryFn: () => usersApi.getAll(filters),
+  });
+
+  const createMutation = useMutation({
+    mutationFn: usersApi.create,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['users'] });
+      setShowModal(false);
+      setEditingUser(null);
+    },
+  });
+
+  const updateMutation = useMutation({
+    mutationFn: ({ id, data }: { id: string; data: any }) => usersApi.update(id, data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['users'] });
+      setShowModal(false);
+      setEditingUser(null);
+    },
+  });
+
+  const deleteMutation = useMutation({
+    mutationFn: usersApi.delete,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['users'] });
+    },
+  });
+
+  const resetPasswordMutation = useMutation({
+    mutationFn: ({ id, tempPassword }: { id: string; tempPassword: string }) =>
+      usersApi.resetPassword(id, tempPassword),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['users'] });
+      setResetPasswordModal({ isOpen: false, user: null });
+      setNewPassword('');
+    },
+  });
+
+  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    const formData = new FormData(e.currentTarget);
+    
+    const userData = {
+      email: formData.get('email') as string,
+      fullName: formData.get('fullName') as string,
+      role: formData.get('role') as string,
+      status: formData.get('status') as 'ACTIVE' | 'INACTIVE',
+    } as any;
+
+    if (!editingUser) {
+      userData.password = formData.get('password') as string;
+    }
+
+    if (editingUser) {
+      await updateMutation.mutateAsync({ id: editingUser.id, data: userData });
+    } else {
+      await createMutation.mutateAsync(userData);
+    }
+  };
+
+  const handleDelete = (user: any) => {
+    setDeleteConfirm({ isOpen: true, user });
+  };
+
+  const confirmDelete = async () => {
+    if (deleteConfirm.user) {
+      await deleteMutation.mutateAsync(deleteConfirm.user.id);
+      setDeleteConfirm({ isOpen: false, user: null });
+    }
+  };
+
+  const handleResetPassword = async () => {
+    if (resetPasswordModal.user && newPassword) {
+      await resetPasswordMutation.mutateAsync({
+        id: resetPasswordModal.user.id,
+        tempPassword: newPassword,
+      });
+    }
+  };
+
+  const columns = [
+    {
+      key: 'fullName',
+      label: 'Full Name',
+      sortable: true,
+      render: (user: BackofficeUser) => (
+        <div>
+          <div className="font-medium">{user.fullName}</div>
+          <div className="text-sm text-muted-foreground">{user.email}</div>
+        </div>
+      ),
+    },
+    {
+      key: 'role',
+      label: 'Role',
+      render: (user: BackofficeUser) => (
+        <Badge variant="status" status={user.role}>
+          {user.role}
+        </Badge>
+      ),
+    },
+    {
+      key: 'status',
+      label: 'Status',
+      render: (user: BackofficeUser) => (
+        <Badge variant="status" status={user.status === 'ACTIVE' ? 'CONFIRMED' : 'CANCELLED'}>
+          {user.status}
+        </Badge>
+      ),
+    },
+    {
+      key: 'lastLogin',
+      label: 'Last Login',
+      render: (user: BackofficeUser) => (
+        <span className="text-sm text-muted-foreground">
+          {user.lastLogin ? new Date(user.lastLogin).toLocaleString() : 'Never'}
+        </span>
+      ),
+    },
+  ];
+
+  const actions = [
+    {
+      label: 'Edit',
+      onClick: (user: BackofficeUser) => {
+        setEditingUser(user);
+        setShowModal(true);
+      },
+      variant: 'secondary' as const,
+      icon: Edit,
+    },
+    {
+      label: 'Reset Password',
+      onClick: (user: BackofficeUser) => {
+        setResetPasswordModal({ isOpen: true, user });
+        setNewPassword('');
+      },
+      variant: 'secondary' as const,
+      icon: RefreshCw,
+    },
+    {
+      label: 'Delete',
+      onClick: handleDelete,
+      variant: 'danger' as const,
+      icon: Trash2,
+    },
+  ];
 
   return (
     <div className="space-y-6">
       <div className="flex items-center justify-between">
         <div>
-          <h1 className="text-3xl font-bold text-foreground">User Management</h1>
-          <p className="text-muted-foreground mt-1">Manage system users and permissions</p>
+          <h1 className="text-2xl font-bold text-foreground">User Management</h1>
+          <p className="text-muted-foreground">Manage backoffice users and their permissions</p>
         </div>
+        <ActionButton
+          icon={Plus}
+          onClick={() => {
+            setEditingUser(null);
+            setShowModal(true);
+          }}
+        >
+          Add User
+        </ActionButton>
       </div>
 
+      {/* Filters */}
       <div className="card">
-        <div className="flex gap-4">
-          <div className="relative flex-1">
-            <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+        <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
+          <div>
             <input
               type="text"
-              placeholder="Search users by name or email..."
-              value={searchTerm}
-              onChange={(e) => setSearchTerm(e.target.value)}
-              className="input pl-10"
+              placeholder="Search users..."
+              className="input"
+              value={filters.search}
+              onChange={(e) => setFilters({ ...filters, search: e.target.value, page: 1 })}
             />
           </div>
+          <div>
+            <select
+              className="input"
+              value={filters.role}
+              onChange={(e) => setFilters({ ...filters, role: e.target.value, page: 1 })}
+            >
+              <option value="">All Roles</option>
+              <option value="ADMIN">Admin</option>
+              <option value="SUPERVISOR">Supervisor</option>
+              <option value="STAFF">Staff</option>
+              <option value="AGENT">Agent</option>
+            </select>
+          </div>
+          <div>
+            <select
+              className="input"
+              value={filters.status}
+              onChange={(e) => setFilters({ ...filters, status: e.target.value, page: 1 })}
+            >
+              <option value="">All Status</option>
+              <option value="ACTIVE">Active</option>
+              <option value="INACTIVE">Inactive</option>
+            </select>
+          </div>
         </div>
       </div>
 
-      <div className="card">
-        <div className="overflow-x-auto">
-          <table className="w-full">
-            <thead>
-              <tr className="border-b border-border">
-                <th className="px-4 py-3 text-left text-sm font-semibold text-foreground">Name</th>
-                <th className="px-4 py-3 text-left text-sm font-semibold text-foreground">Email</th>
-                <th className="px-4 py-3 text-left text-sm font-semibold text-foreground">Role</th>
-                <th className="px-4 py-3 text-left text-sm font-semibold text-foreground">Status</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td colSpan={4} className="px-4 py-8 text-center text-muted-foreground">
-                  User management coming soon
-                </td>
-              </tr>
-            </tbody>
-          </table>
+      {/* Users Table */}
+      <DataTable
+        data={data?.items || []}
+        columns={columns}
+        actions={actions}
+        loading={isLoading}
+        emptyMessage="No users found"
+      />
+
+      {/* Delete Confirmation */}
+      <ConfirmDialog
+        isOpen={deleteConfirm.isOpen}
+        onClose={() => setDeleteConfirm({ isOpen: false, user: null })}
+        onConfirm={confirmDelete}
+        title="Delete User"
+        message={`Are you sure you want to delete ${deleteConfirm.user?.fullName}? This action cannot be undone.`}
+        confirmText="Delete"
+        isDanger={true}
+      />
+
+      {/* Reset Password Modal */}
+      <Modal
+        isOpen={resetPasswordModal.isOpen}
+        onClose={() => setResetPasswordModal({ isOpen: false, user: null })}
+        title="Reset User Password"
+      >
+        <div className="space-y-4">
+          <div className="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded p-3 text-sm">
+            <p className="font-semibold text-blue-900 dark:text-blue-200">Temporary Password</p>
+            <p className="text-blue-800 dark:text-blue-300 mt-1">
+              Set a temporary password for {resetPasswordModal.user?.fullName}. They will need to change it on first login.
+            </p>
+          </div>
+          <div>
+            <label className="label">Temporary Password *</label>
+            <input
+              type="password"
+              className="input"
+              value={newPassword}
+              onChange={(e) => setNewPassword(e.target.value)}
+              placeholder="Enter temporary password"
+              required
+            />
+          </div>
+          <div className="flex justify-end gap-2 pt-4">
+            <ActionButton
+              type="button"
+              variant="secondary"
+              onClick={() => setResetPasswordModal({ isOpen: false, user: null })}
+            >
+              Cancel
+            </ActionButton>
+            <ActionButton
+              onClick={handleResetPassword}
+              loading={resetPasswordMutation.isPending}
+              disabled={!newPassword}
+            >
+              Reset Password
+            </ActionButton>
+          </div>
         </div>
-      </div>
+      </Modal>
+
+      {/* Add/Edit Modal */}
+      <Modal
+        isOpen={showModal}
+        onClose={() => {
+          setShowModal(false);
+          setEditingUser(null);
+        }}
+        title={`${editingUser ? 'Edit' : 'Add'} User`}
+        size="lg"
+      >
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <div>
+              <label className="label">Full Name *</label>
+              <input
+                type="text"
+                name="fullName"
+                className="input"
+                defaultValue={editingUser?.fullName}
+                required
+                placeholder="e.g., John Doe"
+              />
+            </div>
+            <div>
+              <label className="label">Email *</label>
+              <input
+                type="email"
+                name="email"
+                className="input"
+                defaultValue={editingUser?.email}
+                required
+                placeholder="e.g., john@example.com"
+                disabled={!!editingUser}
+              />
+            </div>
+            <div>
+              <label className="label">Role *</label>
+              <select
+                name="role"
+                className="input"
+                defaultValue={editingUser?.role || 'STAFF'}
+                required
+              >
+                <option value="ADMIN">Admin</option>
+                <option value="SUPERVISOR">Supervisor</option>
+                <option value="STAFF">Staff</option>
+                <option value="AGENT">Agent</option>
+              </select>
+            </div>
+            <div>
+              <label className="label">Status</label>
+              <select
+                name="status"
+                className="input"
+                defaultValue={editingUser?.status || 'ACTIVE'}
+              >
+                <option value="ACTIVE">Active</option>
+                <option value="INACTIVE">Inactive</option>
+              </select>
+            </div>
+            {!editingUser && (
+              <div>
+                <label className="label">Password *</label>
+                <input
+                  type="password"
+                  name="password"
+                  className="input"
+                  required
+                  placeholder="Minimum 8 characters"
+                  minLength={8}
+                />
+              </div>
+            )}
+          </div>
+
+          <div className="flex justify-end gap-2 pt-4">
+            <ActionButton
+              type="button"
+              variant="secondary"
+              onClick={() => {
+                setShowModal(false);
+                setEditingUser(null);
+              }}
+            >
+              Cancel
+            </ActionButton>
+            <ActionButton
+              type="submit"
+              loading={createMutation.isPending || updateMutation.isPending}
+            >
+              {editingUser ? 'Update' : 'Create'} User
+            </ActionButton>
+          </div>
+        </form>
+      </Modal>
     </div>
   );
 }
diff --git a/apps/edr-passenger-web/backoffice/src/app/stations/page.tsx b/apps/edr-passenger-web/backoffice/src/app/stations/page.tsx
index 021150676..b966d9a9b 100644
--- a/apps/edr-passenger-web/backoffice/src/app/stations/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/stations/page.tsx
@@ -279,7 +279,7 @@ export default function StationsPage() {
                 className="input"
                 defaultValue={editingStation?.name}
                 required
-                placeholder="e.g., Addis Ababa"
+                placeholder="e.g., Lebu"
               />
             </div>
             <div>
diff --git a/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx b/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
index b5d8096a4..5bb7fccb2 100644
--- a/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
@@ -19,13 +19,9 @@ export default function TicketsPage() {
 
   const { data, isLoading, error } = useQuery({
     queryKey: ['tickets', filters],
-    queryFn: () => ticketsApi.getAll(filters),
+    queryFn: () => ticketsApi.getAll({ ...filters, skip: 0, take: 50 }),
   });
 
-  if (error) {
-    console.error('Tickets API Error:', error);
-  }
-
   const regenerateMutation = useMutation({
     mutationFn: ticketsApi.regenerate,
     onSuccess: () => {
diff --git a/apps/edr-passenger-web/backoffice/src/app/trains/page.tsx b/apps/edr-passenger-web/backoffice/src/app/trains/page.tsx
index c6936f52f..9cf98183e 100644
--- a/apps/edr-passenger-web/backoffice/src/app/trains/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/trains/page.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { Plus, Edit, Trash2, Train } from 'lucide-react';
+import { Plus, Edit, Trash2, Train, Search } from 'lucide-react';
 import DataTable from '@/components/ui/DataTable';
 import ActionButton from '@/components/ui/ActionButton';
 import Modal from '@/components/ui/Modal';
@@ -15,6 +15,7 @@ import { formatDate } from '@/lib/utils';
 export default function TrainsPage() {
   const [showModal, setShowModal] = useState(false);
   const [editingTrain, setEditingTrain] = useState<TrainType | null>(null);
+  const [search, setSearch] = useState('');
   const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; train: TrainType | null }>({ isOpen: false, train: null });
   
   const queryClient = useQueryClient();
@@ -86,6 +87,19 @@ export default function TrainsPage() {
     }
   };
 
+  const trains = trainsData?.items || [];
+  
+  const filteredTrains = trains.filter((train: any) => {
+    if (!search) return true;
+    const searchLower = search.toLowerCase();
+    return (
+      train.number.toLowerCase().includes(searchLower) ||
+      train.name.toLowerCase().includes(searchLower) ||
+      train.operatorName?.toLowerCase().includes(searchLower) ||
+      train.description?.toLowerCase().includes(searchLower)
+    );
+  });
+
   const trainColumns = [
     {
       key: 'number',
@@ -168,13 +182,27 @@ export default function TrainsPage() {
         </ActionButton>
       </div>
 
+  {/* Search Filter */}
+      <div className="mb-6">
+        <div className="relative">
+          <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+          <input
+            type="text"
+            placeholder="Search by number, name, or operator..."
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            className="input pl-10 w-full"
+          />
+        </div>
+      </div>
+
       {/* Trains Table */}
       <DataTable
-        data={trainsData?.items || []}
+        data={filteredTrains}
         columns={trainColumns}
         actions={actions}
         loading={trainsLoading}
-        emptyMessage="No trains found"
+        emptyMessage={search ? "No trains match your search" : "No trains found"}
       />
 
       {/* Delete Confirmation */}
@@ -222,7 +250,7 @@ export default function TrainsPage() {
                 className="input"
                 defaultValue={editingTrain?.number}
                 required
-                placeholder="e.g., EDR-001"
+                placeholder="e.g., EDR-101"
               />
             </div>
             <div>
diff --git a/apps/edr-passenger-web/backoffice/src/components/layout/Sidebar.tsx b/apps/edr-passenger-web/backoffice/src/components/layout/Sidebar.tsx
index db462ca00..f7d4601e1 100644
--- a/apps/edr-passenger-web/backoffice/src/components/layout/Sidebar.tsx
+++ b/apps/edr-passenger-web/backoffice/src/components/layout/Sidebar.tsx
@@ -57,12 +57,12 @@ const navigationSections = [
     title: 'Master Data',
     items: [
       { name: 'Stations', href: '/stations', icon: MapPin },
-      { name: 'Routes', href: '/routes', icon: Route },
       { name: 'Trains', href: '/trains', icon: Train },
       { name: 'Coaches', href: '/coaches', icon: Grid3x3 },
       { name: 'Seats', href: '/seats', icon: Armchair },
+      { name: 'Classes', href: '/classes', icon: Settings },
+      { name: 'Routes', href: '/routes', icon: Route },
       { name: 'Schedules', href: '/schedules', icon: Calendar },
-      { name: 'Classes', href: '/seat-classes', icon: Settings },
     ]
   },
   {
@@ -70,7 +70,7 @@ const navigationSections = [
     items: [
       { name: 'Pricing & Fares', href: '/pricing', icon: DollarSign },
       { name: 'Payments', href: '/payments', icon: CreditCard },
-      { name: 'Promotions', href: '/promotions', icon: Gift },
+      { name: 'Promo Codes', href: '/promos', icon: Gift },
     ]
   },
   {
diff --git a/apps/edr-passenger-web/backoffice/src/components/ui/Pagination.tsx b/apps/edr-passenger-web/backoffice/src/components/ui/Pagination.tsx
index e04821fbb..e191c6d2d 100644
--- a/apps/edr-passenger-web/backoffice/src/components/ui/Pagination.tsx
+++ b/apps/edr-passenger-web/backoffice/src/components/ui/Pagination.tsx
@@ -7,8 +7,12 @@ interface PaginationProps {
 }
 
 export default function Pagination({ currentPage, totalPages, onPageChange }: PaginationProps) {
+  if (totalPages <= 1) {
+    return null;
+  }
+
   return (
-    <div className="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
+    <div className="flex items-center justify-between border-t border-border bg-card px-4 py-3 sm:px-6">
       <div className="flex flex-1 justify-between sm:hidden">
         <button
           onClick={() => onPageChange(currentPage - 1)}
@@ -27,7 +31,7 @@ export default function Pagination({ currentPage, totalPages, onPageChange }: Pa
       </div>
       <div className="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
         <div>
-          <p className="text-sm text-gray-700">
+          <p className="text-sm text-foreground">
             Page <span className="font-medium">{currentPage}</span> of{' '}
             <span className="font-medium">{totalPages}</span>
           </p>
@@ -51,4 +55,4 @@ export default function Pagination({ currentPage, totalPages, onPageChange }: Pa
       </div>
     </div>
   );
-}
+}
\ No newline at end of file
diff --git a/apps/edr-passenger-web/backoffice/src/components/ui/Tabs.tsx b/apps/edr-passenger-web/backoffice/src/components/ui/Tabs.tsx
new file mode 100644
index 000000000..2ffe70159
--- /dev/null
+++ b/apps/edr-passenger-web/backoffice/src/components/ui/Tabs.tsx
@@ -0,0 +1,43 @@
+import React, { ReactNode } from 'react';
+
+interface TabItem {
+  id: string;
+  label: string;
+  icon?: ReactNode;
+  content: ReactNode;
+}
+
+interface TabsProps {
+  tabs: TabItem[];
+  defaultTab?: string;
+}
+
+export default function Tabs({ tabs, defaultTab }: TabsProps) {
+  const [activeTab, setActiveTab] = React.useState(defaultTab || tabs[0]?.id);
+
+  return (
+    <div>
+      <div className="border-b border-gray-200">
+        <div className="flex gap-1 -mb-px">
+          {tabs.map((tab) => (
+            <button
+              key={tab.id}
+              onClick={() => setActiveTab(tab.id)}
+              className={`px-4 py-2 font-medium text-sm border-b-2 transition-colors ${
+                activeTab === tab.id
+                  ? 'border-blue-600 text-blue-600'
+                  : 'border-transparent text-gray-600 hover:text-gray-900 hover:border-gray-300'
+              } flex items-center gap-2`}
+            >
+              {tab.icon}
+              {tab.label}
+            </button>
+          ))}
+        </div>
+      </div>
+      <div className="mt-6">
+        {tabs.find((tab) => tab.id === activeTab)?.content}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/edr-passenger-web/backoffice/src/lib/api/index.ts b/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
index 55851e8bb..1032e4690 100644
--- a/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
+++ b/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
@@ -18,6 +18,29 @@ export const bookingsApi = {
     return Array.isArray(response) ? { items: response } : response;
   },
   getById: (id: string) => apiClient.get<any>(`/bookings/${id}`),
+  getMy: async (params?: any) => {
+    const cleanParams = Object.fromEntries(
+      Object.entries(params || {}).filter(([_, value]) => value !== '' && value !== undefined && value !== null)
+    ) as Record<string, string>;
+    const query = new URLSearchParams(cleanParams).toString();
+    const response = await apiClient.get<any>(`/bookings/my${query ? `?${query}` : ''}`);
+    if (response?.data) {
+      return Array.isArray(response.data) ? { items: response.data } : response;
+    }
+    return Array.isArray(response) ? { items: response } : response;
+  },
+  getByDevice: async (deviceId: string, params?: any) => {
+    const cleanParams = Object.fromEntries(
+      Object.entries({ ...params }).filter(([_, value]) => value !== '' && value !== undefined && value !== null)
+    ) as Record<string, string>;
+    cleanParams['deviceId'] = deviceId;
+    const query = new URLSearchParams(cleanParams).toString();
+    const response = await apiClient.get<any>(`/bookings/by-device${query ? `?${query}` : ''}`);
+    if (response?.data) {
+      return Array.isArray(response.data) ? { items: response.data } : response;
+    }
+    return Array.isArray(response) ? { items: response } : response;
+  },
   cancel: (id: string, data?: any) => apiClient.post<any>(`/bookings/${id}/cancel`, data),
   modify: (id: string, data: any) => apiClient.patch<any>(`/bookings/${id}`, data),
   checkUsage: (id: string) => apiClient.get<any>(`/bookings/${id}/usage`),
@@ -124,6 +147,8 @@ export const seatsApi = {
   release: (holdId: string) => apiClient.delete(`/seats/hold/${holdId}`),
   block: (seatId: string, data: any) => apiClient.post<any>(`/seats/${seatId}/block`, data),
   unblock: (seatId: string) => apiClient.delete(`/seats/${seatId}/block`),
+  removeSeat: (seatId: string) => apiClient.patch<any>(`/seats/${seatId}/remove`, {}),
+  undoRemove: (seatId: string) => apiClient.patch<any>(`/seats/${seatId}/undo-remove`, {}),
 };
 
 // Payments API
@@ -144,7 +169,10 @@ export const paymentsApi = {
 // Tickets API
 export const ticketsApi = {
   getAll: async (params?: any) => {
-    const query = new URLSearchParams(params as Record<string, string>).toString();
+    const cleanParams = Object.fromEntries(
+      Object.entries(params || {}).filter(([_, value]) => value !== '' && value !== undefined && value !== null)
+    ) as Record<string, string>;
+    const query = new URLSearchParams(cleanParams).toString();
     const response = await apiClient.get<any>(`/tickets${query ? `?${query}` : ''}`);
     if (response?.data) {
       return Array.isArray(response.data) ? { items: response.data } : response;
@@ -222,6 +250,9 @@ export const promotionsApi = {
   delete: (id: string) => apiClient.delete(`/promos/${id}`),
 };
 
+export { promosApi } from './promos';
+export { usersApi } from './users';
+
 // Support API
 export const supportApi = {
   getConversations: async (params?: any) => {
@@ -306,13 +337,13 @@ export const liveApi = {
   getCrowdSignals: () => apiClient.get<any[]>('/live/crowd-signals'),
 };
 
-// Seat Classes API
+// Classes API (formerly Seat Classes)
 export const seatClassesApi = {
-  getAll: () => apiClient.get<any[]>('/seat-classes'),
-  getById: (id: string) => apiClient.get<any>(`/seat-classes/${id}`),
-  create: (data: any) => apiClient.post<any>('/seat-classes', data),
-  update: (id: string, data: any) => apiClient.patch<any>(`/seat-classes/${id}`, data),
-  delete: (id: string) => apiClient.delete(`/seat-classes/${id}`),
+  getAll: () => apiClient.get<any[]>('/fleet/classes'),
+  getById: (id: string) => apiClient.get<any>(`/fleet/classes/${id}`),
+  create: (data: any) => apiClient.post<any>('/fleet/classes', data),
+  update: (id: string, data: any) => apiClient.patch<any>(`/fleet/classes/${id}`, data),
+  delete: (id: string) => apiClient.delete(`/fleet/classes/${id}`),
 };
 
 // Food & Dining API
diff --git a/apps/edr-passenger-web/backoffice/src/lib/api/passengers.ts b/apps/edr-passenger-web/backoffice/src/lib/api/passengers.ts
index c595d1d20..f7191e83b 100644
--- a/apps/edr-passenger-web/backoffice/src/lib/api/passengers.ts
+++ b/apps/edr-passenger-web/backoffice/src/lib/api/passengers.ts
@@ -7,6 +7,7 @@ export const passengersApi = {
     const params = new URLSearchParams();
     if (filters?.search) params.append('search', filters.search);
     if (filters?.verified !== undefined) params.append('verified', filters.verified.toString());
+    if (filters?.role) params.append('role', filters.role);
     if (filters?.page) params.append('page', filters.page.toString());
     if (filters?.pageSize) params.append('pageSize', filters.pageSize.toString());
     
diff --git a/apps/edr-passenger-web/backoffice/src/lib/api/promos.ts b/apps/edr-passenger-web/backoffice/src/lib/api/promos.ts
new file mode 100644
index 000000000..cd461b114
--- /dev/null
+++ b/apps/edr-passenger-web/backoffice/src/lib/api/promos.ts
@@ -0,0 +1,54 @@
+import { apiClient } from '@/lib/api-client';
+
+export interface PromoCode {
+  id: string;
+  code: string;
+  title: string;
+  discountType: 'PERCENTAGE' | 'FIXED';
+  discountValue: number;
+  maxDiscount?: number;
+  minBookingAmount?: number;
+  maxUsagePerUser?: number;
+  totalUsageLimit?: number;
+  usageCount: number;
+  validFrom: string;
+  validUntil: string;
+  isActive: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export const promosApi = {
+  getAll: (filters?: { search?: string; active?: string; page?: number; pageSize?: number }) => {
+    const params = new URLSearchParams();
+    if (filters?.search) params.append('search', filters.search);
+    if (filters?.active) params.append('active', filters.active);
+    if (filters?.page) params.append('page', filters.page.toString());
+    if (filters?.pageSize) params.append('pageSize', filters.pageSize.toString());
+
+    return apiClient.get<{ items: PromoCode[]; total: number; page: number; pageSize: number }>(`/promos/all?${params.toString()}`);
+  },
+
+  getById: (id: string) => {
+    return apiClient.get<PromoCode>(`/promos/${id}`);
+  },
+
+  create: (data: Omit<PromoCode, 'id' | 'createdAt' | 'updatedAt' | 'usageCount'>) => {
+    return apiClient.post<PromoCode>('/promos', data);
+  },
+
+  update: (id: string, data: Partial<PromoCode>) => {
+    return apiClient.patch<PromoCode>(`/promos/${id}`, data);
+  },
+
+  delete: (id: string) => {
+    return apiClient.delete<void>(`/promos/${id}`);
+  },
+
+  validate: (code: string, bookingAmount?: number) => {
+    return apiClient.post<{ valid: boolean; message?: string; discount?: number }>('/promos/validate', {
+      code,
+      bookingAmount,
+    });
+  },
+};
diff --git a/apps/edr-passenger-web/backoffice/src/lib/api/users.ts b/apps/edr-passenger-web/backoffice/src/lib/api/users.ts
new file mode 100644
index 000000000..9355e68b5
--- /dev/null
+++ b/apps/edr-passenger-web/backoffice/src/lib/api/users.ts
@@ -0,0 +1,59 @@
+import { apiClient } from '@/lib/api-client';
+
+export interface BackofficeUser {
+  id: string;
+  email: string;
+  fullName: string;
+  role: 'ADMIN' | 'SUPERVISOR' | 'STAFF' | 'AGENT';
+  status: 'ACTIVE' | 'INACTIVE';
+  lastLogin?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export const usersApi = {
+  getAll: async (filters?: { search?: string; role?: string; status?: string; page?: number; pageSize?: number }) => {
+    const params = new URLSearchParams();
+    if (filters?.search) params.append('search', filters.search);
+    if (filters?.role) params.append('role', filters.role);
+    if (filters?.status) params.append('status', filters.status);
+    if (filters?.page) params.append('page', filters.page.toString());
+    if (filters?.pageSize) params.append('pageSize', filters.pageSize.toString());
+
+    const response = await apiClient.get<any>(`/auth/users?${params.toString()}`);
+    
+    // Handle different response formats
+    if (response && typeof response === 'object') {
+      if ('items' in response) {
+        return response as { items: BackofficeUser[]; total: number };
+      }
+      if (Array.isArray(response)) {
+        return { items: response as BackofficeUser[], total: response.length };
+      }
+    }
+    
+    return { items: Array.isArray(response) ? response : [], total: 0 };
+  },
+
+  getById: (id: string) => {
+    return apiClient.get<BackofficeUser>(`/auth/users/${id}`);
+  },
+
+  create: (data: { email: string; fullName: string; role: string; password: string }) => {
+    return apiClient.post<BackofficeUser>('/auth/users', data);
+  },
+
+  update: (id: string, data: Partial<BackofficeUser>) => {
+    return apiClient.patch<BackofficeUser>(`/auth/users/${id}`, data);
+  },
+
+  delete: (id: string) => {
+    return apiClient.delete<void>(`/auth/users/${id}`);
+  },
+
+  resetPassword: (id: string, tempPassword: string) => {
+    return apiClient.post<{ success: boolean; message: string }>(`/auth/users/${id}/reset-password`, {
+      tempPassword,
+    });
+  },
+};
diff --git a/apps/edr-passenger-web/backoffice/src/types/index.ts b/apps/edr-passenger-web/backoffice/src/types/index.ts
index ecf91bee0..e69ca0fa7 100644
--- a/apps/edr-passenger-web/backoffice/src/types/index.ts
+++ b/apps/edr-passenger-web/backoffice/src/types/index.ts
@@ -56,6 +56,7 @@ export interface BookingFilters {
 export interface PassengerFilters {
   search?: string;
   verified?: boolean;
+  role?: string;
   page?: number;
   pageSize?: number;
 }
diff --git a/apps/edr-passenger-web/backoffice/tailwind.config.js b/apps/edr-passenger-web/backoffice/tailwind.config.js
index 744cdccf9..459b34e1b 100644
--- a/apps/edr-passenger-web/backoffice/tailwind.config.js
+++ b/apps/edr-passenger-web/backoffice/tailwind.config.js
@@ -1,40 +1,40 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  darkMode: ['class'],
+  darkMode: ["class"],
   content: [
-    './src/pages/**/*.{js,ts,jsx,tsx,mdx}',
-    './src/components/**/*.{js,ts,jsx,tsx,mdx}',
-    './src/app/**/*.{js,ts,jsx,tsx,mdx}',
+    "./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
   ],
   theme: {
     extend: {
       colors: {
-        background: 'hsl(var(--background))',
-        foreground: 'hsl(var(--foreground))',
-        card: 'hsl(var(--card))',
-        'card-foreground': 'hsl(var(--card-foreground))',
-        popover: 'hsl(var(--popover))',
-        'popover-foreground': 'hsl(var(--popover-foreground))',
-        primary: 'hsl(var(--primary))',
-        'primary-foreground': 'hsl(var(--primary-foreground))',
-        secondary: 'hsl(var(--secondary))',
-        'secondary-foreground': 'hsl(var(--secondary-foreground))',
-        muted: 'hsl(var(--muted))',
-        'muted-foreground': 'hsl(var(--muted-foreground))',
-        accent: 'hsl(var(--accent))',
-        'accent-foreground': 'hsl(var(--accent-foreground))',
-        destructive: 'hsl(var(--destructive))',
-        'destructive-foreground': 'hsl(var(--destructive-foreground))',
-        border: 'hsl(var(--border))',
-        input: 'hsl(var(--input))',
-        ring: 'hsl(var(--ring))',
+        background: "hsl(var(--background))",
+        foreground: "hsl(var(--foreground))",
+        card: "hsl(var(--card))",
+        "card-foreground": "hsl(var(--card-foreground))",
+        popover: "hsl(var(--popover))",
+        "popover-foreground": "hsl(var(--popover-foreground))",
+        primary: "hsl(var(--primary))",
+        "primary-foreground": "hsl(var(--primary-foreground))",
+        secondary: "hsl(var(--secondary))",
+        "secondary-foreground": "hsl(var(--secondary-foreground))",
+        muted: "hsl(var(--muted))",
+        "muted-foreground": "hsl(var(--muted-foreground))",
+        accent: "hsl(var(--accent))",
+        "accent-foreground": "hsl(var(--accent-foreground))",
+        destructive: "hsl(var(--destructive))",
+        "destructive-foreground": "hsl(var(--destructive-foreground))",
+        border: "hsl(var(--border))",
+        input: "hsl(var(--input))",
+        ring: "hsl(var(--ring))",
       },
       borderRadius: {
-        lg: 'var(--radius)',
-        md: 'calc(var(--radius) - 2px)',
-        sm: 'calc(var(--radius) - 4px)',
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
       },
     },
   },
   plugins: [],
-};
+};
\ No newline at end of file
diff --git a/apps/edr-passenger-web/portal/next.config.js b/apps/edr-passenger-web/portal/next.config.js
index c0d91a2a0..2818d502d 100644
--- a/apps/edr-passenger-web/portal/next.config.js
+++ b/apps/edr-passenger-web/portal/next.config.js
@@ -1,7 +1,6 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
-  output: 'export',
   transpilePackages: ['@edr/types', '@edr/ui-common'],
   images: {
     unoptimized: true,
diff --git a/apps/edr-passenger-web/portal/package.json b/apps/edr-passenger-web/portal/package.json
index 7cda9343a..8e063d85a 100644
--- a/apps/edr-passenger-web/portal/package.json
+++ b/apps/edr-passenger-web/portal/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "next dev -p 5174",
     "build": "next build",
-    "start": "next start -p 5174",
+    "start": "next start",
     "lint": "next lint",
     "type-check": "tsc --noEmit"
   },
diff --git a/apps/edr-passenger-web/portal/src/app/booking/auth-check/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/auth-check/page.tsx
index 3f48ec2dd..c1787010c 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/auth-check/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/auth-check/page.tsx
@@ -77,7 +77,7 @@ export default function AuthCheckPage() {
                   </div>
                 </div>
 
-                <button className="btn-primary w-full">
+                <button className="btn-primary w-full text-center">
                   Sign in to continue
                 </button>
               </div>
@@ -119,7 +119,7 @@ export default function AuthCheckPage() {
                   </div>
                 </div>
 
-                <button className="btn-secondary w-full">
+                <button className="btn-secondary w-full text-center">
                   Continue as guest
                 </button>
               </div>
diff --git a/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx
index 8addae4de..1a36ac04b 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx
@@ -11,6 +11,17 @@ import { CheckCircle, Download, Share2, Copy, Printer, Mail, Train } from 'lucid
 import { QRCodeSVG } from 'qrcode.react';
 import { format } from 'date-fns';
 
+type BookingWithTicket = {
+  id: string;
+  pnr?: string | null;
+  status?: string;
+  totalMinor?: number;
+  ticket?: {
+    barcodePayload?: string;
+    qrPayload?: string;
+  };
+};
+
 export default function ConfirmationPage() {
   const router = useRouter();
   const { bookingId, pnr, selectedSchedule, passengers, clearBooking } = useBookingStore();
@@ -21,16 +32,16 @@ export default function ConfirmationPage() {
     mutationFn: () => apiClient.patch(`/bookings/${bookingId}/confirm`, { status: 'SUCCEEDED' }),
   });
 
-  const { data: _booking } = useQuery({
+  const { data: _booking } = useQuery<BookingWithTicket>({
     queryKey: ['booking', bookingId],
-    queryFn: async () => {
+    queryFn: async (): Promise<BookingWithTicket> => {
       try {
         return await apiClient.get(`/bookings/${bookingId}`);
       } catch (error) {
         console.log('Booking API not available, using local data');
         return {
-          id: bookingId,
-          pnr,
+          id: bookingId || '',
+          pnr: pnr || undefined,
           status: 'CONFIRMED',
           totalMinor: passengers.reduce((sum) => sum + (selectedSchedule?.baseFareAdult || 0), 0),
         };
@@ -43,6 +54,10 @@ export default function ConfirmationPage() {
     if (bookingId && !confirmAttempted.current) {
       confirmAttempted.current = true;
       confirmMutation.mutate();
+      
+      apiClient.post(`/tickets/generate/${bookingId}`).catch((err) => {
+        console.error('Failed to generate ticket:', err);
+      });
     }
   }, [bookingId, confirmMutation]);
 
@@ -167,8 +182,9 @@ export default function ConfirmationPage() {
             <h2 className="text-2xl font-semibold mb-4 text-gray-900 dark:text-gray-100">Your tickets</h2>
             <div className="space-y-4">
               {passengers.map((passenger, index) => {
-                const ticketNumber = `TKT-${bookingId?.slice(0, 8).toUpperCase()}-${(index + 1).toString().padStart(2, '0')}`;
-                const qrData = JSON.stringify({
+                const backendTicket = _booking?.ticket || null;
+                const ticketNumber = backendTicket?.barcodePayload || `TKT-${bookingId?.slice(0, 8).toUpperCase()}-${(index + 1).toString().padStart(2, '0')}`;
+                const qrData = backendTicket?.qrPayload || JSON.stringify({
                   pnr,
                   ticketNumber,
                   passengerName: passenger.name,
@@ -204,7 +220,7 @@ export default function ConfirmationPage() {
                           </div>
                           <div>
                             <p className="text-gray-600 dark:text-gray-400">Seat</p>
-                            <p className="font-semibold text-gray-900 dark:text-gray-100">{passenger.seatId ? 'Assigned' : 'Will be assigned'}</p>
+                            <p className="font-semibold text-gray-900 dark:text-gray-100">{passenger.seatNumber || 'Will be assigned'}</p>
                           </div>
                         </div>
 
diff --git a/apps/edr-passenger-web/portal/src/app/booking/layout.tsx b/apps/edr-passenger-web/portal/src/app/booking/layout.tsx
index 276a3af51..e326bd376 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/layout.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/layout.tsx
@@ -28,9 +28,7 @@ export default function BookingLayout({
     <div>
       {showProgress && (
         <div className="bg-white dark:bg-gray-800 border-b dark:border-gray-700">
-          <div className="container mx-auto px-4 py-4">
-            <ProgressIndicator currentStep={currentStep} />
-          </div>
+          <ProgressIndicator currentStep={currentStep} />
         </div>
       )}
       {children}
diff --git a/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
index 79649c4b0..c5c9b4e06 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
@@ -7,16 +7,338 @@ import { useRouter } from 'next/navigation';
 import { useBookingStore } from '@/lib/booking-store';
 import { useAuthStore } from '@/lib/auth-store';
 import { apiClient } from '@/lib/api-client';
-import { useState, useEffect } from 'react';
-import { CheckCircle, ExternalLink, Loader2 } from 'lucide-react';
+import { useState, useEffect, useRef } from 'react';
+import { CheckCircle, ExternalLink, Loader2, CalendarDays, X, Globe } from 'lucide-react';
+import { gregorianToEthiopian, ethiopianToGregorian, ETHIOPIAN_MONTHS, getDaysInEthiopianMonth } from '@/lib/ethiopian-calendar';
+
+const GC_MONTHS = ['January','February','March','April','May','June','July','August','September','October','November','December'];
+
+function daysInGCMonth(y: number, m: number) {
+  return new Date(y, m, 0).getDate();
+}
+
+function DobPickerModal({
+  value,
+  onChange,
+  error,
+}: {
+  value: string;
+  onChange: (iso: string) => void;
+  error?: string;
+}) {
+  const [open, setOpen] = useState(false);
+  const [manualMode, setManualMode] = useState(false);
+  const [calType, setCalType] = useState<'gregorian' | 'ethiopian'>('gregorian');
+  const currentYear = new Date().getFullYear();
+  const currentEthYear = gregorianToEthiopian(new Date()).year;
+
+  // Parse stored ISO value (always Gregorian)
+  const parsed = value ? value.split('-') : [];
+  const initGCYear  = parsed[0] ? parseInt(parsed[0]) : currentYear - 25;
+  const initGCMonth = parsed[1] ? parseInt(parsed[1]) : 1;
+  const initGCDay   = parsed[2] ? parseInt(parsed[2]) : 1;
+
+  // Gregorian drum state
+  const [selGCYear,  setSelGCYear]  = useState(initGCYear);
+  const [selGCMonth, setSelGCMonth] = useState(initGCMonth);
+  const [selGCDay,   setSelGCDay]   = useState(initGCDay);
+
+  // Ethiopian drum state — initialise from parsed value if present
+  const initEth = value ? gregorianToEthiopian(new Date(initGCYear, initGCMonth - 1, initGCDay)) : { year: currentEthYear - 25, month: 1, day: 1 };
+  const [selEthYear,  setSelEthYear]  = useState(initEth.year);
+  const [selEthMonth, setSelEthMonth] = useState(initEth.month);
+  const [selEthDay,   setSelEthDay]   = useState(initEth.day);
+
+  // Manual inputs
+  const [manDay,   setManDay]   = useState(parsed[2] ? String(parseInt(parsed[2])) : '');
+  const [manMonth, setManMonth] = useState(parsed[1] ? String(parseInt(parsed[1])) : '');
+  const [manYear,  setManYear]  = useState(parsed[0] || '');
+
+  // Computed
+  const gcMaxDay  = daysInGCMonth(selGCYear, selGCMonth);
+  const ethMaxDay = getDaysInEthiopianMonth(selEthYear, selEthMonth);
+  const gcSafeDay  = Math.min(selGCDay,  gcMaxDay);
+  const ethSafeDay = Math.min(selEthDay, ethMaxDay);
+
+  const gcYears   = Array.from({ length: 100 }, (_, i) => currentYear - i);
+  const ethYears  = Array.from({ length: 100 }, (_, i) => currentEthYear - i);
+  const gcMonths  = GC_MONTHS.map((m, i) => ({ label: m, value: i + 1 }));
+  const ethMonths = ETHIOPIAN_MONTHS.map((m, i) => ({ label: m, value: i + 1 }));
+  const gcDays    = Array.from({ length: gcMaxDay  }, (_, i) => i + 1);
+  const ethDays   = Array.from({ length: ethMaxDay }, (_, i) => i + 1);
+
+  const dayRef   = useRef<HTMLDivElement>(null);
+  const monthRef = useRef<HTMLDivElement>(null);
+  const yearRef  = useRef<HTMLDivElement>(null);
+  const ITEM_H   = 48;
+
+  const scrollTo = (ref: React.RefObject<HTMLDivElement>, idx: number) => {
+    ref.current?.scrollTo({ top: Math.max(0, idx) * ITEM_H, behavior: 'smooth' });
+  };
+
+  // Scroll drums to current selection when opened or calType changed
+  useEffect(() => {
+    if (!open || manualMode) return;
+    setTimeout(() => {
+      if (calType === 'gregorian') {
+        scrollTo(dayRef,   gcSafeDay - 1);
+        scrollTo(monthRef, selGCMonth - 1);
+        scrollTo(yearRef,  gcYears.indexOf(selGCYear));
+      } else {
+        scrollTo(dayRef,   ethSafeDay - 1);
+        scrollTo(monthRef, selEthMonth - 1);
+        scrollTo(yearRef,  ethYears.indexOf(selEthYear));
+      }
+    }, 60);
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open, manualMode, calType]);
+
+  const makeScrollHandler = (
+    ref: React.RefObject<HTMLDivElement>,
+    setter: (v: number) => void,
+    getList: () => number[],
+  ) => {
+    let timer: ReturnType<typeof setTimeout>;
+    return () => {
+      clearTimeout(timer);
+      timer = setTimeout(() => {
+        const el = ref.current;
+        if (!el) return;
+        const list = getList();
+        const idx = Math.round(el.scrollTop / ITEM_H);
+        const clamped = Math.max(0, Math.min(idx, list.length - 1));
+        setter(list[clamped]);
+        el.scrollTo({ top: clamped * ITEM_H, behavior: 'smooth' });
+      }, 150);
+    };
+  };
+
+  const gcDayHandler   = useRef(makeScrollHandler(dayRef,   setSelGCDay,   () => Array.from({ length: daysInGCMonth(selGCYear, selGCMonth) }, (_, i) => i + 1))).current;
+  const gcMonthHandler = useRef(makeScrollHandler(monthRef, setSelGCMonth, () => GC_MONTHS.map((_, i) => i + 1))).current;
+  const gcYearHandler  = useRef(makeScrollHandler(yearRef,  setSelGCYear,  () => Array.from({ length: 100 }, (_, i) => new Date().getFullYear() - i))).current;
+
+  const ethDayHandler   = useRef(makeScrollHandler(dayRef,   setSelEthDay,   () => Array.from({ length: getDaysInEthiopianMonth(selEthYear, selEthMonth) }, (_, i) => i + 1))).current;
+  const ethMonthHandler = useRef(makeScrollHandler(monthRef, setSelEthMonth, () => ETHIOPIAN_MONTHS.map((_, i) => i + 1))).current;
+  const ethYearHandler  = useRef(makeScrollHandler(yearRef,  setSelEthYear,  () => Array.from({ length: 100 }, (_, i) => gregorianToEthiopian(new Date()).year - i))).current;
+
+  const confirm = () => {
+    let gregDate: Date;
+    if (calType === 'gregorian') {
+      const d = Math.min(selGCDay, daysInGCMonth(selGCYear, selGCMonth));
+      gregDate = new Date(selGCYear, selGCMonth - 1, d);
+    } else {
+      const d = Math.min(selEthDay, getDaysInEthiopianMonth(selEthYear, selEthMonth));
+      gregDate = ethiopianToGregorian({ year: selEthYear, month: selEthMonth, day: d });
+    }
+    const iso = `${gregDate.getFullYear()}-${String(gregDate.getMonth() + 1).padStart(2,'0')}-${String(gregDate.getDate()).padStart(2,'0')}`;
+    onChange(iso);
+    setOpen(false);
+  };
+
+  const confirmManual = () => {
+    const d = parseInt(manDay), m = parseInt(manMonth), y = parseInt(manYear);
+    if (!d || !m || !y || m < 1 || m > 12 || d < 1 || d > daysInGCMonth(y, m) || y < currentYear - 110 || y > currentYear) return;
+    onChange(`${y}-${String(m).padStart(2,'0')}-${String(d).padStart(2,'0')}`);
+    setOpen(false);
+  };
+
+  const manualValid = (() => {
+    const d = parseInt(manDay), m = parseInt(manMonth), y = parseInt(manYear);
+    return d >= 1 && m >= 1 && m <= 12 && y >= currentYear - 110 && y <= currentYear && d <= daysInGCMonth(y, m);
+  })();
+
+  // Display: always show Gregorian ISO as human-readable, with calendar label
+  const displayValue = (() => {
+    if (!value) return '';
+    const [y, mo, d] = value.split('-').map(Number);
+    const gcStr = `${GC_MONTHS[mo - 1]} ${d}, ${y}`;
+    if (calType === 'ethiopian') {
+      const eth = gregorianToEthiopian(new Date(y, mo - 1, d));
+      return `${ETHIOPIAN_MONTHS[eth.month - 1]} ${eth.day}, ${eth.year} (${gcStr})`;
+    }
+    return gcStr;
+  })();
+
+  // Confirm button label
+  const confirmLabel = (() => {
+    if (manualMode) return manualValid ? `Confirm — ${manDay}/${manMonth}/${manYear}` : 'Confirm';
+    if (calType === 'gregorian') {
+      const d = Math.min(selGCDay, gcMaxDay);
+      return `Confirm — ${GC_MONTHS[selGCMonth - 1]} ${d}, ${selGCYear}`;
+    } else {
+      const d = Math.min(selEthDay, ethMaxDay);
+      const gcDate = ethiopianToGregorian({ year: selEthYear, month: selEthMonth, day: d });
+      return `Confirm — ${ETHIOPIAN_MONTHS[selEthMonth - 1]} ${d}, ${selEthYear} (GC: ${GC_MONTHS[gcDate.getMonth()]} ${gcDate.getDate()}, ${gcDate.getFullYear()})`;
+    }
+  })();
+
+  const col = (
+    ref: React.RefObject<HTMLDivElement>,
+    list: Array<{ label: string; value: number }>,
+    selected: number,
+    setter: (v: number) => void,
+    scrollHandler: () => void,
+  ) => (
+    <div className="flex-1 flex flex-col items-center">
+      <div
+        ref={ref}
+        onScroll={scrollHandler}
+        className="h-full overflow-y-auto scrollbar-hide"
+        style={{ scrollSnapType: 'y mandatory' }}
+      >
+        <div style={{ height: ITEM_H * 2 }} />
+        {list.map((item, idx) => (
+          <div
+            key={item.value}
+            style={{ height: ITEM_H, scrollSnapAlign: 'center', cursor: 'pointer' }}
+            onClick={() => { setter(item.value); ref.current?.scrollTo({ top: idx * ITEM_H, behavior: 'smooth' }); }}
+            className={`flex items-center justify-center text-sm font-medium transition-all select-none ${
+              item.value === selected ? 'text-primary font-bold text-base' : 'text-gray-400 dark:text-gray-500'
+            }`}
+          >
+            {item.label}
+          </div>
+        ))}
+        <div style={{ height: ITEM_H * 2 }} />
+      </div>
+    </div>
+  );
+
+  return (
+    <div>
+      <button
+        type="button"
+        onClick={() => setOpen(true)}
+        className={`input-field w-full text-left flex items-center justify-between ${
+          error ? 'border-red-500' : ''
+        }`}
+      >
+        <span className={displayValue ? 'text-gray-900 dark:text-white text-sm' : 'text-gray-400 text-sm'}>
+          {displayValue || 'Select date of birth'}
+        </span>
+        <CalendarDays className="w-4 h-4 text-gray-400 flex-shrink-0" />
+      </button>
+      {error && <p className="text-red-500 text-xs mt-1">{error}</p>}
+
+      {open && (
+        <>
+          <div className="fixed inset-0 z-[99] bg-black/50" onClick={() => setOpen(false)} />
+          <div
+            className="fixed inset-x-0 bottom-0 z-[100] bg-white dark:bg-gray-900 rounded-t-2xl shadow-2xl"
+            style={{ animation: 'dob-slide-up 0.25s cubic-bezier(0.32,0.72,0,1)' }}
+          >
+            {/* Header */}
+            <div className="flex items-center justify-between px-5 py-4 border-b border-gray-100 dark:border-gray-800">
+              <div className="flex items-center gap-3">
+                <h2 className="text-base font-bold text-gray-900 dark:text-white">Date of Birth</h2>
+                {!manualMode && (
+                  <button
+                    type="button"
+                    onClick={() => setCalType(c => c === 'gregorian' ? 'ethiopian' : 'gregorian')}
+                    className="flex items-center gap-1 text-xs font-semibold px-2.5 py-1 rounded-lg bg-primary/10 text-primary hover:bg-primary/20 transition-colors"
+                  >
+                    <Globe className="w-3 h-3" />
+                    {calType === 'gregorian' ? 'ET' : 'GC'}
+                  </button>
+                )}
+                <button
+                  type="button"
+                  onClick={() => setManualMode(!manualMode)}
+                  className="text-xs text-gray-500 font-medium hover:underline"
+                >
+                  {manualMode ? 'Use scroll' : 'Enter manually'}
+                </button>
+              </div>
+              <button type="button" onClick={() => setOpen(false)} className="w-9 h-9 flex items-center justify-center rounded-full hover:bg-gray-100 dark:hover:bg-gray-800">
+                <X className="w-5 h-5 text-gray-500" />
+              </button>
+            </div>
+
+            {/* Calendar type label */}
+            {!manualMode && (
+              <div className="px-5 pt-2 pb-0">
+                <p className="text-xs text-gray-400">
+                  {calType === 'gregorian' ? 'Gregorian Calendar' : 'Ethiopian Calendar (ኢትዮጵያ)'}
+                </p>
+              </div>
+            )}
+
+            {manualMode ? (
+              <div className="px-5 py-5 space-y-4">
+                <div className="grid grid-cols-3 gap-3">
+                  <div>
+                    <label className="block text-xs font-semibold text-gray-500 uppercase tracking-wide mb-1.5">Day</label>
+                    <input type="number" min={1} max={31} value={manDay} onChange={(e) => setManDay(e.target.value)} placeholder="DD" className="input-field text-center text-lg font-semibold" />
+                  </div>
+                  <div>
+                    <label className="block text-xs font-semibold text-gray-500 uppercase tracking-wide mb-1.5">Month</label>
+                    <input type="number" min={1} max={12} value={manMonth} onChange={(e) => setManMonth(e.target.value)} placeholder="MM" className="input-field text-center text-lg font-semibold" />
+                  </div>
+                  <div>
+                    <label className="block text-xs font-semibold text-gray-500 uppercase tracking-wide mb-1.5">Year</label>
+                    <input type="number" min={currentYear - 110} max={currentYear} value={manYear} onChange={(e) => setManYear(e.target.value)} placeholder="YYYY" className="input-field text-center text-lg font-semibold" />
+                  </div>
+                </div>
+                {manDay && manMonth && manYear && !manualValid && (
+                  <p className="text-red-500 text-xs">Please enter a valid Gregorian date</p>
+                )}
+              </div>
+            ) : (
+              <>
+                <div className="flex px-5 pt-2 pb-1">
+                  {['Day', 'Month', 'Year'].map(l => (
+                    <div key={l} className="flex-1 text-center text-xs font-semibold text-gray-400 uppercase tracking-wide">{l}</div>
+                  ))}
+                </div>
+                <div className="relative px-5 pb-2" style={{ height: ITEM_H * 5 }}>
+                  <div
+                    className="absolute left-5 right-5 pointer-events-none rounded-xl border border-primary/30 bg-primary/5 dark:bg-primary/10"
+                    style={{ top: ITEM_H * 2, height: ITEM_H }}
+                  />
+                  <div className="flex gap-2 h-full">
+                    {calType === 'gregorian' ? (
+                      <>
+                        {col(dayRef,   gcDays.map(d => ({ label: String(d), value: d })), gcSafeDay,   setSelGCDay,   gcDayHandler)}
+                        {col(monthRef, gcMonths,                                           selGCMonth,  setSelGCMonth, gcMonthHandler)}
+                        {col(yearRef,  gcYears.map(y => ({ label: String(y), value: y })), selGCYear,   setSelGCYear,  gcYearHandler)}
+                      </>
+                    ) : (
+                      <>
+                        {col(dayRef,   ethDays.map(d => ({ label: String(d), value: d })), ethSafeDay,  setSelEthDay,   ethDayHandler)}
+                        {col(monthRef, ethMonths,                                            selEthMonth, setSelEthMonth, ethMonthHandler)}
+                        {col(yearRef,  ethYears.map(y => ({ label: String(y), value: y })), selEthYear,  setSelEthYear,  ethYearHandler)}
+                      </>
+                    )}
+                  </div>
+                </div>
+              </>
+            )}
+
+            <div className="px-5 pb-8 pt-3 flex justify-end">
+              <button
+                type="button"
+                onClick={manualMode ? confirmManual : confirm}
+                disabled={manualMode && !manualValid}
+                className="px-6 py-2.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all shadow disabled:opacity-40 disabled:cursor-not-allowed"
+              >
+                {confirmLabel}
+              </button>
+            </div>
+          </div>
+          <style>{`@keyframes dob-slide-up{from{transform:translateY(100%);opacity:0}to{transform:translateY(0);opacity:1}}`}</style>
+        </>
+      )}
+    </div>
+  );
+}
 
 const passengerSchema = z.object({
-  name: z.string().min(2, 'Name is required'),
+  name: z.string().min(2, 'Full name is required (min 2 characters)'),
   dateOfBirth: z.string().min(1, 'Date of birth is required'),
-  gender: z.enum(['Male', 'Female']).optional(),
+  gender: z.string().min(1, 'Gender is required'),
   nationality: z.string().min(1, 'Nationality is required'),
-  phone: z.string().optional(),
-  email: z.string().email('Invalid email').optional().or(z.literal('')),
+  phone: z.string().min(1, 'Phone number is required'),
+  email: z.string().optional(),
   nationalId: z.string().optional(),
   passportNumber: z.string().optional(),
   passportCountry: z.string().optional(),
@@ -26,15 +348,25 @@ const passengerSchema = z.object({
   faydaVerified: z.boolean().optional(),
   faydaSub: z.string().optional(),
   formExpanded: z.boolean().optional(),
-}).refine((data) => {
-  if (data.nationality !== 'ETHIOPIAN' && data.nationality !== 'Ethiopian') {
-    return data.passportNumber && data.passportNumber.length > 0 &&
-      data.passportCountry && data.passportCountry.length > 0;
+}).superRefine((data, ctx) => {
+  if (data.gender !== 'Male' && data.gender !== 'Female') {
+    ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Gender is required', path: ['gender'] });
+  }
+  if (data.email && data.email.trim().length > 0) {
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(data.email)) {
+      ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Invalid email format', path: ['email'] });
+    }
+  }
+  const isNonEthiopian = data.nationality !== 'ETHIOPIAN' && data.nationality !== 'Ethiopian';
+  if (isNonEthiopian) {
+    if (!data.passportNumber || data.passportNumber.trim().length === 0) {
+      ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Passport number is required', path: ['passportNumber'] });
+    }
+    if (!data.passportCountry || data.passportCountry.trim().length === 0) {
+      ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Issuing country is required', path: ['passportCountry'] });
+    }
   }
-  return true;
-}, {
-  message: 'Passport number and country are required for non-Ethiopian passengers',
-  path: ['passportNumber'],
 });
 
 const formSchema = z.object({
@@ -57,7 +389,8 @@ export default function PassengersPage() {
   const totalPassengers = (searchCriteria?.adultCount || 1) + (searchCriteria?.childCount || 0);
 
   const { register, control, handleSubmit, setValue, watch, formState: { errors } } = useForm<FormData>({
-    resolver: zodResolver(formSchema),
+    resolver: zodResolver(formSchema as any),
+    mode: 'onChange',
     defaultValues: {
       passengers: Array.from({ length: totalPassengers }, () => ({
         name: '',
@@ -418,82 +751,80 @@ export default function PassengersPage() {
                           )}
 
                           <div className="grid md:grid-cols-2 gap-4">
+                            {/* Full Name */}
                             <div>
                               <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Full Name *</label>
                               <input
                                 {...register(`passengers.${index}.name`)}
-                                className="input-field"
+                                className={`input-field ${errors.passengers?.[index]?.name ? 'border-red-500' : ''}`}
                                 placeholder="Full name as per ID"
-                                value={passengers[index]?.name || ''}
-                                onChange={(e) => setValue(`passengers.${index}.name`, e.target.value)}
                               />
                               {errors.passengers?.[index]?.name && (
-                                <p className="text-red-500 dark:text-red-400 text-sm mt-1">{errors.passengers[index]?.name?.message}</p>
+                                <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.name?.message}</p>
                               )}
                             </div>
 
+                            {/* Date of Birth */}
                             <div>
                               <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Date of Birth *</label>
-                              <input
-                                type="date"
-                                {...register(`passengers.${index}.dateOfBirth`)}
-                                className="input-field"
+                              <DobPickerModal
                                 value={passengers[index]?.dateOfBirth || ''}
-                                onChange={(e) => setValue(`passengers.${index}.dateOfBirth`, e.target.value)}
+                                onChange={(iso) => setValue(`passengers.${index}.dateOfBirth`, iso, { shouldValidate: true })}
+                                error={errors.passengers?.[index]?.dateOfBirth?.message}
                               />
-                              {errors.passengers?.[index]?.dateOfBirth && (
-                                <p className="text-red-500 dark:text-red-400 text-sm mt-1">{errors.passengers[index]?.dateOfBirth?.message}</p>
-                              )}
                             </div>
 
+                            {/* Gender */}
                             <div>
-                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Gender</label>
+                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Gender *</label>
                               <select
                                 {...register(`passengers.${index}.gender`)}
-                                className="input-field"
-                                value={passengers[index]?.gender || ''}
-                                onChange={(e) => setValue(`passengers.${index}.gender`, e.target.value as any)}
+                                className={`input-field ${errors.passengers?.[index]?.gender ? 'border-red-500' : ''}`}
                               >
                                 <option value="">Select gender</option>
                                 <option value="Male">Male</option>
                                 <option value="Female">Female</option>
                               </select>
+                              {errors.passengers?.[index]?.gender && (
+                                <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.gender?.message}</p>
+                              )}
                             </div>
 
+                            {/* Nationality (read-only) */}
                             <div>
-                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Nationality *</label>
+                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Nationality</label>
                               <input
                                 {...register(`passengers.${index}.nationality`)}
                                 className="input-field bg-gray-100 dark:bg-gray-700 cursor-not-allowed"
                                 readOnly
                                 disabled
-                                value={passengers[index]?.nationality || ''}
                               />
                             </div>
 
+                            {/* Phone */}
                             <div>
-                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Phone Number</label>
+                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Phone Number *</label>
                               <input
                                 {...register(`passengers.${index}.phone`)}
-                                className="input-field"
+                                className={`input-field ${errors.passengers?.[index]?.phone ? 'border-red-500' : ''}`}
                                 placeholder="+251911234567"
-                                value={passengers[index]?.phone || ''}
-                                onChange={(e) => setValue(`passengers.${index}.phone`, e.target.value)}
                               />
+                              {errors.passengers?.[index]?.phone && (
+                                <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.phone?.message}</p>
+                              )}
                             </div>
 
+                            {/* Email */}
                             <div>
                               <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Email</label>
                               <input
                                 type="email"
                                 {...register(`passengers.${index}.email`)}
-                                className="input-field"
+                                className={`input-field ${errors.passengers?.[index]?.email ? 'border-red-500' : ''}`}
                                 placeholder="email@example.com"
-                                value={passengers[index]?.email || ''}
-                                onChange={(e) => setValue(`passengers.${index}.email`, e.target.value)}
                               />
                               {errors.passengers?.[index]?.email && (
-                                <p className="text-red-500 dark:text-red-400 text-sm mt-1">{errors.passengers[index]?.email?.message}</p>
+                                <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.email?.message}</p>
                               )}
                             </div>
                           </div>
@@ -501,113 +832,109 @@ export default function PassengersPage() {
                       ) : (
                         <>
                           <div className="grid md:grid-cols-2 gap-4">
+                            {/* Full Name */}
                             <div>
                               <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Full Name *</label>
                               <input
                                 {...register(`passengers.${index}.name`)}
-                                className="input-field"
+                                className={`input-field ${errors.passengers?.[index]?.name ? 'border-red-500' : ''}`}
                                 placeholder="Full name as per passport"
-                                value={passengers[index]?.name || ''}
-                                onChange={(e) => setValue(`passengers.${index}.name`, e.target.value)}
                               />
                               {errors.passengers?.[index]?.name && (
-                                <p className="text-red-500 dark:text-red-400 text-sm mt-1">{errors.passengers[index]?.name?.message}</p>
+                                <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.name?.message}</p>
                               )}
                             </div>
 
+                            {/* Date of Birth */}
                             <div>
                               <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Date of Birth *</label>
-                              <input
-                                type="date"
-                                {...register(`passengers.${index}.dateOfBirth`)}
-                                className="input-field"
+                              <DobPickerModal
                                 value={passengers[index]?.dateOfBirth || ''}
-                                onChange={(e) => setValue(`passengers.${index}.dateOfBirth`, e.target.value)}
+                                onChange={(iso) => setValue(`passengers.${index}.dateOfBirth`, iso, { shouldValidate: true })}
+                                error={errors.passengers?.[index]?.dateOfBirth?.message}
                               />
-                              {errors.passengers?.[index]?.dateOfBirth && (
-                                <p className="text-red-500 dark:text-red-400 text-sm mt-1">{errors.passengers[index]?.dateOfBirth?.message}</p>
-                              )}
                             </div>
 
+                            {/* Gender */}
                             <div>
-                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Gender</label>
+                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Gender *</label>
                               <select
                                 {...register(`passengers.${index}.gender`)}
-                                className="input-field"
-                                value={passengers[index]?.gender || ''}
-                                onChange={(e) => setValue(`passengers.${index}.gender`, e.target.value as any)}
+                                className={`input-field ${errors.passengers?.[index]?.gender ? 'border-red-500' : ''}`}
                               >
                                 <option value="">Select gender</option>
                                 <option value="Male">Male</option>
                                 <option value="Female">Female</option>
                               </select>
+                              {errors.passengers?.[index]?.gender && (
+                                <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.gender?.message}</p>
+                              )}
                             </div>
 
+                            {/* Nationality (read-only) */}
                             <div>
-                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Nationality *</label>
+                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Nationality</label>
                               <input
                                 {...register(`passengers.${index}.nationality`)}
                                 className="input-field bg-gray-100 dark:bg-gray-700 cursor-not-allowed"
                                 readOnly
                                 disabled
-                                value={passengers[index]?.nationality || ''}
                               />
                             </div>
 
+                            {/* Phone */}
                             <div>
-                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Phone Number</label>
+                              <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Phone Number *</label>
                               <input
                                 {...register(`passengers.${index}.phone`)}
-                                className="input-field"
+                                className={`input-field ${errors.passengers?.[index]?.phone ? 'border-red-500' : ''}`}
                                 placeholder="+254712345678"
-                                value={passengers[index]?.phone || ''}
-                                onChange={(e) => setValue(`passengers.${index}.phone`, e.target.value)}
                               />
+                              {errors.passengers?.[index]?.phone && (
+                                <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.phone?.message}</p>
+                              )}
                             </div>
 
+                            {/* Email */}
                             <div>
                               <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Email</label>
                               <input
                                 type="email"
                                 {...register(`passengers.${index}.email`)}
-                                className="input-field"
+                                className={`input-field ${errors.passengers?.[index]?.email ? 'border-red-500' : ''}`}
                                 placeholder="email@example.com"
-                                value={passengers[index]?.email || ''}
-                                onChange={(e) => setValue(`passengers.${index}.email`, e.target.value)}
                               />
                               {errors.passengers?.[index]?.email && (
-                                <p className="text-red-500 dark:text-red-400 text-sm mt-1">{errors.passengers[index]?.email?.message}</p>
+                                <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.email?.message}</p>
                               )}
                             </div>
                           </div>
 
+                          {/* Passport fields */}
                           <div className="border-t dark:border-gray-700 pt-4 mt-4">
+                            <h4 className="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-3">Passport Details</h4>
                             <div className="grid md:grid-cols-2 gap-4">
                               <div>
                                 <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Passport Number *</label>
                                 <input
                                   {...register(`passengers.${index}.passportNumber`)}
-                                  className="input-field"
+                                  className={`input-field ${errors.passengers?.[index]?.passportNumber ? 'border-red-500' : ''}`}
                                   placeholder="P1234567"
-                                  value={passengers[index]?.passportNumber || ''}
-                                  onChange={(e) => setValue(`passengers.${index}.passportNumber`, e.target.value)}
                                 />
                                 {errors.passengers?.[index]?.passportNumber && (
-                                  <p className="text-red-500 dark:text-red-400 text-sm mt-1">{errors.passengers[index]?.passportNumber?.message}</p>
+                                  <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.passportNumber?.message}</p>
                                 )}
                               </div>
 
                               <div>
-                                <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Issuing Country / Authority *</label>
+                                <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Issuing Country *</label>
                                 <input
                                   {...register(`passengers.${index}.passportCountry`)}
-                                  className="input-field"
-                                  placeholder="e.g., Djibouti / Government of Djibouti"
-                                  value={passengers[index]?.passportCountry || ''}
-                                  onChange={(e) => setValue(`passengers.${index}.passportCountry`, e.target.value)}
+                                  className={`input-field ${errors.passengers?.[index]?.passportCountry ? 'border-red-500' : ''}`}
+                                  placeholder="e.g., Djibouti"
                                 />
                                 {errors.passengers?.[index]?.passportCountry && (
-                                  <p className="text-red-500 dark:text-red-400 text-sm mt-1">{errors.passengers[index]?.passportCountry?.message}</p>
+                                  <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.passportCountry?.message}</p>
                                 )}
                               </div>
 
@@ -617,8 +944,6 @@ export default function PassengersPage() {
                                   type="date"
                                   {...register(`passengers.${index}.passportIssueDate`)}
                                   className="input-field"
-                                  value={passengers[index]?.passportIssueDate || ''}
-                                  onChange={(e) => setValue(`passengers.${index}.passportIssueDate`, e.target.value)}
                                 />
                               </div>
 
@@ -628,8 +953,6 @@ export default function PassengersPage() {
                                   type="date"
                                   {...register(`passengers.${index}.passportExpiryDate`)}
                                   className="input-field"
-                                  value={passengers[index]?.passportExpiryDate || ''}
-                                  onChange={(e) => setValue(`passengers.${index}.passportExpiryDate`, e.target.value)}
                                 />
                               </div>
                             </div>
@@ -652,7 +975,18 @@ export default function PassengersPage() {
             )}
 
             <div className="flex gap-4">
-              <button type="button" onClick={() => router.back()} className="btn-secondary flex-1" disabled={saving}>
+              <button type="button" onClick={() => {
+                const params = new URLSearchParams({
+                  origin: searchCriteria.originStationId,
+                  destination: searchCriteria.destinationStationId,
+                  date: searchCriteria.departureDate,
+                  adults: String(searchCriteria.adultCount),
+                  children: String(searchCriteria.childCount),
+                  nationality: searchCriteria.nationality,
+                  ...(searchCriteria.promoCode && { promoCode: searchCriteria.promoCode }),
+                });
+                router.push(`/booking/results?${params}`);
+              }} className="btn-secondary flex-1" disabled={saving}>
                 Back
               </button>
               <button type="submit" className="btn-primary flex-1" disabled={saving}>
diff --git a/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
index c8161bb34..df4a54742 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
@@ -5,26 +5,67 @@ import { useQuery } from '@tanstack/react-query';
 import { apiClient } from '@/lib/api-client';
 import { useBookingStore } from '@/lib/booking-store';
 import { Schedule } from '@/types';
-import { ArrowRight, Clock, Calendar, Users, ChevronLeft, Loader2, Check, ChevronDown, ChevronUp, MapPin } from 'lucide-react';
+import { ArrowRight, Clock, Calendar, Users, ChevronLeft, Loader2, Check, X, MapPin, Gift, Train } from 'lucide-react';
 import { format } from 'date-fns';
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 
 export default function ResultsPage() {
   const router = useRouter();
   const searchParams = useSearchParams();
   const setSelectedSchedule = useBookingStore((s) => s.setSelectedSchedule);
   const [selectedClasses, setSelectedClasses] = useState<Record<string, string>>({});
-  const [expandedSchedules, setExpandedSchedules] = useState<Record<string, boolean>>({});
+  const [classModal, setClassModal] = useState<Schedule | null>(null);
+  const [promoData, setPromoData] = useState<{ code: string; discount: string; message: string } | null>(null);
 
+  const searchCriteria = useBookingStore((s) => s.searchCriteria);
+  const setSearchCriteria = useBookingStore((s) => s.setSearchCriteria);
+
+  // Prefer URL params; fall back to persisted store values
   const searchData = {
-    originStationId: searchParams.get('origin') || '',
-    destinationStationId: searchParams.get('destination') || '',
-    date: searchParams.get('date') || '',
-    adultCount: parseInt(searchParams.get('adults') || '1'),
-    childCount: parseInt(searchParams.get('children') || '0'),
-    nationality: searchParams.get('nationality') || 'ETHIOPIAN',
+    originStationId: searchParams.get('origin') || searchCriteria?.originStationId || '',
+    destinationStationId: searchParams.get('destination') || searchCriteria?.destinationStationId || '',
+    date: searchParams.get('date') || searchCriteria?.departureDate || '',
+    adultCount: parseInt(searchParams.get('adults') || '') || searchCriteria?.adultCount || 1,
+    childCount: parseInt(searchParams.get('children') || '') || searchCriteria?.childCount || 0,
+    nationality: searchParams.get('nationality') || searchCriteria?.nationality || 'ETHIOPIAN',
+    promoCode: searchParams.get('promoCode') || searchCriteria?.promoCode || '',
   };
 
+  // Sync URL params back into store whenever they are present in the URL
+  useEffect(() => {
+    if (searchParams.get('origin')) {
+      setSearchCriteria({
+        originStationId: searchParams.get('origin')!,
+        destinationStationId: searchParams.get('destination')!,
+        departureDate: searchParams.get('date')!,
+        adultCount: parseInt(searchParams.get('adults') || '1'),
+        childCount: parseInt(searchParams.get('children') || '0'),
+        nationality: (searchParams.get('nationality') || 'ETHIOPIAN') as 'ETHIOPIAN' | 'DJIBOUTIAN' | 'OTHER',
+        promoCode: searchParams.get('promoCode') || '',
+      });
+    }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (searchData.promoCode) {
+      apiClient
+        .post('/promos/validate', { code: searchData.promoCode })
+        .then((response: any) => {
+          if (response.applicable || response.valid) {
+            setPromoData({
+              code: searchData.promoCode,
+              discount: response.message || 'Discount applied',
+              message: response.message || 'Promo code applied successfully!',
+            });
+          }
+        })
+        .catch((err) => {
+          console.error('Promo validation failed:', err);
+        });
+    }
+  }, [searchData.promoCode]);
+
   const buildSearchUrl = () => {
     const params = new URLSearchParams({
       origin: searchData.originStationId,
@@ -33,6 +74,7 @@ export default function ResultsPage() {
       adults: searchData.adultCount.toString(),
       children: searchData.childCount.toString(),
       nationality: searchData.nationality,
+      ...(searchData.promoCode && { promoCode: searchData.promoCode }),
     });
     return `/booking/search?${params}`;
   };
@@ -44,23 +86,16 @@ export default function ResultsPage() {
       const response = await apiClient.post('/search', searchData) as Schedule[];
       console.log('Search results:', response);
       console.log('Number of results:', response?.length || 0);
+      if (response?.length > 0) {
+        console.log('First schedule availabilityByClass:', response[0].availabilityByClass);
+      }
       return response;
     },
     enabled: !!searchData.originStationId && !!searchData.destinationStationId,
   });
 
-  const toggleExpanded = (scheduleId: string) => {
-    setExpandedSchedules(prev => ({
-      ...prev,
-      [scheduleId]: !prev[scheduleId]
-    }));
-  };
-
   const handleSelectClass = (scheduleId: string, seatClass: string) => {
-    setSelectedClasses(prev => ({
-      ...prev,
-      [scheduleId]: seatClass
-    }));
+    setSelectedClasses(prev => ({ ...prev, [scheduleId]: seatClass }));
   };
 
   const handleSelect = (schedule: Schedule) => {
@@ -156,16 +191,127 @@ export default function ResultsPage() {
     <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-4 md:py-6">
       <div className="container mx-auto px-4">
         <div className="max-w-6xl mx-auto">
+
+          {/* Class selection modal */}
+          {classModal && (() => {
+            const scheduleId = classModal.scheduleId || classModal.id || '';
+            const selectedClass = selectedClasses[scheduleId];
+            return (
+              <>
+                {/* Backdrop */}
+                <div className="fixed inset-0 z-[99] bg-black/50 backdrop-blur-sm" onClick={() => setClassModal(null)} />
+                {/* Drawer */}
+                <div className="fixed inset-y-0 right-0 z-[100] w-full sm:w-[640px] bg-white dark:bg-gray-900 shadow-2xl flex flex-col"
+                  style={{ animation: 'drawer-slide-in 0.25s cubic-bezier(0.32,0.72,0,1)' }}
+                >
+                    {/* Header */}
+                    <div className="flex items-center justify-between px-5 py-4 border-b border-gray-100 dark:border-gray-800 flex-shrink-0">
+                      <div>
+                        <h2 className="text-base font-bold text-gray-900 dark:text-white">Select Class</h2>
+                        <p className="text-xs text-gray-500 dark:text-gray-400 mt-0.5 flex items-center gap-1">
+                          <Train className="w-3 h-3" />
+                          {classModal.trainNumber} · {classModal.origin?.name} → {classModal.destination?.name}
+                        </p>
+                      </div>
+                      <button
+                        type="button"
+                        onClick={() => setClassModal(null)}
+                        className="w-9 h-9 flex items-center justify-center rounded-full hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors"
+                      >
+                        <X className="w-5 h-5 text-gray-500" />
+                      </button>
+                    </div>
+
+                    {/* Class grid */}
+                    <div className="flex-1 overflow-y-auto p-4">
+                      {classModal.faresByClass && Array.isArray(classModal.faresByClass) && classModal.faresByClass.length > 0 ? (
+                        <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
+                          {classModal.faresByClass.map((fareClass: any) => {
+                            const isSelected = selectedClass === fareClass.seatClassName;
+                            const availableSeats = classModal.availabilityByClass?.[fareClass.seatClassName] || 0;
+                            const isAvailable = availableSeats > 0;
+                            const isBedClass = fareClass.seatClassName.toLowerCase().includes('bed');
+                            return (
+                              <button
+                                key={fareClass.seatClassName}
+                                onClick={() => isAvailable && handleSelectClass(scheduleId, fareClass.seatClassName)}
+                                disabled={!isAvailable}
+                                className={`relative w-full p-4 rounded-xl border-2 text-left transition-all ${
+                                  isSelected
+                                    ? 'border-primary bg-primary/5 dark:bg-primary/10 shadow-sm'
+                                    : isAvailable
+                                    ? 'border-gray-200 dark:border-gray-700 hover:border-primary/50 hover:shadow-sm'
+                                    : 'border-gray-100 dark:border-gray-800 bg-gray-50 dark:bg-gray-800 opacity-50 cursor-not-allowed'
+                                }`}
+                              >
+                                {isSelected && (
+                                  <div className="absolute top-3 right-3 w-6 h-6 bg-primary rounded-full flex items-center justify-center">
+                                    <Check className="w-3.5 h-3.5 text-white" />
+                                  </div>
+                                )}
+                                <p className="font-semibold text-gray-900 dark:text-white pr-8">
+                                  {fareClass.seatClassName.replace(/_/g, ' ')}
+                                </p>
+                                <p className="text-xl font-bold text-primary dark:text-white mt-2">
+                                  ETB {((fareClass.baseFareMinor || 0) / 100).toFixed(2)}
+                                </p>
+                                <p className="text-xs text-gray-400 mt-0.5">per adult</p>
+                                <p className={`text-xs mt-2 font-medium ${
+                                  isAvailable ? 'text-green-600 dark:text-green-400' : 'text-red-500'
+                                }`}>
+                                  {isAvailable
+                                    ? `${availableSeats} ${isBedClass ? 'bed' : 'seat'}${availableSeats !== 1 ? 's' : ''} available`
+                                    : 'Sold out'}
+                                </p>
+                              </button>
+                            );
+                          })}
+                        </div>
+                      ) : (
+                        <p className="text-center py-8 text-gray-400 text-sm">No seat classes available</p>
+                      )}
+                    </div>
+
+                    {/* Footer */}
+                    <div className="px-5 py-4 border-t border-gray-100 dark:border-gray-800 flex-shrink-0">
+                      <button
+                        onClick={() => { if (selectedClass) { handleSelect(classModal); setClassModal(null); } }}
+                        disabled={!selectedClass}
+                        className="w-full flex items-center justify-center gap-2 py-3.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all disabled:opacity-40 disabled:cursor-not-allowed shadow-lg"
+                      >
+                        <span>Continue</span>
+                        <ArrowRight className="w-4 h-4" />
+                      </button>
+                      {!selectedClass && (
+                        <p className="text-center text-xs text-gray-400 mt-2">Please select a class to continue</p>
+                      )}
+                    </div>
+                </div>
+                <style>{`@keyframes drawer-slide-in{from{transform:translateX(100%)}to{transform:translateX(0)}}`}</style>
+              </>
+            );
+          })()}
+
+          {/* Promo Notification */}
+          {promoData && (
+            <div className="mb-6 bg-green-50 dark:bg-green-900/20 border border-green-200 dark:border-green-800 rounded-lg p-4 flex items-start gap-3">
+              <Check className="w-5 h-5 text-green-600 dark:text-green-400 flex-shrink-0 mt-0.5" />
+              <div className="flex-1">
+                <h3 className="font-semibold text-green-900 dark:text-green-200">Promo code applied!</h3>
+                <p className="text-sm text-green-800 dark:text-green-300 mt-1">
+                  <span className="font-mono font-bold">{promoData.code}</span> — {promoData.message}
+                </p>
+              </div>
+            </div>
+          )}
+
           <div className="mb-8">
-            <button 
-              onClick={() => router.push(buildSearchUrl())} 
-              className="btn-ghost px-0 py-4 flex items-center gap-2"
-            >
+            <button onClick={() => router.push(buildSearchUrl())} className="btn-ghost px-0 py-4 flex items-center gap-2">
               <ChevronLeft className="w-4 h-4" />
               Modify search
             </button>
-            <h1 className="section-title">Available trains</h1>
-            <div className="flex flex-wrap items-center gap-4 text-gray-600 dark:text-gray-400 mt-3">
+            <h1 className="section-title">Available schedules</h1>
+            <div className="hidden sm:flex flex-wrap items-center gap-4 text-gray-600 dark:text-gray-400 mt-3">
               <div className="flex items-center gap-2">
                 <Calendar className="w-4 h-4" />
                 <span>{searchData.date ? format(new Date(searchData.date), 'EEEE, MMMM d, yyyy') : 'Date not specified'}</span>
@@ -174,32 +320,33 @@ export default function ResultsPage() {
                 <Users className="w-4 h-4" />
                 <span>{searchData.adultCount} adult(s), {searchData.childCount} child(ren)</span>
               </div>
+              {searchData.promoCode && (
+                <div className="flex items-center gap-2 bg-green-50 dark:bg-green-900/30 text-green-700 dark:text-green-300 px-3 py-1 rounded-full text-sm">
+                  <Gift className="w-4 h-4" />
+                  <span>{searchData.promoCode}</span>
+                </div>
+              )}
             </div>
           </div>
 
           <div className="space-y-4">
             {results.map((schedule) => {
               const scheduleId = schedule.scheduleId || schedule.id || '';
-              const isExpanded = expandedSchedules[scheduleId];
               const selectedClass = selectedClasses[scheduleId];
-              
               const lowestFare = schedule.faresByClass && Array.isArray(schedule.faresByClass) && schedule.faresByClass.length > 0
                 ? Math.min(...schedule.faresByClass.map((f: any) => f.baseFareMinor).filter((fare: number) => fare > 0))
                 : null;
-              
               const hours = Math.floor((schedule.durationMinutes || 0) / 60);
               const minutes = (schedule.durationMinutes || 0) % 60;
               const durationStr = `${hours}h ${minutes}m`;
-              
               const departureDate = schedule.departureAt ? new Date(schedule.departureAt) : null;
-              const arrivalDate = schedule.arrivalAt ? new Date(schedule.arrivalAt) : null;
-              const isNextDay = departureDate && arrivalDate && 
-                departureDate.toDateString() !== arrivalDate.toDateString();
-              
+              const arrivalDate   = schedule.arrivalAt   ? new Date(schedule.arrivalAt)   : null;
+              const isNextDay = departureDate && arrivalDate && departureDate.toDateString() !== arrivalDate.toDateString();
+
               return (
-              <div key={scheduleId} className="card group">
-                <div className="flex flex-col gap-6">
+                <div key={scheduleId} className="card">
                   <div className="flex flex-col lg:flex-row lg:items-center gap-6">
+                    {/* Train info */}
                     <div className="flex-1">
                       <div className="flex items-center gap-3 mb-4">
                         <div className="w-10 h-10 bg-blue-100 dark:bg-blue-900/30 rounded-lg flex items-center justify-center flex-shrink-0">
@@ -210,7 +357,7 @@ export default function ResultsPage() {
                           <div className="text-sm text-gray-600 dark:text-gray-400">{schedule.trainName || 'Express Service'}</div>
                         </div>
                       </div>
-                      
+
                       <div className="flex items-center gap-4">
                         <div className="text-center">
                           <div className="text-3xl font-bold text-gray-900 dark:text-gray-100">
@@ -221,135 +368,62 @@ export default function ResultsPage() {
                           </div>
                           <div className="text-sm text-gray-600 dark:text-gray-400 mt-1">{schedule.origin?.name || 'Origin'}</div>
                         </div>
-                        
+
                         <div className="flex-1 flex flex-col items-center">
                           <div className="flex items-center gap-2 mb-2 text-sm text-gray-600 dark:text-gray-400">
                             <Clock className="w-4 h-4" />
                             <span>{durationStr}</span>
                           </div>
                           <div className="w-full h-0.5 bg-gray-200 dark:bg-gray-700 relative">
-                            <div className="absolute left-0 top-1/2 -translate-y-1/2 w-2 h-2 bg-primary rounded-full"></div>
-                            <div className="absolute right-0 top-1/2 -translate-y-1/2 w-2 h-2 bg-primary rounded-full"></div>
-                          </div>
-                          <div className="flex items-center gap-2 mt-2 text-sm text-gray-600 dark:text-gray-400">
-                            {schedule.stops && schedule.stops.length > 0 && (
-                              <>
-                                <MapPin className="w-4 h-4" />
-                                <span>{schedule.stops.length - 2} stops</span>
-                              </>
-                            )}
+                            <div className="absolute left-0 top-1/2 -translate-y-1/2 w-2 h-2 bg-primary rounded-full" />
+                            <div className="absolute right-0 top-1/2 -translate-y-1/2 w-2 h-2 bg-primary rounded-full" />
                           </div>
+                          {schedule.stops && schedule.stops.length > 0 && (
+                            <div className="flex items-center gap-1 mt-2 text-sm text-gray-600 dark:text-gray-400">
+                              <MapPin className="w-4 h-4" />
+                              <span>{schedule.stops.length - 2} stops</span>
+                            </div>
+                          )}
                         </div>
-                        
+
                         <div className="text-center">
                           <div className="text-3xl font-bold text-gray-900 dark:text-gray-100">
                             {schedule.arrivalAt ? format(new Date(schedule.arrivalAt), 'HH:mm') : '--:--'}
                           </div>
                           <div className="text-xs text-gray-500 dark:text-gray-400 mt-0.5 flex items-center justify-center gap-1">
                             <span>{schedule.arrivalAt ? format(new Date(schedule.arrivalAt), 'MMM d') : ''}</span>
-                            {isNextDay && (
-                              <span className="text-orange-600 dark:text-orange-400 font-medium">(+1)</span>
-                            )}
+                            {isNextDay && <span className="text-orange-500 font-medium">(+1)</span>}
                           </div>
                           <div className="text-sm text-gray-600 dark:text-gray-400 mt-1">{schedule.destination?.name || 'Destination'}</div>
                         </div>
                       </div>
                     </div>
 
+                    {/* Fare + action */}
                     <div className="lg:border-l dark:border-gray-700 lg:pl-6 lg:min-w-[220px]">
                       <div className="text-center lg:text-right">
                         <div className="text-sm text-gray-600 dark:text-gray-400 mb-1">Starting from</div>
-                        <div className="text-3xl font-bold text-primary dark:text-white">
+                        <div className="text-3xl font-bold text-primary">
                           {lowestFare ? `ETB ${(lowestFare / 100).toFixed(2)}` : 'N/A'}
                         </div>
                         <div className="text-xs text-gray-500 dark:text-gray-400 mt-1 mb-4">per adult</div>
+                        {selectedClass && (
+                          <p className="text-xs text-primary font-semibold mb-2">
+                            {selectedClass.replace(/_/g, ' ')} selected
+                          </p>
+                        )}
                         <button
-                          onClick={() => toggleExpanded(scheduleId)}
+                          onClick={() => setClassModal(schedule)}
                           className="btn-secondary w-full flex items-center justify-center gap-2"
                         >
-                          <span>Select class</span>
-                          {isExpanded ? (
-                            <ChevronUp className="w-4 h-4" />
-                          ) : (
-                            <ChevronDown className="w-4 h-4" />
-                          )}
+                          {selectedClass ? 'Change class' : 'Select class'}
                         </button>
                       </div>
                     </div>
                   </div>
-
-                  {isExpanded && (
-                    <div className="mt-6 pt-6 border-t dark:border-gray-700">
-                      <h4 className="font-semibold text-gray-900 dark:text-gray-100 mb-3">Select Seat Class</h4>
-                      <div className="grid grid-cols-1 md:grid-cols-3 gap-3">
-                        {schedule.faresByClass && Array.isArray(schedule.faresByClass) && schedule.faresByClass.length > 0 ? (
-                          schedule.faresByClass.map((fareClass: any) => {
-                            const isSelected = selectedClass === fareClass.seatClassName;
-                            const availableSeats = schedule.availabilityByClass?.[fareClass.seatClassName] || 0;
-                            const isAvailable = availableSeats > 0;
-                            
-                            return (
-                              <button
-                                key={fareClass.seatClassName}
-                                onClick={() => isAvailable && handleSelectClass(scheduleId, fareClass.seatClassName)}
-                                disabled={!isAvailable}
-                                className={`relative p-4 rounded-lg border-2 text-left transition-all ${
-                                  isSelected
-                                    ? 'border-primary bg-blue-50 dark:bg-blue-900/20 shadow-md'
-                                    : isAvailable
-                                    ? 'border-gray-200 dark:border-gray-700 hover:border-blue-300 hover:shadow-sm'
-                                    : 'border-gray-100 dark:border-gray-800 bg-gray-50 dark:bg-gray-800 opacity-60 cursor-not-allowed'
-                                }`}
-                              >
-                                {isSelected && (
-                                  <div className="absolute top-2 right-2 w-6 h-6 bg-primary rounded-full flex items-center justify-center">
-                                    <Check className="w-4 h-4 text-white" />
-                                  </div>
-                                )}
-                                <div className="font-semibold text-gray-900 dark:text-gray-100 mb-1">
-                                  {fareClass.seatClassName.replace(/_/g, ' ')}
-                                </div>
-                                <div className="text-2xl font-bold text-primary dark:text-white mb-1">
-                                  ETB {((fareClass.baseFareMinor || 0) / 100).toFixed(2)}
-                                </div>
-                                <div className="text-xs text-gray-600 dark:text-gray-400">
-                                  {isAvailable ? (
-                                    <span className="text-green-600 dark:text-green-400 font-medium">
-                                      {availableSeats} seat{availableSeats !== 1 ? 's' : ''} available
-                                    </span>
-                                  ) : (
-                                    <span className="text-red-600 dark:text-red-400 font-medium">Sold out</span>
-                                  )}
-                                </div>
-                              </button>
-                            );
-                          })
-                        ) : (
-                          <div className="col-span-3 text-center py-4 text-gray-500 dark:text-gray-400">
-                            No seat classes available
-                          </div>
-                        )}
-                      </div>
-                      
-                      <div className="mt-4 flex justify-end">
-                        <button 
-                          onClick={() => handleSelect(schedule)} 
-                          disabled={!selectedClass}
-                          className={`btn-primary flex items-center justify-center gap-2 ${
-                            !selectedClass
-                              ? 'opacity-50 cursor-not-allowed'
-                              : 'group-hover:shadow-xl'
-                          }`}
-                        >
-                          <span>Continue</span>
-                          <ArrowRight className="w-4 h-4 group-hover:translate-x-1 transition-transform" />
-                        </button>
-                      </div>
-                    </div>
-                  )}
                 </div>
-              </div>
-            )})}
+              );
+            })}
           </div>
         </div>
       </div>
diff --git a/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
index fa48c7610..5b2ad3e9b 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
@@ -9,8 +9,11 @@ import { useAuthStore } from '@/lib/auth-store';
 import { apiClient } from '@/lib/api-client';
 import { useBookingStore } from '@/lib/booking-store';
 import { Station } from '@/types';
-import { Train, MapPin, ArrowRight, Plus, Minus, Search, Users, ChevronDown } from 'lucide-react';
-import { useEffect, useState } from 'react';
+import {
+  Train, MapPin, ArrowRight, ArrowLeftRight, Plus, Minus, Search,
+  Users, ChevronDown, Gift, Check, X, ChevronLeft, Clock, Zap,
+} from 'lucide-react';
+import { useEffect, useRef, useState, useCallback } from 'react';
 import ModernDatePicker from '@/components/ModernDatePicker';
 
 const searchSchema = z.object({
@@ -20,73 +23,473 @@ const searchSchema = z.object({
   adultCount: z.number().min(1).max(9),
   childCount: z.number().min(0).max(9),
   nationality: z.enum(['ETHIOPIAN', 'DJIBOUTIAN', 'OTHER']),
-}).refine((data) => data.originStationId !== data.destinationStationId, {
+  promoCode: z.string().optional(),
+}).refine((d) => d.originStationId !== d.destinationStationId, {
   message: 'Origin and destination must be different',
   path: ['destinationStationId'],
 });
 
 type SearchForm = z.infer<typeof searchSchema>;
 
+const POPULAR_ROUTES = [
+  { from: 'Sebeta', to: 'Nagad', duration: '12h', icon: '🌆' },
+  { from: 'Sebeta', to: 'Diredawa', duration: '8h', icon: '🏔️' },
+  { from: 'Diredawa', to: 'Nagad', duration: '4h', icon: '🌊' },
+];
+
+// ─── Station Modal ────────────────────────────────────────────────────────────
+function StationModal({
+  stations,
+  title,
+  excludeId,
+  onSelect,
+  onClose,
+  recentIds,
+}: {
+  stations: Station[];
+  title: string;
+  excludeId?: string;
+  onSelect: (s: Station) => void;
+  onClose: () => void;
+  recentIds: string[];
+}) {
+  const [query, setQuery] = useState('');
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  useEffect(() => {
+    setTimeout(() => inputRef.current?.focus(), 100);
+  }, []);
+
+  const filtered = query.trim()
+    ? stations.filter(
+        (s) =>
+          s.id !== excludeId &&
+          (s.name.toLowerCase().includes(query.toLowerCase()) ||
+            s.code?.toLowerCase().includes(query.toLowerCase()))
+      )
+    : stations.filter((s) => s.id !== excludeId);
+
+  const recentStations = recentIds
+    .map((id) => stations.find((s) => s.id === id))
+    .filter(Boolean) as Station[];
+
+  return (
+    <div className="fixed inset-0 z-[100] bg-white dark:bg-gray-900 flex flex-col md:hidden animate-slide-up">
+      {/* Header */}
+      <div className="flex items-center gap-3 px-4 py-4 border-b border-gray-100 dark:border-gray-800 bg-white dark:bg-gray-900">
+        <button
+          type="button"
+          onClick={onClose}
+          className="w-10 h-10 flex items-center justify-center rounded-full hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors"
+        >
+          <ChevronLeft className="w-5 h-5 text-gray-600 dark:text-gray-400" />
+        </button>
+        <h2 className="text-lg font-semibold text-gray-900 dark:text-white">{title}</h2>
+      </div>
+
+      {/* Search input */}
+      <div className="px-4 py-3 bg-white dark:bg-gray-900">
+        <div className="relative">
+          <Search className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-gray-400" />
+          <input
+            ref={inputRef}
+            value={query}
+            onChange={(e) => setQuery(e.target.value)}
+            placeholder="Search stations..."
+            className="w-full pl-10 pr-10 py-3 bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl text-sm focus:outline-none focus:ring-2 focus:ring-primary text-gray-900 dark:text-white placeholder-gray-400"
+          />
+          {query && (
+            <button
+              type="button"
+              onClick={() => setQuery('')}
+              className="absolute right-3 top-1/2 -translate-y-1/2"
+            >
+              <X className="w-4 h-4 text-gray-400" />
+            </button>
+          )}
+        </div>
+      </div>
+
+      {/* Results */}
+      <div className="flex-1 overflow-y-auto px-4 pb-6">
+        {!query && recentStations.length > 0 && (
+          <div className="mb-4">
+            <p className="text-xs font-semibold text-gray-400 uppercase tracking-wide mb-2 mt-2">Recent</p>
+            {recentStations.map((s) => (
+              <button
+                key={s.id}
+                type="button"
+                onClick={() => onSelect(s)}
+                className="w-full flex items-center gap-3 py-3.5 px-3 rounded-xl hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors text-left"
+              >
+                <div className="w-8 h-8 bg-primary/10 rounded-full flex items-center justify-center flex-shrink-0">
+                  <Clock className="w-4 h-4 text-primary" />
+                </div>
+                <div>
+                  <p className="font-medium text-gray-900 dark:text-white text-sm">{s.name}</p>
+                  {s.code && <p className="text-xs text-gray-400">{s.code}</p>}
+                </div>
+              </button>
+            ))}
+          </div>
+        )}
+
+        <p className="text-xs font-semibold text-gray-400 uppercase tracking-wide mb-2 mt-2">
+          {query ? 'Results' : 'All Stations'}
+        </p>
+        {filtered.length === 0 ? (
+          <div className="text-center py-10 text-gray-400">
+            <MapPin className="w-8 h-8 mx-auto mb-2 opacity-40" />
+            <p className="text-sm">No stations found</p>
+          </div>
+        ) : (
+          filtered.map((s) => (
+            <button
+              key={s.id}
+              type="button"
+              onClick={() => onSelect(s)}
+              className="w-full flex items-center gap-3 py-3.5 px-3 rounded-xl hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors text-left"
+            >
+              <div className="w-8 h-8 bg-gray-100 dark:bg-gray-800 rounded-full flex items-center justify-center flex-shrink-0">
+                <MapPin className="w-4 h-4 text-primary" />
+              </div>
+              <div>
+                <p className="font-medium text-gray-900 dark:text-white text-sm">{s.name}</p>
+                {s.code && <p className="text-xs text-gray-400">{s.code} • {s.country}</p>}
+              </div>
+            </button>
+          ))
+        )}
+      </div>
+    </div>
+  );
+}
+
+// ─── Passenger Modal (mobile bottom-sheet) ───────────────────────────────────
+function PassengerModal({
+  adultCount,
+  childCount,
+  onChangeAdult,
+  onChangeChild,
+  onClose,
+}: {
+  adultCount: number;
+  childCount: number;
+  onChangeAdult: (n: number) => void;
+  onChangeChild: (n: number) => void;
+  onClose: () => void;
+}) {
+  const rows = [
+    { label: 'Adults', sub: '≥ 5 years', val: adultCount, min: 1, max: 9, onChange: onChangeAdult },
+    { label: 'Children', sub: '< 5 years • First child free', val: childCount, min: 0, max: 9, onChange: onChangeChild },
+  ];
+
+  return (
+    <>
+      {/* Backdrop */}
+      <div className="fixed inset-0 z-[99] bg-black/40" onClick={onClose} />
+      {/* Bottom sheet */}
+      <div
+        className="fixed inset-x-0 bottom-0 z-[100] bg-white dark:bg-gray-900 rounded-t-2xl shadow-2xl"
+        style={{ animation: 'pax-slide-up 0.25s cubic-bezier(0.32,0.72,0,1)' }}
+      >
+        {/* Handle */}
+        <div className="flex justify-center pt-3 pb-1">
+          <div className="w-10 h-1 rounded-full bg-gray-300 dark:bg-gray-600" />
+        </div>
+        {/* Header */}
+        <div className="flex items-center justify-between px-5 py-3 border-b border-gray-100 dark:border-gray-800">
+          <div className="flex items-center gap-2">
+            <Users className="w-4 h-4 text-primary" />
+            <h2 className="text-base font-bold text-gray-900 dark:text-white">Passengers</h2>
+          </div>
+          <button type="button" onClick={onClose} className="w-9 h-9 flex items-center justify-center rounded-full hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors">
+            <X className="w-5 h-5 text-gray-500" />
+          </button>
+        </div>
+        {/* Rows */}
+        <div className="px-5 py-4 space-y-5">
+          {rows.map(({ label, sub, val, min, max, onChange }, i) => (
+            <div key={label}>
+              {i > 0 && <div className="border-t border-gray-100 dark:border-gray-800 -mx-5 mb-5" />}
+              <div className="flex items-center justify-between">
+                <div>
+                  <p className="text-sm font-semibold text-gray-900 dark:text-white">{label}</p>
+                  <p className="text-xs text-gray-400 mt-0.5">{sub}</p>
+                </div>
+                <div className="flex items-center gap-4">
+                  <button
+                    type="button"
+                    onClick={() => val > min && onChange(val - 1)}
+                    disabled={val <= min}
+                    className="w-10 h-10 rounded-full border-2 border-gray-200 dark:border-gray-700 flex items-center justify-center hover:border-primary hover:text-primary transition-colors disabled:opacity-30"
+                  >
+                    <Minus className="w-4 h-4" />
+                  </button>
+                  <span className="w-6 text-center text-lg font-bold text-gray-900 dark:text-white tabular-nums">{val}</span>
+                  <button
+                    type="button"
+                    onClick={() => val < max && onChange(val + 1)}
+                    disabled={val >= max}
+                    className="w-10 h-10 rounded-full border-2 border-gray-200 dark:border-gray-700 flex items-center justify-center hover:border-primary hover:text-primary transition-colors disabled:opacity-30"
+                  >
+                    <Plus className="w-4 h-4" />
+                  </button>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+        {/* Done */}
+        <div className="px-5 pb-8 pt-2">
+          <button
+            type="button"
+            onClick={onClose}
+            className="w-full py-3.5 bg-[rgb(20,113,76)] text-white font-bold text-sm rounded-xl"
+          >
+            Done — {adultCount + childCount} Passenger{adultCount + childCount !== 1 ? 's' : ''}
+          </button>
+        </div>
+        <style>{`@keyframes pax-slide-up{from{transform:translateY(100%);opacity:0}to{transform:translateY(0);opacity:1}}`}</style>
+      </div>
+    </>
+  );
+}
+
+// ─── Station Autocomplete (Desktop dropdown) ──────────────────────────────────
+function StationDropdown({
+  stations,
+  value,
+  excludeId,
+  placeholder,
+  onSelect,
+  error,
+  recentIds,
+}: {
+  stations: Station[];
+  value: string;
+  excludeId?: string;
+  placeholder: string;
+  onSelect: (s: Station) => void;
+  error?: string;
+  recentIds: string[];
+}) {
+  const [query, setQuery] = useState('');
+  const [open, setOpen] = useState(false);
+  const ref = useRef<HTMLDivElement>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+  const selectedStation = stations.find((s) => s.id === value);
+
+  useEffect(() => {
+    if (selectedStation && !open) setQuery('');
+  }, [selectedStation, open]);
+
+  useEffect(() => {
+    const handler = (e: MouseEvent) => {
+      if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false);
+    };
+    document.addEventListener('mousedown', handler);
+    return () => document.removeEventListener('mousedown', handler);
+  }, []);
+
+  const filtered = query.trim()
+    ? stations.filter(
+        (s) =>
+          s.id !== excludeId &&
+          (s.name.toLowerCase().includes(query.toLowerCase()) ||
+            s.code?.toLowerCase().includes(query.toLowerCase()))
+      )
+    : stations.filter((s) => s.id !== excludeId).slice(0, 8);
+
+  const displayValue = open ? query : (selectedStation?.name ?? '');
+
+  return (
+    <div ref={ref} className="relative">
+      <div
+        className={`relative flex items-center border-2 rounded-xl transition-all duration-200 bg-white dark:bg-gray-800 ${
+          error ? 'border-red-400' : open ? 'border-primary ring-2 ring-primary/20' : 'border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600'
+        }`}
+      >
+        <MapPin className="absolute left-3.5 w-4 h-4 text-primary flex-shrink-0" />
+        <input
+          ref={inputRef}
+          value={displayValue}
+          onChange={(e) => { setQuery(e.target.value); setOpen(true); }}
+          onFocus={() => { setQuery(''); setOpen(true); }}
+          placeholder={placeholder}
+          className="w-full pl-10 pr-8 py-3.5 bg-transparent rounded-xl focus:outline-none text-sm text-gray-900 dark:text-white placeholder-gray-400"
+        />
+        {value && (
+          <button
+            type="button"
+            onClick={() => { onSelect({ id: '', name: '', code: '', country: '' }); setQuery(''); }}
+            className="absolute right-3 p-0.5"
+          >
+            <X className="w-3.5 h-3.5 text-gray-400 hover:text-gray-600" />
+          </button>
+        )}
+      </div>
+
+      {open && (
+        <div className="absolute top-full left-0 right-0 mt-2 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl shadow-xl z-50 max-h-56 overflow-y-auto overflow-x-hidden scrollbar-hide">
+          {!query && recentIds.length > 0 && (
+            <div className="px-3 pt-2 pb-1">
+              <p className="text-[10px] font-semibold text-gray-400 uppercase tracking-wide mb-1">Recent</p>
+              {recentIds
+                .map((id) => stations.find((s) => s.id === id))
+                .filter(Boolean)
+                .map((s) => (
+                  <button
+                    key={s!.id}
+                    type="button"
+                    onMouseDown={() => { onSelect(s!); setOpen(false); setQuery(''); }}
+                    className="w-full flex items-center gap-2 px-2 py-2 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 text-left"
+                  >
+                    <Clock className="w-3.5 h-3.5 text-primary flex-shrink-0" />
+                    <span className="text-sm text-gray-800 dark:text-gray-200">{s!.name}</span>
+                  </button>
+                ))}
+              <div className="border-t border-gray-100 dark:border-gray-700 mt-1 mb-1" />
+            </div>
+          )}
+          {filtered.length === 0 ? (
+            <p className="text-sm text-gray-400 text-center py-4">No stations found</p>
+          ) : (
+            filtered.map((s) => (
+              <button
+                key={s.id}
+                type="button"
+                onMouseDown={() => { onSelect(s); setOpen(false); setQuery(''); }}
+                className="w-full flex items-center gap-2 px-3 py-2.5 hover:bg-gray-50 dark:hover:bg-gray-700 text-left transition-colors"
+              >
+                <MapPin className="w-3.5 h-3.5 text-primary flex-shrink-0" />
+                <div>
+                  <span className="text-sm font-medium text-gray-900 dark:text-white">{s.name}</span>
+                  {s.code && <span className="text-xs text-gray-400 ml-1.5">{s.code}</span>}
+                </div>
+              </button>
+            ))
+          )}
+        </div>
+      )}
+    </div>
+  );
+}
+
+// ─── Main Page ────────────────────────────────────────────────────────────────
 export default function SearchPage() {
   const router = useRouter();
   const searchParams = useSearchParams();
   const setSearchCriteria = useBookingStore((s) => s.setSearchCriteria);
   const { user, isAuthenticated } = useAuthStore();
-  const [isPassengerOpen, setIsPassengerOpen] = useState(false);
 
-  const { data: stations, isLoading, error } = useQuery<Station[]>({
+  const [isPassengerOpen, setIsPassengerOpen] = useState(false);
+  const [passengerModalOpen, setPassengerModalOpen] = useState(false);
+  const [promoVisible, setPromoVisible] = useState(false);
+  const [promoCode, setPromoCode] = useState('');
+  const [promoValidation, setPromoValidation] = useState<{ valid: boolean; message: string } | null>(null);
+  const [promoLoading, setPromoLoading] = useState(false);
+  const [swapping, setSwapping] = useState(false);
+  const [stationModal, setStationModal] = useState<'origin' | 'destination' | null>(null);
+  const [recentStationIds, setRecentStationIds] = useState<string[]>(() => {
+    try { return JSON.parse(localStorage.getItem('edr_recent_stations') || '[]'); } catch { return []; }
+  });
+  const passengerRef = useRef<HTMLDivElement>(null);
+
+  const { data: stations = [], isLoading, error } = useQuery<Station[]>({
     queryKey: ['stations'],
-    queryFn: async (): Promise<Station[]> => {
-      const response = await apiClient.get('/stations') as Station[];
-      return response;
-    },
+    queryFn: async () => await apiClient.get('/stations') as Station[],
   });
 
   const { register, handleSubmit, watch, setValue, formState: { errors } } = useForm<SearchForm>({
-    resolver: zodResolver(searchSchema),
+    resolver: zodResolver(searchSchema as any),
     defaultValues: {
       adultCount: 1,
       childCount: 0,
       nationality: 'ETHIOPIAN',
       departureDate: new Date().toISOString().split('T')[0],
+      promoCode: '',
     },
   });
 
   useEffect(() => {
     if (isAuthenticated && user?.nationality) {
-      const normalized = user.nationality.toUpperCase().trim();
-      if (normalized.includes('DJIBOUTIAN') || normalized === 'DJIBOUTIAN') {
-        setValue('nationality', 'DJIBOUTIAN');
-      } else if (normalized.includes('ETHIOPIAN') || normalized === 'ETHIOPIAN') {
-        setValue('nationality', 'ETHIOPIAN');
-      } else {
-        setValue('nationality', 'OTHER');
-      }
+      const n = user.nationality.toUpperCase().trim();
+      setValue('nationality', n.includes('DJIBOUTIAN') ? 'DJIBOUTIAN' : n.includes('ETHIOPIAN') ? 'ETHIOPIAN' : 'OTHER');
     }
   }, [isAuthenticated, user?.nationality, setValue]);
 
   useEffect(() => {
-    const origin = searchParams.get('origin');
-    const destination = searchParams.get('destination');
+    const o = searchParams.get('origin');
+    const d = searchParams.get('destination');
     const date = searchParams.get('date');
     const adults = searchParams.get('adults');
     const children = searchParams.get('children');
-    const nationality = searchParams.get('nationality');
-
-    if (origin) setValue('originStationId', origin);
-    if (destination) setValue('destinationStationId', destination);
+    const nat = searchParams.get('nationality');
+    if (o) setValue('originStationId', o);
+    if (d) setValue('destinationStationId', d);
     if (date) setValue('departureDate', date);
     if (adults) setValue('adultCount', parseInt(adults));
     if (children) setValue('childCount', parseInt(children));
-    if (nationality) setValue('nationality', nationality as 'ETHIOPIAN' | 'DJIBOUTIAN' | 'OTHER');
+    if (nat) setValue('nationality', nat as 'ETHIOPIAN' | 'DJIBOUTIAN' | 'OTHER');
   }, [searchParams, setValue]);
 
+  useEffect(() => {
+    const handler = (e: MouseEvent) => {
+      if (passengerRef.current && !passengerRef.current.contains(e.target as Node)) {
+        setIsPassengerOpen(false);
+      }
+    };
+    document.addEventListener('mousedown', handler);
+    return () => document.removeEventListener('mousedown', handler);
+  }, []);
+
   const originId = watch('originStationId');
+  const destId = watch('destinationStationId');
   const adultCount = watch('adultCount');
   const childCount = watch('childCount');
+  const departureDate = watch('departureDate');
+  const totalPassengers = (adultCount || 1) + (childCount || 0);
+
+  const saveRecent = useCallback((id: string) => {
+    setRecentStationIds((prev) => {
+      const next = [id, ...prev.filter((x) => x !== id)].slice(0, 5);
+      localStorage.setItem('edr_recent_stations', JSON.stringify(next));
+      return next;
+    });
+  }, []);
+
+  const handleSwap = () => {
+    if (!originId || !destId) return;
+    setSwapping(true);
+    setTimeout(() => {
+      setValue('originStationId', destId);
+      setValue('destinationStationId', originId);
+      setSwapping(false);
+    }, 300);
+  };
+
+  const handleValidatePromo = async () => {
+    if (!promoCode.trim()) return setPromoValidation(null);
+    setPromoLoading(true);
+    try {
+      const res = await apiClient.post('/promos/validate', { code: promoCode }) as any;
+      const valid = res.applicable || res.valid;
+      setPromoValidation({ valid, message: res.message || (valid ? 'Promo applied!' : 'Invalid promo code') });
+      if (valid) setValue('promoCode', promoCode);
+      else setPromoCode('');
+    } catch (err: any) {
+      setPromoValidation({ valid: false, message: err?.response?.data?.message || 'Promo code is invalid or expired' });
+      setPromoCode('');
+    } finally {
+      setPromoLoading(false);
+    }
+  };
 
   const onSubmit = (data: SearchForm) => {
     setSearchCriteria(data);
+    if (data.originStationId) saveRecent(data.originStationId);
+    if (data.destinationStationId) saveRecent(data.destinationStationId);
     const params = new URLSearchParams({
       origin: data.originStationId,
       destination: data.destinationStationId,
@@ -94,281 +497,385 @@ export default function SearchPage() {
       adults: data.adultCount.toString(),
       children: data.childCount.toString(),
       nationality: data.nationality,
+      ...(data.promoCode && { promoCode: data.promoCode }),
     });
     router.push(`/booking/results?${params}`);
   };
 
-  const getStationByName = (name: string) => {
-    if (!stations) return null;
-    const exactMatch = stations.find(s => s.name.toLowerCase() === name.toLowerCase());
-    if (exactMatch) return exactMatch;
-    return stations.find(s => s.name.toLowerCase().includes(name.toLowerCase()));
-  };
+  const getStationById = (id: string) => stations.find((s) => s.id === id);
+  const originStation = getStationById(originId);
+  const destStation = getStationById(destId);
 
   const handlePopularRoute = (fromName: string, toName: string) => {
-    const origin = getStationByName(fromName);
-    const destination = getStationByName(toName);
-    
-    if (origin && destination) {
+    const origin = stations.find((s) => s.name.toLowerCase().includes(fromName.toLowerCase()));
+    const dest = stations.find((s) => s.name.toLowerCase().includes(toName.toLowerCase()));
+    if (origin && dest) {
       setValue('originStationId', origin.id);
-      setValue('destinationStationId', destination.id);
+      setValue('destinationStationId', dest.id);
       window.scrollTo({ top: 0, behavior: 'smooth' });
     }
   };
 
-  const popularRoutes = [
-    { from: 'Sebeta', to: 'Nagad', duration: '12h' },
-    { from: 'Sebeta', to: 'Diredawa', duration: '8h' },
-    { from: 'Diredawa', to: 'Nagad', duration: '4h' },
-  ];
-
-
-
   return (
-    <div className="min-h-screen bg-gray-50 dark:bg-gray-900">
-      {/* Search Section */}
-      <div className="container mx-auto px-4 py-8 md:py-12">
-        <div className="max-w-6xl mx-auto">
-          {/* Search Card */}
-          <div className="bg-white dark:bg-gray-800 rounded-2xl shadow-lg border border-gray-200 dark:border-gray-700 overflow-visible">
-            {/* Header inside card */}
-            <div className="bg-gradient-to-r from-primary/5 to-primary/10 dark:from-primary/10 dark:to-primary/20 px-6 md:px-8 py-6 border-b border-gray-200 dark:border-gray-700">
-              <h1 className="text-2xl md:text-3xl font-bold text-gray-900 dark:text-gray-100">
-                Start booking
-              </h1>
-              <p className="text-sm text-gray-600 dark:text-gray-400 mt-1">
-                Search for available trains and book your journey
-              </p>
-            </div>
-            {error && (
-              <div className="bg-red-50 dark:bg-red-900/20 border-l-4 border-red-500 text-red-700 dark:text-red-400 px-6 py-4 flex items-start gap-3">
-                <div className="flex-shrink-0 mt-0.5">⚠️</div>
-                <div>
-                  <p className="font-semibold">Connection Error</p>
-                  <p className="text-sm mt-1">Unable to load stations. Please check your connection and try again.</p>
-                </div>
-              </div>
-            )}
-            
-            <form onSubmit={handleSubmit(onSubmit)} className="p-6 md:p-8">
-              {/* First Row: From, To, Date */}
-              <div className="grid grid-cols-1 md:grid-cols-3 gap-4 items-end mb-4">
-                {/* From */}
-                <div className="space-y-2 md:col-span-1">
-                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 text-left">From</label>
-                  <div className="relative">
-                    <MapPin className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-primary" />
-                    <select 
-                      {...register('originStationId')} 
-                      className="w-full pl-11 pr-4 py-3.5 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent disabled:bg-gray-50 dark:disabled:bg-gray-800 disabled:cursor-not-allowed text-base bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                      disabled={isLoading}
-                    >
-                      <option value="">Select departure</option>
-                      {stations?.map((s) => (
-                        <option key={s.id} value={s.id}>{s.name}</option>
-                      ))}
-                    </select>
-                  </div>
-                  {errors.originStationId && (
-                    <p className="text-red-600 dark:text-red-400 text-sm">{errors.originStationId.message}</p>
-                  )}
-                </div>
+    <div className="min-h-screen bg-gray-50 dark:bg-gray-950">
+      {/* Passenger modal (mobile) */}
+      {passengerModalOpen && (
+        <PassengerModal
+          adultCount={adultCount || 1}
+          childCount={childCount || 0}
+          onChangeAdult={(n) => setValue('adultCount', n)}
+          onChangeChild={(n) => setValue('childCount', n)}
+          onClose={() => setPassengerModalOpen(false)}
+        />
+      )}
 
-                {/* To */}
-                <div className="space-y-2 md:col-span-1">
-                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 text-left">To</label>
-                  <div className="relative">
-                    <MapPin className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-primary" />
-                    <select 
-                      {...register('destinationStationId')} 
-                      className="w-full pl-11 pr-4 py-3.5 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent disabled:bg-gray-50 dark:disabled:bg-gray-800 disabled:cursor-not-allowed text-base bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                      disabled={isLoading}
-                    >
-                      <option value="">Select arrival</option>
-                      {stations?.map((s) => (
-                        <option key={s.id} value={s.id} disabled={s.id === originId}>{s.name}</option>
-                      ))}
-                    </select>
-                  </div>
-                  {errors.destinationStationId && (
-                    <p className="text-red-600 dark:text-red-400 text-sm">{errors.destinationStationId.message}</p>
-                  )}
-                </div>
+      {/* Station modals (mobile) */}
+      {stationModal === 'origin' && (
+        <StationModal
+          stations={stations}
+          title="From — Departure"
+          excludeId={destId}
+          recentIds={recentStationIds}
+          onSelect={(s) => {
+            if (s.id) { setValue('originStationId', s.id); saveRecent(s.id); }
+            setStationModal(null);
+          }}
+          onClose={() => setStationModal(null)}
+        />
+      )}
+      {stationModal === 'destination' && (
+        <StationModal
+          stations={stations}
+          title="To — Destination"
+          excludeId={originId}
+          recentIds={recentStationIds}
+          onSelect={(s) => {
+            if (s.id) { setValue('destinationStationId', s.id); saveRecent(s.id); }
+            setStationModal(null);
+          }}
+          onClose={() => setStationModal(null)}
+        />
+      )}
 
-                {/* Date */}
-                <div className="space-y-2 relative z-30 md:col-span-1">
-                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 text-left">Date</label>
-                  <ModernDatePicker
-                    value={watch('departureDate') ? new Date(watch('departureDate') + 'T00:00:00') : undefined}
-                    onChange={(date) => {
-                      const year = date.getFullYear();
-                      const month = String(date.getMonth() + 1).padStart(2, '0');
-                      const day = String(date.getDate()).padStart(2, '0');
-                      setValue('departureDate', `${year}-${month}-${day}`);
-                    }}
-                    minDate={new Date()}
-                    placeholder="Select date"
-                  />
-                  {errors.departureDate && (
-                    <p className="text-red-600 dark:text-red-400 text-sm">{errors.departureDate.message}</p>
-                  )}
-                </div>
-              </div>
-
-              {/* Second Row: Passengers, Nationality, Promo Code */}
-              <div className="grid grid-cols-1 md:grid-cols-3 gap-4 items-end mb-4">
-                {/* Passengers Dropdown */}
-                <div className="space-y-2 relative z-20">
-                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 text-left">Passengers</label>
-                  <button
-                    type="button"
-                    onClick={() => setIsPassengerOpen(!isPassengerOpen)}
-                    className="w-full px-4 py-3.5 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent text-base bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 flex items-center justify-between hover:border-primary transition-colors"
-                  >
-                    <span className="flex items-center gap-2">
-                      <Users className="w-4 h-4 text-primary" />
-                      {(adultCount || 1) + (childCount || 0)} Passenger{((adultCount || 1) + (childCount || 0)) !== 1 ? 's' : ''}
-                    </span>
-                    <ChevronDown className={`w-4 h-4 transition-transform text-primary ${isPassengerOpen ? 'rotate-180' : ''}`} />
-                  </button>
-
-                  {/* Passenger Dropdown Menu */}
-                  {isPassengerOpen && (
-                    <>
-                      <div className="fixed inset-0 z-40" onClick={() => setIsPassengerOpen(false)} />
-                      <div className="absolute top-full left-0 right-0 mt-2 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-600 rounded-lg shadow-lg z-50 p-4 space-y-4">
-                        {/* Adults */}
-                        <div>
-                          <div className="flex items-center justify-between mb-2">
-                            <div>
-                              <div className="text-sm font-medium text-gray-900 dark:text-gray-100">Adults</div>
-                              <div className="text-xs text-gray-500 dark:text-gray-400">≥5 years</div>
-                            </div>
-                            <div className="flex items-center gap-2">
-                              <button
-                                type="button"
-                                onClick={() => {
-                                  const current = adultCount || 1;
-                                  if (current > 1) setValue('adultCount', current - 1);
-                                }}
-                                className="w-7 h-7 rounded-full border border-gray-300 dark:border-gray-600 flex items-center justify-center hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-50"
-                                disabled={(adultCount || 1) <= 1}
-                              >
-                                <Minus className="w-4 h-4 text-primary" />
-                              </button>
-                              <span className="w-6 text-center font-semibold text-gray-900 dark:text-gray-100">{adultCount || 1}</span>
-                              <button
-                                type="button"
-                                onClick={() => {
-                                  const current = adultCount || 1;
-                                  if (current < 9) setValue('adultCount', current + 1);
-                                }}
-                                className="w-7 h-7 rounded-full border border-gray-300 dark:border-gray-600 flex items-center justify-center hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-50"
-                                disabled={(adultCount || 1) >= 9}
-                              >
-                                <Plus className="w-4 h-4 text-primary" />
-                              </button>
-                            </div>
-                          </div>
-                        </div>
-
-                        {/* Children */}
-                        <div className="border-t border-gray-200 dark:border-gray-700 pt-4">
-                          <div className="flex items-center justify-between">
-                            <div>
-                              <div className="text-sm font-medium text-gray-900 dark:text-gray-100">Children</div>
-                              <div className="text-xs text-gray-500 dark:text-gray-400">&lt;5 years • First free</div>
-                            </div>
-                            <div className="flex items-center gap-2">
-                              <button
-                                type="button"
-                                onClick={() => {
-                                  const current = childCount || 0;
-                                  if (current > 0) setValue('childCount', current - 1);
-                                }}
-                                className="w-7 h-7 rounded-full border border-gray-300 dark:border-gray-600 flex items-center justify-center hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-50"
-                                disabled={(childCount || 0) <= 0}
-                              >
-                                <Minus className="w-4 h-4 text-primary" />
-                              </button>
-                              <span className="w-6 text-center font-semibold text-gray-900 dark:text-gray-100">{childCount || 0}</span>
-                              <button
-                                type="button"
-                                onClick={() => {
-                                  const current = childCount || 0;
-                                  if (current < 9) setValue('childCount', current + 1);
-                                }}
-                                className="w-7 h-7 rounded-full border border-gray-300 dark:border-gray-600 flex items-center justify-center hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-50"
-                                disabled={(childCount || 0) >= 9}
-                              >
-                                <Plus className="w-4 h-4 text-primary" />
-                              </button>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </>
-                  )}
-                </div>
-
-                {/* Nationality */}
-                <div className="space-y-2">
-                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 text-left">Nationality</label>
-                  <select {...register('nationality')} className="w-full px-4 py-3.5 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent text-base bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100">
-                    <option value="ETHIOPIAN">Ethiopian</option>
-                    <option value="DJIBOUTIAN">Djiboutian</option>
-                    <option value="OTHER">Other</option>
-                  </select>
-                </div>
-
-                {/* Promo Code */}
-                <div className="space-y-2">
-                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 text-left">Promo Code (Optional)</label>
-                  <input
-                    type="text"
-                    placeholder="Enter promo code"
-                    className="w-full px-4 py-3.5 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent text-base bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 placeholder-gray-500 dark:placeholder-gray-400"
-                  />
-                </div>
-              </div>
-
-              {/* Third Row: Search Button */}
-              <div>
-                <button type="submit" className="w-full bg-[rgb(20_113_76)] hover:bg-[rgb(16_89_60)] text-white font-semibold py-3.5 px-6 rounded-lg transition-all duration-200 flex items-center justify-center gap-2 shadow-lg hover:shadow-xl">
-                  <Search className="w-5 h-5 text-white" />
-                  <span>Search Train</span>
-                </button>
-              </div>
-            </form>
+      {/* Hero Banner */}
+      <div className="relative bg-gradient-to-br from-[rgb(14,80,54)] via-[rgb(20,113,76)] to-[rgb(16,140,90)] overflow-hidden">
+        <div className="absolute inset-0 opacity-10">
+          <div className="absolute top-4 right-8 w-32 h-32 border-2 border-white rounded-full" />
+          <div className="absolute top-12 right-20 w-20 h-20 border border-white rounded-full" />
+          <div className="absolute -bottom-6 left-10 w-40 h-40 border border-white rounded-full" />
+        </div>
+        <div className="container mx-auto px-4 pt-8 pb-20 md:pt-10 md:pb-24 relative z-10">
+          <div className="max-w-6xl mx-auto">
+            <h1 className="text-3xl md:text-4xl lg:text-5xl font-bold text-white leading-tight">
+              Where are you headed?
+            </h1>
+            <p className="text-white/70 text-sm md:text-base mt-2">Search and book train tickets fast &amp; easy</p>
           </div>
+        </div>
+      </div>
 
-          {/* Popular Routes */}
-          <div className="mt-12">
-            <h2 className="text-xl font-bold text-gray-900 dark:text-gray-100 mb-6">Popular Routes</h2>
-            <div className="grid md:grid-cols-3 gap-4">
-              {popularRoutes.map((route, idx) => (
+      {/* Search Card — pulled up over the hero */}
+      <div className="container mx-auto px-4 -mt-14 relative z-20 pb-8">
+        <div className="max-w-6xl mx-auto">
+          <form onSubmit={handleSubmit(onSubmit)}>
+            <div className="bg-white dark:bg-gray-900 rounded-2xl shadow-2xl border border-gray-100 dark:border-gray-800 overflow-visible">
+
+              {/* Error banner */}
+              {error && (
+                <div className="flex items-center gap-2 px-5 py-3 bg-red-50 dark:bg-red-900/20 text-red-600 dark:text-red-400 text-sm border-b border-red-100 dark:border-red-900/30 rounded-t-2xl">
+                  <span>⚠️</span>
+                  <span>Unable to load stations. Please check your connection.</span>
+                </div>
+              )}
+
+              <div className="p-5 md:p-6 space-y-3">
+
+                {/* ── Row 1 (mobile stacked): Stations + Date ── */}
+
+                {/* Mobile station fields */}
+                <div className="flex flex-col gap-3 md:hidden">
+                  <div className="space-y-1.5">
+                    <label className="text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide">From</label>
+                    <button type="button" onClick={() => setStationModal('origin')} className="w-full">
+                      <div className={`flex items-center gap-2.5 px-3.5 py-3.5 border-2 rounded-xl transition-all ${
+                        errors.originStationId ? 'border-red-400' : originId ? 'border-primary bg-primary/5' : 'border-gray-200 dark:border-gray-700'
+                      }`}>
+                        <MapPin className="w-4 h-4 text-primary flex-shrink-0" />
+                        <span className={`text-sm ${originStation ? 'font-semibold text-gray-900 dark:text-white' : 'text-gray-400'}`}>
+                          {originStation?.name ?? 'Select departure'}
+                        </span>
+                      </div>
+                    </button>
+                    {errors.originStationId && <p className="text-xs text-red-500">{errors.originStationId.message}</p>}
+                  </div>
+                  <div className="space-y-1.5">
+                    <div className="flex items-center justify-between">
+                      <label className="text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide">To</label>
+                      <button type="button" onClick={handleSwap} disabled={!originId || !destId} className="flex items-center gap-1 text-xs text-primary font-medium disabled:opacity-30">
+                        <ArrowLeftRight className={`w-3.5 h-3.5 transition-transform duration-300 ${swapping ? 'rotate-180' : ''}`} />
+                        Swap
+                      </button>
+                    </div>
+                    <button type="button" onClick={() => setStationModal('destination')} className="w-full">
+                      <div className={`flex items-center gap-2.5 px-3.5 py-3.5 border-2 rounded-xl transition-all ${
+                        errors.destinationStationId ? 'border-red-400' : destId ? 'border-primary bg-primary/5' : 'border-gray-200 dark:border-gray-700'
+                      }`}>
+                        <MapPin className="w-4 h-4 text-primary flex-shrink-0" />
+                        <span className={`text-sm ${destStation ? 'font-semibold text-gray-900 dark:text-white' : 'text-gray-400'}`}>
+                          {destStation?.name ?? 'Select destination'}
+                        </span>
+                      </div>
+                    </button>
+                    {errors.destinationStationId && <p className="text-xs text-red-500">{errors.destinationStationId.message}</p>}
+                  </div>
+                  {/* Date (mobile) */}
+                  <div className="space-y-1.5">
+                    <label className="text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide">Departure Date</label>
+                    <div className="relative z-30">
+                      <ModernDatePicker
+                        value={departureDate ? new Date(departureDate + 'T00:00:00') : undefined}
+                        onChange={(date) => setValue('departureDate', `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`)}
+                        minDate={new Date()}
+                        placeholder="Select date"
+                      />
+                    </div>
+                    {errors.departureDate && <p className="text-xs text-red-500">{errors.departureDate.message}</p>}
+                  </div>
+                </div>
+
+                {/* Desktop Row 1: From [swap] To + Date (3 equal cols) */}
+                <div className="hidden md:grid md:grid-cols-3 gap-3 items-end">
+                  {/* From + To with swap */}
+                  <div className="col-span-2 flex items-end gap-2">
+                    <div className="flex-1 space-y-1.5">
+                      <label className="text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide">From</label>
+                      <StationDropdown stations={stations} value={originId} excludeId={destId} placeholder="Select departure" recentIds={recentStationIds} onSelect={(s) => { setValue('originStationId', s.id); if (s.id) saveRecent(s.id); }} error={errors.originStationId?.message} />
+                      {errors.originStationId && <p className="text-xs text-red-500">{errors.originStationId.message}</p>}
+                    </div>
+                    <button
+                      type="button"
+                      onClick={handleSwap}
+                      disabled={!originId || !destId}
+                      className={`flex-shrink-0 mb-0.5 w-9 h-9 bg-gray-50 dark:bg-gray-800 border-2 border-gray-200 dark:border-gray-700 rounded-full flex items-center justify-center hover:border-primary hover:bg-primary/5 transition-all duration-200 disabled:opacity-30 ${swapping ? 'rotate-180' : ''}`}
+                      title="Swap stations"
+                    >
+                      <ArrowLeftRight className="w-4 h-4 text-gray-500" />
+                    </button>
+                    <div className="flex-1 space-y-1.5">
+                      <label className="text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide">To</label>
+                      <StationDropdown stations={stations} value={destId} excludeId={originId} placeholder="Select destination" recentIds={recentStationIds} onSelect={(s) => { setValue('destinationStationId', s.id); if (s.id) saveRecent(s.id); }} error={errors.destinationStationId?.message} />
+                      {errors.destinationStationId && <p className="text-xs text-red-500">{errors.destinationStationId.message}</p>}
+                    </div>
+                  </div>
+                  {/* Date */}
+                  <div className="space-y-1.5">
+                    <label className="text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide">Departure Date</label>
+                    <div className="relative z-30">
+                      <ModernDatePicker
+                        value={departureDate ? new Date(departureDate + 'T00:00:00') : undefined}
+                        onChange={(date) => setValue('departureDate', `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`)}
+                        minDate={new Date()}
+                        placeholder="Select date"
+                      />
+                    </div>
+                    {errors.departureDate && <p className="text-xs text-red-500">{errors.departureDate.message}</p>}
+                  </div>
+                </div>
+
+                {/* Route preview pill */}
+                {originStation && destStation && (
+                  <div className="flex items-center gap-2 px-3 py-2 bg-primary/5 dark:bg-primary/10 rounded-lg text-xs text-primary font-medium animate-bounce-in">
+                    <Train className="w-3.5 h-3.5" />
+                    <span>{originStation.name}</span>
+                    <ArrowRight className="w-3 h-3" />
+                    <span>{destStation.name}</span>
+                  </div>
+                )}
+
+                {/* ── Row 2: Passengers | Nationality | Search Button ── */}
+                <div className="grid grid-cols-1 sm:grid-cols-3 gap-3 items-end">
+
+                  {/* Passengers */}
+                  <div className="space-y-1.5" ref={passengerRef}>
+                    <label className="text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide">Passengers</label>
+
+                    {/* Mobile: opens bottom-sheet modal */}
+                    <button
+                      type="button"
+                      onClick={() => setPassengerModalOpen(true)}
+                      className="sm:hidden w-full flex items-center justify-between px-3.5 py-3.5 border-2 border-gray-200 dark:border-gray-700 rounded-xl bg-white dark:bg-gray-800"
+                    >
+                      <span className="flex items-center gap-2 text-sm font-medium text-gray-900 dark:text-white">
+                        <Users className="w-4 h-4 text-primary" />
+                        {totalPassengers} Passenger{totalPassengers !== 1 ? 's' : ''}
+                        {childCount > 0 && <span className="text-xs bg-primary/10 text-primary px-1.5 py-0.5 rounded-md">{childCount} child</span>}
+                      </span>
+                      <ChevronDown className="w-4 h-4 text-primary" />
+                    </button>
+
+                    {/* sm+: inline dropdown */}
+                    <div className="hidden sm:block relative z-20">
+                      <button
+                        type="button"
+                        onClick={() => setIsPassengerOpen(!isPassengerOpen)}
+                        className={`w-full flex items-center justify-between px-3.5 py-3.5 border-2 rounded-xl transition-all duration-200 bg-white dark:bg-gray-800 ${
+                          isPassengerOpen ? 'border-primary ring-2 ring-primary/20' : 'border-gray-200 dark:border-gray-700 hover:border-gray-300'
+                        }`}
+                      >
+                        <span className="flex items-center gap-2 text-sm font-medium text-gray-900 dark:text-white">
+                          <Users className="w-4 h-4 text-primary" />
+                          {totalPassengers} Pax
+                          {childCount > 0 && <span className="text-xs bg-primary/10 text-primary px-1.5 py-0.5 rounded-md">{childCount} child</span>}
+                        </span>
+                        <ChevronDown className={`w-4 h-4 text-primary transition-transform duration-200 ${isPassengerOpen ? 'rotate-180' : ''}`} />
+                      </button>
+                      {isPassengerOpen && (
+                        <div className="absolute top-full left-0 right-0 mt-2 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl shadow-xl z-50 p-4 space-y-4">
+                          {[
+                            { label: 'Adults', sub: '≥ 5 years', key: 'adultCount' as const, val: adultCount || 1, min: 1, max: 9 },
+                            { label: 'Children', sub: '< 5 years • First free', key: 'childCount' as const, val: childCount || 0, min: 0, max: 9 },
+                          ].map(({ label, sub, key, val, min, max }, i) => (
+                            <div key={key}>
+                              {i > 0 && <div className="border-t border-gray-100 dark:border-gray-700 -mx-4 mb-4" />}
+                              <div className="flex items-center justify-between">
+                                <div>
+                                  <p className="text-sm font-semibold text-gray-900 dark:text-white">{label}</p>
+                                  <p className="text-xs text-gray-400 mt-0.5">{sub}</p>
+                                </div>
+                                <div className="flex items-center gap-3">
+                                  <button type="button" onClick={() => val > min && setValue(key, val - 1)} disabled={val <= min} className="w-8 h-8 rounded-full border-2 border-gray-200 dark:border-gray-600 flex items-center justify-center hover:border-primary hover:text-primary transition-colors disabled:opacity-30"><Minus className="w-3.5 h-3.5" /></button>
+                                  <span className="w-6 text-center font-bold text-gray-900 dark:text-white tabular-nums">{val}</span>
+                                  <button type="button" onClick={() => val < max && setValue(key, val + 1)} disabled={val >= max} className="w-8 h-8 rounded-full border-2 border-gray-200 dark:border-gray-600 flex items-center justify-center hover:border-primary hover:text-primary transition-colors disabled:opacity-30"><Plus className="w-3.5 h-3.5" /></button>
+                                </div>
+                              </div>
+                            </div>
+                          ))}
+                          <button type="button" onClick={() => setIsPassengerOpen(false)} className="w-full py-2.5 bg-primary text-white text-sm font-semibold rounded-lg">Done</button>
+                        </div>
+                      )}
+                    </div>
+                  </div>
+
+                  {/* Nationality */}
+                  <div className="space-y-1.5">
+                    <label className="text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide">Nationality</label>
+                    <select
+                      {...register('nationality')}
+                      className="w-full px-3.5 py-3.5 border-2 border-gray-200 dark:border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary text-sm bg-white dark:bg-gray-800 text-gray-900 dark:text-white transition-all"
+                    >
+                      <option value="ETHIOPIAN">🇪🇹 Ethiopian</option>
+                      <option value="DJIBOUTIAN">🇩🇯 Djiboutian</option>
+                      <option value="OTHER">🌍 Other</option>
+                    </select>
+                  </div>
+
+                  {/* Search Button */}
+                  <button
+                    type="submit"
+                    disabled={isLoading}
+                    className="w-full flex items-center justify-center gap-2.5 py-3.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all duration-200 shadow-lg hover:shadow-xl hover:-translate-y-0.5 active:translate-y-0 disabled:opacity-50 disabled:cursor-not-allowed"
+                  >
+                    <Search className="w-5 h-5" />
+                    Search
+                  </button>
+                </div>
+
+                {/* ── Promo Code (collapsed by default) ── */}
+                <div>
+                  {!promoVisible ? (
+                    <button
+                      type="button"
+                      onClick={() => setPromoVisible(true)}
+                      className="flex items-center gap-1.5 text-xs text-primary font-medium hover:underline transition-colors"
+                    >
+                      <Gift className="w-3.5 h-3.5" />
+                      Apply Promo Code
+                    </button>
+                  ) : (
+                    <div className="flex flex-col gap-1.5 animate-bounce-in">
+                      <div className="flex gap-2">
+                        <div className="flex-1 relative">
+                          <Gift className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-primary" />
+                          <input
+                            type="text"
+                            value={promoCode}
+                            onChange={(e) => { setPromoCode(e.target.value.toUpperCase()); if (promoValidation) setPromoValidation(null); }}
+                            placeholder="Enter promo code"
+                            onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleValidatePromo())}
+                            className="w-full pl-9 pr-3 py-2.5 border-2 border-gray-200 dark:border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary text-sm bg-white dark:bg-gray-800 text-gray-900 dark:text-white placeholder-gray-400 transition-all"
+                            autoFocus
+                          />
+                        </div>
+                        <button
+                          type="button"
+                          onClick={handleValidatePromo}
+                          disabled={!promoCode || promoLoading}
+                          className="px-4 py-2.5 bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded-xl hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors disabled:opacity-40 text-sm font-semibold"
+                        >
+                          {promoLoading ? '...' : 'Apply'}
+                        </button>
+                        <button
+                          type="button"
+                          onClick={() => { setPromoVisible(false); setPromoCode(''); setPromoValidation(null); }}
+                          className="p-2.5 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 rounded-xl hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors"
+                        >
+                          <X className="w-4 h-4" />
+                        </button>
+                      </div>
+                      {promoValidation && (
+                        <div className={`flex items-center gap-1.5 text-xs ${promoValidation.valid ? 'text-green-600' : 'text-red-500'}`}>
+                          {promoValidation.valid && <Check className="w-3.5 h-3.5" />}
+                          {promoValidation.message}
+                        </div>
+                      )}
+                    </div>
+                  )}
+                </div>
+
+              </div>
+            </div>
+          </form>
+
+          {/* ── Popular Routes ── */}
+          <div className="mt-8">
+            <div className="flex items-center gap-2 mb-4">
+              <Zap className="w-4 h-4 text-primary" />
+              <h2 className="text-base font-bold text-gray-900 dark:text-white">Popular Routes</h2>
+            </div>
+            <div className="grid grid-cols-1 sm:grid-cols-3 gap-3">
+              {POPULAR_ROUTES.map((route, idx) => (
                 <button
                   key={idx}
                   type="button"
                   onClick={() => handlePopularRoute(route.from, route.to)}
-                  className="bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-5 hover:border-primary hover:shadow-md transition-all text-left group"
+                  className="bg-white dark:bg-gray-900 border border-gray-200 dark:border-gray-800 rounded-xl p-4 hover:border-primary hover:shadow-md transition-all text-left group active:scale-95"
                 >
-                  <div className="flex items-start justify-between mb-3">
-                    <div className="flex-1">
-                      <div className="font-semibold text-gray-900 dark:text-gray-100 mb-1">{route.from}</div>
-                      <ArrowRight className="w-4 h-4 text-primary my-2" />
-                      <div className="font-semibold text-gray-900 dark:text-gray-100">{route.to}</div>
-                    </div>
-                    <Train className="w-5 h-5 text-primary opacity-0 group-hover:opacity-100 transition-opacity" />
+                  <div className="text-xl mb-2">{route.icon}</div>
+                  <div className="flex items-center gap-1.5 text-sm font-semibold text-gray-900 dark:text-white">
+                    <span>{route.from}</span>
+                    <ArrowRight className="w-3.5 h-3.5 text-primary flex-shrink-0" />
+                    <span>{route.to}</span>
+                  </div>
+                  <div className="text-xs text-gray-400 mt-1 flex items-center gap-1">
+                    <Clock className="w-3 h-3" />
+                    {route.duration} journey
                   </div>
-                  <div className="text-sm text-gray-500 dark:text-gray-400">{route.duration} journey</div>
                 </button>
               ))}
             </div>
           </div>
-
         </div>
       </div>
+
+      <style jsx>{`
+        @keyframes slide-up {
+          from { transform: translateY(100%); opacity: 0; }
+          to { transform: translateY(0); opacity: 1; }
+        }
+        .animate-slide-up {
+          animation: slide-up 0.25s cubic-bezier(0.32, 0.72, 0, 1);
+        }
+      `}</style>
     </div>
   );
 }
diff --git a/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
index 4a40e893d..fc165c4f4 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
@@ -7,30 +7,39 @@ import { useBookingStore } from '@/lib/booking-store';
 import { useQuery, useMutation } from '@tanstack/react-query';
 import { apiClient } from '@/lib/api-client';
 import { useState, useEffect, useCallback, useMemo, memo } from 'react';
+import { Armchair, Bed, ChevronLeft } from 'lucide-react';
 
 import CustomModal from '@/components/CustomModal';
 
-// Separate component for seat button to prevent re-render issues
-const SeatButton = memo(({ seat, isSelected, onToggle }: any) => {
+const SeatButton = memo(({ seat, isSelected, onToggle, isBedCoach, bedLabel, coachSeatClass }: any) => {
   const seatLabel = seat.number || seat.label || seat.seatNumber || '?';
+  const bedWidth = 'w-24';
+  const width = isBedCoach ? bedWidth : 'w-10';
   
   return (
-    <button
-      onClick={() => onToggle(seat.id)}
-      disabled={seat.status !== 'AVAILABLE'}
-      className={`w-12 h-12 rounded flex items-center justify-center text-xs font-semibold transition-all ${
-        isSelected
-          ? 'bg-primary text-white shadow-md scale-105'
-          : seat.status === 'AVAILABLE'
-          ? 'bg-green-100 dark:bg-green-900/40 hover:bg-green-200 dark:hover:bg-green-800/50 text-green-800 dark:text-green-200 hover:shadow-md cursor-pointer'
-          : seat.status === 'HELD'
-          ? 'bg-yellow-100 dark:bg-yellow-900/40 text-yellow-700 dark:text-yellow-200 cursor-not-allowed opacity-75'
-          : 'bg-gray-200 dark:bg-gray-700 text-gray-500 dark:text-gray-400 cursor-not-allowed opacity-60'
-      }`}
-      title={`Seat ${seatLabel} - ${seat.status}`}
-    >
-      {seatLabel}
-    </button>
+    <div className="flex flex-col items-center">
+      <button
+        onClick={() => onToggle(seat.id)}
+        disabled={seat.status !== 'AVAILABLE'}
+        className={`${width} h-11 rounded flex items-center justify-center transition-all ${
+          isSelected
+            ? 'bg-[rgb(20_113_76)] text-white shadow-md scale-105'
+            : seat.status === 'AVAILABLE'
+            ? 'bg-green-500 hover:bg-green-600 text-white cursor-pointer hover:shadow-md'
+            : seat.status === 'HELD'
+            ? 'bg-yellow-500 text-white cursor-not-allowed opacity-75'
+            : 'bg-gray-500 text-white cursor-not-allowed opacity-60'
+        }`}
+        title={`Seat ${seatLabel}${bedLabel} - ${seat.status} - ${coachSeatClass}`}
+        style={isBedCoach ? (seat.row % 2 === 1 ? { transform: 'scaleY(-1)' } : undefined) : (seat.row % 2 === 0 ? { transform: 'scaleY(-1)' } : undefined)}
+      >
+        {isBedCoach ? (
+          <Bed className="w-7 h-7" />
+        ) : (
+          <Armchair className="w-7 h-7" />
+        )}
+      </button>
+    </div>
   );
 });
 
@@ -38,10 +47,9 @@ SeatButton.displayName = 'SeatButton';
 
 export default function SeatsPage() {
   const router = useRouter();
-  const { selectedSchedule, passengers, setSeatHold, setPassengers, searchCriteria } = useBookingStore();
+  const { selectedSchedule, passengers, setSeatHold, setPassengers, searchCriteria, bookingId } = useBookingStore();
   const [selectedSeats, setSelectedSeats] = useState<string[]>([]);
   const [selectedCoach, setSelectedCoach] = useState<string | null>(null);
-  const [_timeLeft, _setTimeLeft] = useState<number | null>(null);
   const [modalState, setModalState] = useState({
     isOpen: false,
     title: '',
@@ -77,53 +85,95 @@ export default function SeatsPage() {
     },
   });
 
+  const bookSeatsMutation = useMutation({
+    mutationFn: async (seatIds: string[]) => {
+      return Promise.all(
+        seatIds.map((seatId) =>
+          apiClient.patch(`/seats/${seatId}`, {
+            status: 'BOOKED',
+          }).catch(() => null)
+        )
+      );
+    },
+  });
+
   const coaches = useMemo(() => (seatMapData as any)?.coaches || [], [seatMapData]);
   
   const filteredCoaches = useMemo(() => {
-    return selectedSchedule?.selectedSeatClass
-      ? coaches.filter((c: any) => {
-          const seatClassName = typeof c.seatClass === 'string' ? c.seatClass : (c.seatClass?.name || c.coachClass || '');
-          return seatClassName === selectedSchedule.selectedSeatClass || 
-                 seatClassName.replace(/_/g, ' ').toLowerCase() === selectedSchedule.selectedSeatClass?.toLowerCase() ||
-                 seatClassName.toLowerCase() === selectedSchedule.selectedSeatClass?.toLowerCase();
-        })
-      : coaches;
+    if (!selectedSchedule?.selectedSeatClass) {
+      return coaches.filter((c: any) => c.seats && c.seats.length > 0);
+    }
+    
+    let filtered = coaches.filter((c: any) => {
+      const seatClasses = c.seatClasses || [c.seatClass] || [];
+      return seatClasses.some((seatClassName: string) => 
+        seatClassName === selectedSchedule.selectedSeatClass || 
+        seatClassName.replace(/_/g, ' ').toLowerCase() === selectedSchedule.selectedSeatClass?.toLowerCase() ||
+        seatClassName.toLowerCase() === selectedSchedule.selectedSeatClass?.toLowerCase()
+      );
+    });
+    return filtered.filter((c: any) => c.seats && c.seats.length > 0);
   }, [coaches, selectedSchedule?.selectedSeatClass]);
-  
-  const selectedCoachData = useMemo(() => filteredCoaches.find((c: any) => c.id === selectedCoach), [filteredCoaches, selectedCoach]);
-  const seats = useMemo(() => selectedCoachData?.seats || [], [selectedCoachData]);
 
   useEffect(() => {
-    if (filteredCoaches && filteredCoaches.length > 0 && !selectedCoach) {
+    if (filteredCoaches.length > 0 && !selectedCoach) {
       setSelectedCoach(filteredCoaches[0].id);
     }
   }, [filteredCoaches, selectedCoach]);
 
-  const toggleSeat = useCallback((seatId: string) => {
-    setSelectedSeats(prev => {
-      if (prev.includes(seatId)) {
-        return prev.filter(id => id !== seatId);
-      } else if (prev.length < passengers.length) {
-        return [...prev, seatId];
+  const selectedCoachData = useMemo(() => filteredCoaches.find((c: any) => c.id === selectedCoach), [filteredCoaches, selectedCoach]);
+  const allSeats = useMemo(() => selectedCoachData?.seats || [], [selectedCoachData]);
+  
+  const getBedPosition = (selectedClass: string): string | null => {
+    const lowerClass = selectedClass.toLowerCase();
+    if (lowerClass.includes('upper')) return 'upper';
+    if (lowerClass.includes('middle')) return 'middle';
+    if (lowerClass.includes('lower')) return 'lower';
+    return null;
+  };
+
+  const validSeats = useMemo(() => {
+    let seats = allSeats.filter((s: any) => s.seatNumber && !s.seatNumber.startsWith('-'));
+    const isBedCoach = selectedCoachData?.seatClass?.toLowerCase().includes('bed') || selectedCoachData?.mode?.toLowerCase().includes('bed');
+    
+    if (isBedCoach && selectedSchedule?.selectedSeatClass) {
+      const selectedBedPosition = getBedPosition(selectedSchedule.selectedSeatClass);
+      if (selectedBedPosition) {
+        seats = seats.filter((s: any) => s.bedPosition === selectedBedPosition);
+      }
+    }
+    
+    return seats;
+  }, [allSeats, selectedCoachData, selectedSchedule?.selectedSeatClass]);
+
+  const handleSeatClick = useCallback((seatId: string) => {
+    setSelectedSeats(prev => {
+      if (prev.length < passengers.length) {
+        return [...prev, seatId];
+      } else {
+        return [seatId];
       }
-      return prev;
     });
   }, [passengers.length]);
 
   const handleContinue = async () => {
     if (selectedSeats.length > 0) {
       await holdMutation.mutateAsync(selectedSeats);
-      const updatedPassengers = passengers.map((p, i) => ({
-        ...p,
-        seatId: selectedSeats[i],
-      }));
+      const updatedPassengers = passengers.map((p, i) => {
+        const seatData = validSeats?.find((s: any) => s.id === selectedSeats[i]);
+        return {
+          ...p,
+          seatId: selectedSeats[i],
+          seatNumber: seatData?.number || seatData?.label || seatData?.seatNumber || '',
+        };
+      });
       setPassengers(updatedPassengers);
     }
     router.push('/booking/review');
   };
 
   const handleAutoAssign = async () => {
-    const availableSeats = seats?.filter((s: any) => s.status === 'AVAILABLE') || [];
+    const availableSeats = validSeats?.filter((s: any) => s.status === 'AVAILABLE') || [];
     if (availableSeats.length < passengers.length) {
       setModalState({
         isOpen: true,
@@ -139,10 +189,14 @@ export default function SeatsPage() {
     
     try {
       await holdMutation.mutateAsync(autoSelectedSeats);
-      const updatedPassengers = passengers.map((p, i) => ({
-        ...p,
-        seatId: autoSelectedSeats[i],
-      }));
+      const updatedPassengers = passengers.map((p, i) => {
+        const seatData = availableSeats[i];
+        return {
+          ...p,
+          seatId: autoSelectedSeats[i],
+          seatNumber: seatData?.number || seatData?.label || seatData?.seatNumber || '',
+        };
+      });
       setPassengers(updatedPassengers);
       router.push('/booking/review');
     } catch (error: any) {
@@ -156,14 +210,257 @@ export default function SeatsPage() {
     }
   };
 
+  const handleBackToPassengers = () => {
+    router.push('/booking/passengers');
+  };
+
   useEffect(() => {
     if (!selectedSchedule || !passengers.length) {
       router.push('/booking/search');
     }
   }, [selectedSchedule, passengers.length, router]);
 
+  useEffect(() => {
+    if (bookingId && selectedSeats.length > 0) {
+      bookSeatsMutation.mutate(selectedSeats);
+    }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [bookingId]);
+
+  const parseSeatArrangement = (arrangement: string | null): number[] => {
+    if (!arrangement) return [2, 2];
+    const parts = arrangement.split('+').map(p => parseInt(p.trim()));
+    return parts.length === 2 ? parts : [2, 2];
+  };
+
+  const getBedLabel = (bedPosition: string | null): string => {
+    if (bedPosition === 'upper') return 'U';
+    if (bedPosition === 'middle') return 'M';
+    if (bedPosition === 'lower') return 'L';
+    return '';
+  };
+
+  const renderCoachSeats = (coach: any, isBedCoach: boolean) => {
+    const arrangement = parseSeatArrangement(coach.seatArrangement);
+    const leftCount = arrangement[0];
+
+    if (validSeats.length === 0) {
+      return <div className="text-xs text-muted-foreground">No seats</div>;
+    }
+
+    const hasBedPositionData = validSeats.some((s: any) => s.bedPosition);
+    const seatClassStr = typeof selectedCoachData?.seatClass === 'string' ? selectedCoachData.seatClass : (selectedCoachData?.seatClass?.name || '');
+
+    if (isBedCoach && hasBedPositionData) {
+      return (
+        <div className="space-y-2 w-40">
+          {validSeats.map((seat: any) => {
+            const rowNumber = seat.row || 1;
+            const shouldFlipIcon = rowNumber % 2 === 0;
+            
+            return (
+              <div key={seat.id}>
+                {shouldFlipIcon && (
+                  <div className="w-24 h-4 flex items-center justify-center text-xs font-bold mb-0.5 leading-3 text-foreground">
+                    {seat.seatNumber && !seat.seatNumber.startsWith('-') ? `${seat.seatNumber}${getBedLabel(seat.bedPosition)}` : ''}
+                  </div>
+                )}
+                <div className="flex">
+                  <SeatButton
+                    key={seat.id}
+                    seat={seat}
+                    isSelected={selectedSeats.includes(seat.id)}
+                    onToggle={handleSeatClick}
+                    isBedCoach={true}
+                    bedLabel={getBedLabel(seat.bedPosition)}
+                    coachSeatClass={seatClassStr}
+                  />
+                </div>
+                {!shouldFlipIcon && (
+                  <div className="w-24 h-4 flex items-center justify-center text-xs font-bold mb-0.5 leading-3 text-foreground">
+                    {seat.seatNumber && !seat.seatNumber.startsWith('-') ? `${seat.seatNumber}${getBedLabel(seat.bedPosition)}` : ''}
+                  </div>
+                )}
+              </div>
+            );
+          })}
+        </div>
+      );
+    }
+
+    const rows = [];
+    const processedRows = new Set();
+    for (const seat of validSeats) {
+      if (!processedRows.has(seat.row)) {
+        rows.push(validSeats.filter((s: any) => s.row === seat.row).sort((a: any, b: any) => {
+          const colA = a.col.charCodeAt(0);
+          const colB = b.col.charCodeAt(0);
+          return colA - colB;
+        }));
+        processedRows.add(seat.row);
+      }
+    }
+
+    return (
+      <div className="space-y-0">
+        {rows.map((rowSeats: any[], rowIdx: number) => {
+          const leftSeats = rowSeats.slice(0, leftCount);
+          const rightSeats = rowSeats.slice(leftCount);
+          const rowNumber = rowSeats[0]?.row || 1;
+          const shouldFlipArmchair = rowNumber % 2 === 0;
+          const showSpacing = rowIdx % 2 === 1;
+
+          return (
+            <div key={`row-${rowSeats[0]?.id}`}>
+              {shouldFlipArmchair && (
+                <div className="flex gap-0.5 justify-start text-xs text-muted-foreground mb-1">
+                  <div className="flex gap-0.5">
+                    {leftSeats.map((seat: any) => (
+                      <div key={`num-before-left-${seat.id}`} className="w-10 h-4 flex items-center justify-center text-xs font-bold mb-0.5 leading-3 text-foreground">
+                        {seat.seatNumber && !seat.seatNumber.startsWith('-') ? seat.seatNumber : ''}
+                      </div>
+                    ))}
+                  </div>
+                  {rightSeats.length > 0 && <div className="w-3" />}
+                  {rightSeats.length > 0 && (
+                    <div className="flex gap-0.5">
+                      {rightSeats.map((seat: any) => (
+                        <div key={`num-before-right-${seat.id}`} className="w-10 h-4 flex items-center justify-center text-xs font-bold mb-0.5 leading-3 text-foreground">
+                          {seat.seatNumber && !seat.seatNumber.startsWith('-') ? seat.seatNumber : ''}
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
+              <div className="flex gap-0.5 justify-start">
+                <div className="flex gap-0.5">
+                  {leftSeats.map((seat: any) => (
+                    <SeatButton
+                      key={seat.id}
+                      seat={seat}
+                      isSelected={selectedSeats.includes(seat.id)}
+                      onToggle={handleSeatClick}
+                      isBedCoach={false}
+                      bedLabel=""
+                    />
+                  ))}
+                </div>
+                {rightSeats.length > 0 && <div className="w-3" />}
+                {rightSeats.length > 0 && (
+                  <div className="flex gap-0.5">
+                    {rightSeats.map((seat: any) => (
+                      <SeatButton
+                        key={seat.id}
+                        seat={seat}
+                        isSelected={selectedSeats.includes(seat.id)}
+                        onToggle={handleSeatClick}
+                        isBedCoach={false}
+                        bedLabel=""
+                      />
+                    ))}
+                  </div>
+                )}
+              </div>
+
+              {!shouldFlipArmchair && (
+                <div className="flex gap-0.5 justify-start text-xs text-muted-foreground mb-1">
+                  <div className="flex gap-0.5">
+                    {leftSeats.map((seat: any) => (
+                      <div key={`num-left-${seat.id}`} className="w-10 h-4 flex items-center justify-center text-xs font-bold mb-0.5 leading-3 text-foreground">
+                        {seat.seatNumber && !seat.seatNumber.startsWith('-') ? seat.seatNumber : ''}
+                      </div>
+                    ))}
+                  </div>
+                  {rightSeats.length > 0 && <div className="w-3" />}
+                  {rightSeats.length > 0 && (
+                    <div className="flex gap-0.5">
+                      {rightSeats.map((seat: any) => (
+                        <div key={`num-right-${seat.id}`} className="w-10 h-4 flex items-center justify-center text-xs font-bold mb-0.5 leading-3 text-foreground">
+                          {seat.seatNumber && !seat.seatNumber.startsWith('-') ? seat.seatNumber : ''}
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
+
+              {showSpacing && <div className="h-2" />}
+            </div>
+          );
+        })}
+      </div>
+    );
+  };
+
   if (!selectedSchedule || !passengers.length) return null;
 
+  const allSelected = selectedSeats.length === passengers.length;
+  const isBedCoach = selectedCoachData?.seatClass?.toLowerCase().includes('bed') || selectedCoachData?.mode?.toLowerCase().includes('bed');
+
+  // Summary card content — shared between sidebar and mobile modal
+  const SummaryContent = () => (
+    <>
+      <div className="flex items-center justify-between mb-1">
+        <h3 className="font-bold text-gray-900 dark:text-white">Selection Summary</h3>
+        <span className={`text-xs font-semibold px-2 py-0.5 rounded-full ${
+          allSelected ? 'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400' : 'bg-amber-100 text-amber-700 dark:bg-amber-900/30 dark:text-amber-400'
+        }`}>
+          {selectedSeats.length}/{passengers.length} selected
+        </span>
+      </div>
+      <p className="text-xs text-gray-500 dark:text-gray-400 mb-4">
+        {allSelected ? 'All seats selected — ready to continue' : `Select ${passengers.length - selectedSeats.length} more seat(s)`}
+      </p>
+
+      {/* Progress bar */}
+      <div className="h-1.5 bg-gray-100 dark:bg-gray-700 rounded-full mb-4 overflow-hidden">
+        <div
+          className="h-full bg-[rgb(20,113,76)] rounded-full transition-all duration-300"
+          style={{ width: `${(selectedSeats.length / passengers.length) * 100}%` }}
+        />
+      </div>
+
+      <div className="space-y-2 mb-5">
+        {passengers.map((p, i) => {
+          const assignedSeat = selectedSeats[i] ? validSeats?.find((s: any) => s.id === selectedSeats[i]) : null;
+          const seatLabel = assignedSeat ? (assignedSeat.number || assignedSeat.label || assignedSeat.seatNumber || '—') : '—';
+          const bedLabel = assignedSeat ? getBedLabel(assignedSeat.bedPosition) : '';
+          return (
+            <div key={i} className="flex items-center justify-between py-2 border-b border-gray-100 dark:border-gray-800 last:border-0">
+              <div className="flex items-center gap-2">
+                <div className={`w-6 h-6 rounded-full flex items-center justify-center text-xs font-bold flex-shrink-0 ${
+                  assignedSeat ? 'bg-[rgb(20,113,76)] text-white' : 'bg-gray-200 dark:bg-gray-700 text-gray-500'
+                }`}>{i + 1}</div>
+                <span className="text-sm text-gray-700 dark:text-gray-300 truncate max-w-[120px]">{p.name}</span>
+              </div>
+              <span className={`text-sm font-semibold ${
+                assignedSeat ? 'text-[rgb(20,113,76)]' : 'text-gray-400'
+              }`}>
+                {assignedSeat ? `${seatLabel}${bedLabel}` : 'Not selected'}
+              </span>
+            </div>
+          );
+        })}
+      </div>
+
+      <button
+        onClick={handleContinue}
+        disabled={selectedSeats.length === 0 || holdMutation.isPending}
+        className="w-full py-3 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] disabled:opacity-40 disabled:cursor-not-allowed text-white font-bold text-sm rounded-xl transition-all shadow-lg"
+      >
+        {holdMutation.isPending ? 'Holding seats...' : allSelected ? 'Continue' : 'Continue with partial selection'}
+      </button>
+      <button
+        onClick={handleAutoAssign}
+        disabled={holdMutation.isPending}
+        className="w-full mt-2 py-2.5 bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 disabled:opacity-40 text-gray-700 dark:text-gray-300 font-semibold text-sm rounded-xl transition-all"
+      >
+        Auto-assign seats
+      </button>
+    </>
+  );
+
   return (
     <>
       <CustomModal
@@ -173,144 +470,146 @@ export default function SeatsPage() {
         message={modalState.message}
         type={modalState.type}
       />
-      <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12">
-      <div className="container mx-auto px-4">
-        <div className="max-w-6xl mx-auto">
-          <h1 className="text-3xl font-bold mb-6 text-gray-900 dark:text-gray-100">Select seats</h1>
 
-          <div className="grid lg:grid-cols-3 gap-6">
-            <div className="lg:col-span-2">
-              <div className="card mb-4">
-                <h3 className="font-semibold mb-3 text-gray-900 dark:text-gray-100">Select coach</h3>
-                {selectedSchedule?.selectedSeatClassName && (
-                  <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">
-                    Showing coaches for: <span className="font-semibold text-primary">{selectedSchedule.selectedSeatClassName.replace(/_/g, ' ')}</span>
-                  </div>
-                )}
-                <div className="flex gap-2 overflow-x-auto pb-2">
-                  {filteredCoaches?.map((coach: any) => {
-                    const availableCount = coach.seats?.filter((s: any) => s.status === 'AVAILABLE').length || 0;
-                    const seatClassName = typeof coach.seatClass === 'string' ? coach.seatClass : (coach.seatClass?.name || coach.coachClass || '');
-                    return (
-                      <button
-                        key={coach.id}
-                        onClick={() => setSelectedCoach(coach.id)}
-                        className={`px-4 py-2 rounded whitespace-nowrap ${
-                          selectedCoach === coach.id
-                            ? 'bg-primary text-white'
-                            : 'bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600'
-                        }`}
-                      >
-                        <div>{coach.label || coach.name || coach.coachNumber}</div>
-                        <div className="text-xs opacity-75">{seatClassName}</div>
-                        <div className="text-xs opacity-75">{availableCount} available</div>
-                      </button>
-                    );
-                  })}
-                </div>
+      {/* Mobile summary bottom-sheet */}
+      {selectedSeats.length > 0 && (
+        <>
+          <div className="fixed inset-x-0 bottom-0 z-50 lg:hidden bg-white dark:bg-gray-900 rounded-t-2xl shadow-2xl p-5"
+            style={{ animation: 'seats-slide-up 0.25s cubic-bezier(0.32,0.72,0,1)' }}
+          >
+            <div className="w-10 h-1 bg-gray-300 dark:bg-gray-600 rounded-full mx-auto mb-4" />
+            <SummaryContent />
+          </div>
+          <style>{`@keyframes seats-slide-up{from{transform:translateY(100%)}to{transform:translateY(0)}}`}</style>
+        </>
+      )}
+
+      <div className="min-h-screen bg-gray-50 dark:bg-gray-900">
+        {/* Header */}
+        <div className="bg-white dark:bg-gray-900 border-b border-gray-200 dark:border-gray-800 sticky top-0 z-30">
+          <div className="container mx-auto px-4">
+            <div className="max-w-6xl mx-auto flex items-center justify-between h-14">
+              <button
+                onClick={handleBackToPassengers}
+                className="flex items-center gap-1.5 text-sm text-gray-600 dark:text-gray-400 hover:text-primary transition-colors font-medium"
+              >
+                <ChevronLeft className="w-4 h-4" />
+                Back
+              </button>
+              <h1 className="text-base font-bold text-gray-900 dark:text-white">Select Seats</h1>
+              <div className="text-sm font-semibold text-[rgb(20,113,76)]">
+                {selectedSeats.length}/{passengers.length}
               </div>
+            </div>
+          </div>
+        </div>
 
-              <div className="card">
-                <h3 className="font-semibold mb-4 text-gray-900 dark:text-gray-100">Seat map - {selectedCoachData?.name || selectedCoachData?.label || selectedCoachData?.coachNumber}</h3>
+        <div className="container mx-auto px-4 py-5">
+          <div className="max-w-6xl mx-auto">
+            <div className="grid grid-cols-1 lg:grid-cols-3 gap-5">
+
+              {/* ── Seat map panel ── */}
+              <div className="lg:col-span-2 space-y-4">
                 {isLoading ? (
-                  <div className="text-center py-8 text-gray-500 dark:text-gray-400">
-                    <p>Loading seats...</p>
+                  <div className="bg-white dark:bg-gray-800 rounded-2xl p-8 text-center">
+                    <div className="w-10 h-10 border-4 border-primary border-t-transparent rounded-full animate-spin mx-auto mb-3" />
+                    <p className="text-sm text-gray-500 dark:text-gray-400">Loading seat map...</p>
                   </div>
                 ) : error ? (
-                  <div className="text-center py-8 text-red-500 dark:text-red-400">
-                    <p>Error loading seats</p>
-                    <p className="text-sm mt-2">{error?.message || 'Please try again'}</p>
+                  <div className="bg-white dark:bg-gray-800 rounded-2xl p-8 text-center">
+                    <p className="text-red-500 font-medium">Error loading seats</p>
+                    <p className="text-sm text-gray-400 mt-1">{(error as any)?.message || 'Please try again'}</p>
                   </div>
-                ) : seats.length === 0 ? (
-                  <div className="text-center py-8 text-gray-500 dark:text-gray-400">
-                    <p>No seats available in this coach</p>
-                    <p className="text-sm mt-2\">Please select a different coach</p>
+                ) : filteredCoaches.length === 0 ? (
+                  <div className="bg-white dark:bg-gray-800 rounded-2xl p-8 text-center">
+                    <p className="text-gray-500 dark:text-gray-400">No coaches available for {selectedSchedule?.selectedSeatClass}</p>
                   </div>
                 ) : (
                   <>
-                    {/* Seat Grid */}
-                    <div className="bg-gray-50 dark:bg-gray-800 p-4 rounded-lg mb-4 overflow-x-auto">
-                      <div className="inline-grid gap-2" style={{ gridTemplateColumns: `repeat(4, minmax(0, 1fr))` }}>
-                        {seats?.map((seat: any) => (
-                          <SeatButton
-                            key={seat.id}
-                            seat={seat}
-                            isSelected={selectedSeats.includes(seat.id)}
-                            onToggle={toggleSeat}
-                          />
-                        ))}
+                    {/* Coach selector */}
+                    <div className="bg-white dark:bg-gray-800 rounded-2xl p-4 border border-gray-100 dark:border-gray-700">
+                      <h3 className="text-sm font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wide mb-3">Coach</h3>
+                      <div className="flex flex-wrap gap-2">
+                        {filteredCoaches.map((coach: any) => {
+                          const coachSeats = coach.seats?.filter((s: any) => s.seatNumber && !s.seatNumber.startsWith('-')) || [];
+                          const isBed = coach.seatClass?.toLowerCase().includes('bed') || coach.mode?.toLowerCase().includes('bed');
+                          let fSeats = coachSeats;
+                          if (isBed && selectedSchedule?.selectedSeatClass) {
+                            const bedPos = getBedPosition(selectedSchedule.selectedSeatClass);
+                            if (bedPos) fSeats = coachSeats.filter((s: any) => s.bedPosition === bedPos);
+                          }
+                          const available = fSeats.filter((s: any) => s.status === 'AVAILABLE').length;
+                          const isActive = selectedCoach === coach.id;
+                          return (
+                            <button
+                              key={coach.id}
+                              onClick={() => setSelectedCoach(coach.id)}
+                              className={`px-4 py-2.5 rounded-xl text-sm font-semibold transition-all ${
+                                isActive
+                                  ? 'bg-[rgb(20,113,76)] text-white shadow-md'
+                                  : 'bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600'
+                              }`}
+                            >
+                              <div>{coach.label || coach.name || coach.coachNumber}</div>
+                              <div className={`text-xs mt-0.5 ${isActive ? 'text-white/70' : 'text-gray-400'}`}>{available} free</div>
+                            </button>
+                          );
+                        })}
                       </div>
                     </div>
 
-                    {/* Legend */}
-                    <div className="flex flex-wrap gap-4 text-sm text-gray-700 dark:text-gray-300">
-                      <div className="flex items-center gap-2">
-                        <div className="w-6 h-6 bg-green-100 dark:bg-green-900/40 rounded"></div>
-                        <span>Available</span>
+                    {/* Seat map */}
+                    <div className="bg-white dark:bg-gray-800 rounded-2xl p-4 border border-gray-100 dark:border-gray-700">
+                      <div className="flex items-center justify-between mb-3">
+                        <h3 className="text-sm font-semibold text-gray-900 dark:text-white">
+                          {selectedCoachData?.name || selectedCoachData?.label || selectedCoachData?.coachNumber}
+                        </h3>
+                        <span className="text-xs text-gray-400">{selectedCoachData?.seatArrangement}</span>
                       </div>
-                      <div className="flex items-center gap-2">
-                        <div className="w-6 h-6 bg-primary rounded"></div>
-                        <span>Selected</span>
+
+                      {/* Legend */}
+                      <div className="flex flex-wrap gap-3 mb-4">
+                        {[
+                          { color: 'bg-green-500', label: 'Available' },
+                          { color: 'bg-[rgb(20,113,76)]', label: 'Selected' },
+                          { color: 'bg-yellow-500', label: 'Held' },
+                          { color: 'bg-gray-400', label: 'Booked' },
+                        ].map(({ color, label }) => (
+                          <div key={label} className="flex items-center gap-1.5">
+                            <div className={`w-3 h-3 ${color} rounded-sm`} />
+                            <span className="text-xs text-gray-500 dark:text-gray-400">{label}</span>
+                          </div>
+                        ))}
                       </div>
-                      <div className="flex items-center gap-2">
-                        <div className="w-6 h-6 bg-yellow-100 dark:bg-yellow-900/40 rounded"></div>
-                        <span>Held</span>
-                      </div>
-                      <div className="flex items-center gap-2">
-                        <div className="w-6 h-6 bg-gray-200 dark:bg-gray-700 rounded"></div>
-                        <span>Booked</span>
+
+                      <div className="overflow-x-auto">
+                        <div className="inline-block bg-gray-50 dark:bg-gray-700/30 rounded-xl p-4 border border-gray-200 dark:border-gray-700">
+                          {validSeats.length === 0 ? (
+                            <p className="text-sm text-gray-400 py-4">No seats in this coach</p>
+                          ) : (
+                            renderCoachSeats(selectedCoachData, isBedCoach)
+                          )}
+                        </div>
                       </div>
                     </div>
                   </>
                 )}
               </div>
-            </div>
 
-            <div>
-              <div className="card sticky top-4">
-                <h3 className="font-semibold mb-4 text-gray-900 dark:text-gray-100">Selection summary</h3>
-                <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">
-                  Select {passengers.length} seat(s) for your passengers
-                </p>
-                <p className="text-lg font-semibold mb-4 text-gray-900 dark:text-gray-100">
-                  {selectedSeats.length} / {passengers.length} selected
-                </p>
-
-                <div className="space-y-2 mb-6">
-                  {passengers.map((p, i) => {
-                    const assignedSeat = selectedSeats[i] ? seats?.find((s: any) => s.id === selectedSeats[i]) : null;
-                    const seatLabel = assignedSeat ? (assignedSeat.number || assignedSeat.label || assignedSeat.seatNumber || '-') : '-';
-                    return (
-                      <div key={i} className="flex justify-between text-sm text-gray-700 dark:text-gray-300">
-                        <span>{p.name}</span>
-                        <span className="font-medium">
-                          {seatLabel}
-                        </span>
-                      </div>
-                    );
-                  })}
+              {/* ── Sidebar summary (desktop only) ── */}
+              <div className="hidden lg:block lg:col-span-1">
+                <div className="bg-white dark:bg-gray-800 rounded-2xl p-5 border border-gray-100 dark:border-gray-700 sticky top-20">
+                  <SummaryContent />
                 </div>
-
-                <button
-                  onClick={handleContinue}
-                  disabled={selectedSeats.length === 0}
-                  className="btn-primary w-full mb-2"
-                >
-                  Continue with selected seats
-                </button>
-                <button 
-                  onClick={handleAutoAssign}
-                  disabled={holdMutation.isPending}
-                  className="btn-secondary w-full"
-                >
-                  {holdMutation.isPending ? 'Assigning...' : 'Auto-assign seats'}
-                </button>
               </div>
+
             </div>
+
+            {/* Mobile spacer so bottom-sheet doesn't cover last seat */}
+            <div className="h-48 lg:hidden" />
           </div>
         </div>
       </div>
-      </div>
     </>
   );
 }
diff --git a/apps/edr-passenger-web/portal/src/app/globals.css b/apps/edr-passenger-web/portal/src/app/globals.css
index 84d3484db..cf9ebe719 100644
--- a/apps/edr-passenger-web/portal/src/app/globals.css
+++ b/apps/edr-passenger-web/portal/src/app/globals.css
@@ -10,7 +10,7 @@
 
 @layer components {
   .btn-primary {
-    @apply inline-flex items-center gap-2 px-6 py-3 bg-[rgb(20_113_76)] text-white font-semibold rounded-xl transition-all duration-200 disabled:opacity-50 disabled:cursor-not-allowed shadow-lg hover:shadow-xl transform hover:-translate-y-0.5;
+    @apply inline-flex items-center justify-center gap-2 px-6 py-3 bg-[rgb(20_113_76)] text-white font-semibold rounded-xl transition-all duration-200 disabled:opacity-50 disabled:cursor-not-allowed shadow-lg hover:shadow-xl transform hover:-translate-y-0.5;
   }
   
   .btn-primary:hover {
@@ -157,4 +157,22 @@
   .animate-slide-in-right {
     animation: slide-in-right 0.5s ease-out;
   }
+
+  @keyframes slide-up {
+    from { transform: translateY(100%); opacity: 0; }
+    to { transform: translateY(0); opacity: 1; }
+  }
+
+  .animate-slide-up {
+    animation: slide-up 0.25s cubic-bezier(0.32, 0.72, 0, 1);
+  }
+
+  .scrollbar-hide {
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+  }
+
+  .scrollbar-hide::-webkit-scrollbar {
+    display: none;
+  }
 }
diff --git a/apps/edr-passenger-web/portal/src/app/login/page.tsx b/apps/edr-passenger-web/portal/src/app/login/page.tsx
index 77cd2fcad..86ac4dcce 100644
--- a/apps/edr-passenger-web/portal/src/app/login/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/login/page.tsx
@@ -23,7 +23,7 @@ function LoginContent() {
   const [loading, setLoading] = useState(false);
 
   const { register, handleSubmit, formState: { errors } } = useForm<LoginForm>({
-    resolver: zodResolver(loginSchema),
+    resolver: zodResolver(loginSchema as any),
   });
 
   const onSubmit = async (data: LoginForm) => {
diff --git a/apps/edr-passenger-web/portal/src/app/profile/page.tsx b/apps/edr-passenger-web/portal/src/app/profile/page.tsx
index 91daf1d16..dbc64d4a9 100644
--- a/apps/edr-passenger-web/portal/src/app/profile/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/profile/page.tsx
@@ -526,7 +526,7 @@ export default function ProfilePage() {
                       value={settings.preferredOrigin}
                       onChange={(e) => setSettings({ ...settings, preferredOrigin: e.target.value })}
                       className="input-field"
-                      placeholder="e.g., Addis Ababa"
+                      placeholder="e.g., Lebu"
                     />
                   </div>
                   <div>
diff --git a/apps/edr-passenger-web/portal/src/components/Footer.tsx b/apps/edr-passenger-web/portal/src/components/Footer.tsx
index 00784682f..8d1aa1394 100644
--- a/apps/edr-passenger-web/portal/src/components/Footer.tsx
+++ b/apps/edr-passenger-web/portal/src/components/Footer.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Facebook, Twitter, Instagram, Linkedin, Mail, Phone, MapPin } from 'lucide-react';
+import { Mail, Phone, MapPin } from 'lucide-react';
 import Link from 'next/link';
 import { useLanguage, getTranslation, Language } from '@/lib/i18n';
 import { useEffect, useState } from 'react';
@@ -102,41 +102,17 @@ export function Footer() {
             <div>
               <h4 className="font-semibold mb-4">{t('footer.follow')}</h4>
               <div className="flex gap-3">
-                <a
-                  href="https://web.facebook.com/ethiodjiboutirailwaysc"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center hover:bg-opacity-30 transition duration-200 transform hover:scale-110"
-                  aria-label="Facebook"
-                >
-                  <Facebook className="w-5 h-5" />
+                <a href="https://web.facebook.com/ethiodjiboutirailwaysc" target="_blank" rel="noopener noreferrer" className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center hover:bg-opacity-30 transition duration-200 transform hover:scale-110" aria-label="Facebook">
+                  <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24"><path d="M18 2h-3a5 5 0 0 0-5 5v3H7v4h3v8h4v-8h3l1-4h-4V7a1 1 0 0 1 1-1h3z"/></svg>
                 </a>
-                <a
-                  href="https://twitter.com/edr"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center hover:bg-opacity-30 transition duration-200 transform hover:scale-110"
-                  aria-label="Twitter"
-                >
-                  <Twitter className="w-5 h-5" />
+                <a href="https://twitter.com/edr" target="_blank" rel="noopener noreferrer" className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center hover:bg-opacity-30 transition duration-200 transform hover:scale-110" aria-label="Twitter">
+                  <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24"><path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"/></svg>
                 </a>
-                <a
-                  href="https://instagram.com/edr"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center hover:bg-opacity-30 transition duration-200 transform hover:scale-110"
-                  aria-label="Instagram"
-                >
-                  <Instagram className="w-5 h-5" />
+                <a href="https://instagram.com/edr" target="_blank" rel="noopener noreferrer" className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center hover:bg-opacity-30 transition duration-200 transform hover:scale-110" aria-label="Instagram">
+                  <svg className="w-5 h-5" fill="none" stroke="currentColor" strokeWidth="2" viewBox="0 0 24 24"><rect x="2" y="2" width="20" height="20" rx="5" ry="5"/><circle cx="12" cy="12" r="4"/><circle cx="17.5" cy="6.5" r="1" fill="currentColor" stroke="none"/></svg>
                 </a>
-                <a
-                  href="https://linkedin.com/company/edr"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center hover:bg-opacity-30 transition duration-200 transform hover:scale-110"
-                  aria-label="LinkedIn"
-                >
-                  <Linkedin className="w-5 h-5" />
+                <a href="https://linkedin.com/company/edr" target="_blank" rel="noopener noreferrer" className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center hover:bg-opacity-30 transition duration-200 transform hover:scale-110" aria-label="LinkedIn">
+                  <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24"><path d="M16 8a6 6 0 0 1 6 6v7h-4v-7a2 2 0 0 0-2-2 2 2 0 0 0-2 2v7h-4v-7a6 6 0 0 1 6-6zM2 9h4v12H2z"/><circle cx="4" cy="4" r="2"/></svg>
                 </a>
               </div>
             </div>
diff --git a/apps/edr-passenger-web/portal/src/components/ModernDatePicker.tsx b/apps/edr-passenger-web/portal/src/components/ModernDatePicker.tsx
index 4d9c90255..5ea145bba 100644
--- a/apps/edr-passenger-web/portal/src/components/ModernDatePicker.tsx
+++ b/apps/edr-passenger-web/portal/src/components/ModernDatePicker.tsx
@@ -28,16 +28,23 @@ export default function ModernDatePicker({
   placeholder = 'Select date',
 }: ModernDatePickerProps) {
   const [isOpen, setIsOpen] = useState(false);
+  const [isMobileView, setIsMobileView] = useState(false);
   const [calendarType, setCalendarType] = useState<'gregorian' | 'ethiopian'>('gregorian');
-  const [viewMonth, setViewMonth] = useState(value?.getMonth() || new Date().getMonth());
-  const [viewYear, setViewYear] = useState(value?.getFullYear() || new Date().getFullYear());
-  
-  // Initialize Ethiopian calendar with current date
+  const [viewMonth, setViewMonth] = useState(value?.getMonth() ?? new Date().getMonth());
+  const [viewYear, setViewYear] = useState(value?.getFullYear() ?? new Date().getFullYear());
+
   const initialEthDate = gregorianToEthiopian(value || new Date());
   const [ethViewMonth, setEthViewMonth] = useState(initialEthDate.month);
   const [ethViewYear, setEthViewYear] = useState(initialEthDate.year);
   const containerRef = useRef<HTMLDivElement>(null);
 
+  useEffect(() => {
+    const check = () => setIsMobileView(window.innerWidth < 768);
+    check();
+    window.addEventListener('resize', check);
+    return () => window.removeEventListener('resize', check);
+  }, []);
+
   useEffect(() => {
     if (value) {
       setViewMonth(value.getMonth());
@@ -48,39 +55,27 @@ export default function ModernDatePicker({
     }
   }, [value]);
 
+  // Lock body scroll when modal is open (both mobile and desktop modal)
   useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (containerRef.current && !containerRef.current.contains(event.target as Node)) {
-        setIsOpen(false);
-      }
-    };
-
     if (isOpen) {
-      document.addEventListener('mousedown', handleClickOutside);
+      document.body.style.overflow = 'hidden';
+    } else {
+      document.body.style.overflow = '';
     }
-
-    return () => {
-      document.removeEventListener('mousedown', handleClickOutside);
-    };
+    return () => { document.body.style.overflow = ''; };
   }, [isOpen]);
 
   const toggleCalendarType = () => {
     const newType = calendarType === 'gregorian' ? 'ethiopian' : 'gregorian';
-    
+    const ref = value || new Date();
     if (newType === 'ethiopian') {
-      // When switching to Ethiopian, show the Ethiopian equivalent of current Gregorian view
-      // Use today's date if no value is selected, otherwise use the selected value
-      const referenceDate = value || new Date();
-      const ethDate = gregorianToEthiopian(referenceDate);
+      const ethDate = gregorianToEthiopian(ref);
       setEthViewMonth(ethDate.month);
       setEthViewYear(ethDate.year);
     } else {
-      // When switching to Gregorian, show the Gregorian equivalent of current Ethiopian view
-      const referenceDate = value || new Date();
-      setViewMonth(referenceDate.getMonth());
-      setViewYear(referenceDate.getFullYear());
+      setViewMonth(ref.getMonth());
+      setViewYear(ref.getFullYear());
     }
-    
     setCalendarType(newType);
   };
 
@@ -90,102 +85,46 @@ export default function ModernDatePicker({
   };
 
   const handleEthiopianDateSelect = (ethDate: EthiopianDate) => {
-    const gregDate = ethiopianToGregorian(ethDate);
-    handleDateSelect(gregDate);
+    handleDateSelect(ethiopianToGregorian(ethDate));
   };
 
   const renderGregorianCalendar = () => {
     const daysInMonth = new Date(viewYear, viewMonth + 1, 0).getDate();
-    const firstDayOfMonth = new Date(viewYear, viewMonth, 1).getDay();
-    const days: (number | null)[] = [];
-
-    for (let i = 0; i < firstDayOfMonth; i++) {
-      days.push(null);
-    }
-
-    for (let day = 1; day <= daysInMonth; day++) {
-      days.push(day);
-    }
-
-    const monthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+    const firstDay = new Date(viewYear, viewMonth, 1).getDay();
+    const days: (number | null)[] = Array(firstDay).fill(null);
+    for (let d = 1; d <= daysInMonth; d++) days.push(d);
+    const monthNames = ['January','February','March','April','May','June','July','August','September','October','November','December'];
 
     return (
       <div className="p-4">
         <div className="flex items-center justify-between mb-4">
-          <button
-            type="button"
-            onClick={() => {
-              if (viewMonth === 0) {
-                setViewMonth(11);
-                setViewYear(viewYear - 1);
-              } else {
-                setViewMonth(viewMonth - 1);
-              }
-            }}
-            className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
-          >
+          <button type="button" onClick={() => { if (viewMonth === 0) { setViewMonth(11); setViewYear(y => y - 1); } else setViewMonth(m => m - 1); }} className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors">
             <ChevronLeft className="w-5 h-5 text-gray-600 dark:text-gray-400" />
           </button>
-          <div className="font-semibold text-base text-gray-900 dark:text-gray-100">
-            {monthNames[viewMonth]} {viewYear}
-          </div>
-          <button
-            type="button"
-            onClick={() => {
-              if (viewMonth === 11) {
-                setViewMonth(0);
-                setViewYear(viewYear + 1);
-              } else {
-                setViewMonth(viewMonth + 1);
-              }
-            }}
-            className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
-          >
+          <span className="font-semibold text-base text-gray-900 dark:text-gray-100">{monthNames[viewMonth]} {viewYear}</span>
+          <button type="button" onClick={() => { if (viewMonth === 11) { setViewMonth(0); setViewYear(y => y + 1); } else setViewMonth(m => m + 1); }} className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors">
             <ChevronRight className="w-5 h-5 text-gray-600 dark:text-gray-400" />
           </button>
         </div>
-
         <div className="grid grid-cols-7 gap-1 mb-2">
-          {['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'].map(day => (
-            <div key={day} className="text-center text-xs font-semibold text-gray-500 dark:text-gray-400 py-2">
-              {day}
-            </div>
+          {['Su','Mo','Tu','We','Th','Fr','Sa'].map(d => (
+            <div key={d} className="text-center text-xs font-semibold text-gray-400 py-2">{d}</div>
           ))}
         </div>
-
         <div className="grid grid-cols-7 gap-1">
-          {days.map((day, index) => {
-            if (day === null) {
-              return <div key={`empty-${index}`} />;
-            }
-
+          {days.map((day, i) => {
+            if (day === null) return <div key={`e-${i}`} />;
             const date = new Date(viewYear, viewMonth, day);
-            const isSelected = value && 
-              date.getDate() === value.getDate() &&
-              date.getMonth() === value.getMonth() &&
-              date.getFullYear() === value.getFullYear();
-            const isToday = 
-              date.getDate() === new Date().getDate() &&
-              date.getMonth() === new Date().getMonth() &&
-              date.getFullYear() === new Date().getFullYear();
-            const isDisabled = 
-              (minDate && date < new Date(minDate.getFullYear(), minDate.getMonth(), minDate.getDate())) ||
-              (maxDate && date > new Date(maxDate.getFullYear(), maxDate.getMonth(), maxDate.getDate()));
-
+            const isSelected = value && date.getDate() === value.getDate() && date.getMonth() === value.getMonth() && date.getFullYear() === value.getFullYear();
+            const isToday = date.toDateString() === new Date().toDateString();
+            const isDisabled = (minDate && date < new Date(minDate.getFullYear(), minDate.getMonth(), minDate.getDate())) || (maxDate && date > new Date(maxDate.getFullYear(), maxDate.getMonth(), maxDate.getDate()));
             return (
-              <button
-                key={day}
-                type="button"
-                onClick={() => !isDisabled && handleDateSelect(date)}
-                disabled={isDisabled}
-                className={`
-                  aspect-square flex items-center justify-center text-sm rounded-lg transition-all
+              <button key={day} type="button" onClick={() => !isDisabled && handleDateSelect(date)} disabled={!!isDisabled}
+                className={`aspect-square flex items-center justify-center text-sm rounded-lg transition-all
                   ${isSelected ? 'bg-primary text-white font-semibold shadow-md scale-105' : ''}
                   ${isToday && !isSelected ? 'border-2 border-primary text-primary font-semibold' : ''}
                   ${!isSelected && !isToday && !isDisabled ? 'hover:bg-gray-100 dark:hover:bg-gray-700 text-gray-700 dark:text-gray-300' : ''}
-                  ${isDisabled ? 'text-gray-300 dark:text-gray-600 cursor-not-allowed' : ''}
-                `}
-              >
+                  ${isDisabled ? 'text-gray-300 dark:text-gray-600 cursor-not-allowed' : ''}`}>
                 {day}
               </button>
             );
@@ -197,133 +136,54 @@ export default function ModernDatePicker({
 
   const renderEthiopianCalendar = () => {
     const daysInMonth = getDaysInEthiopianMonth(ethViewYear, ethViewMonth);
-    const days: number[] = [];
-
-    for (let day = 1; day <= daysInMonth; day++) {
-      days.push(day);
-    }
-
     const firstDate = ethiopianToGregorian({ year: ethViewYear, month: ethViewMonth, day: 1 });
     const firstDayOfWeek = firstDate.getDay();
-
-    const daysWithOffset: (number | null)[] = [];
-    for (let i = 0; i < firstDayOfWeek; i++) {
-      daysWithOffset.push(null);
-    }
-    daysWithOffset.push(...days);
-    
-    // Get month name safely
+    const daysWithOffset: (number | null)[] = Array(firstDayOfWeek).fill(null);
+    for (let d = 1; d <= daysInMonth; d++) daysWithOffset.push(d);
     const monthName = ETHIOPIAN_MONTHS[ethViewMonth - 1] || `Month ${ethViewMonth}`;
 
     return (
       <div className="p-4">
         <div className="flex items-center justify-between mb-4">
-          <button
-            type="button"
-            onClick={() => {
-              if (ethViewMonth === 1) {
-                setEthViewMonth(13);
-                setEthViewYear(ethViewYear - 1);
-              } else {
-                setEthViewMonth(ethViewMonth - 1);
-              }
-            }}
-            className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
-          >
+          <button type="button" onClick={() => { if (ethViewMonth === 1) { setEthViewMonth(13); setEthViewYear(y => y - 1); } else setEthViewMonth(m => m - 1); }} className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors">
             <ChevronLeft className="w-5 h-5 text-gray-600 dark:text-gray-400" />
           </button>
-          <div className="font-semibold text-base text-gray-900 dark:text-gray-100">
-            {monthName} {ethViewYear}
-          </div>
-          <button
-            type="button"
-            onClick={() => {
-              if (ethViewMonth === 13) {
-                setEthViewMonth(1);
-                setEthViewYear(ethViewYear + 1);
-              } else {
-                setEthViewMonth(ethViewMonth + 1);
-              }
-            }}
-            className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
-          >
+          <span className="font-semibold text-base text-gray-900 dark:text-gray-100">{monthName} {ethViewYear}</span>
+          <button type="button" onClick={() => { if (ethViewMonth === 13) { setEthViewMonth(1); setEthViewYear(y => y + 1); } else setEthViewMonth(m => m + 1); }} className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors">
             <ChevronRight className="w-5 h-5 text-gray-600 dark:text-gray-400" />
           </button>
         </div>
-
         <div className="grid grid-cols-7 gap-1 mb-2">
-          {['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'].map(day => (
-            <div key={day} className="text-center text-xs font-semibold text-gray-500 dark:text-gray-400 py-2">
-              {day}
-            </div>
+          {['Su','Mo','Tu','We','Th','Fr','Sa'].map(d => (
+            <div key={d} className="text-center text-xs font-semibold text-gray-400 py-2">{d}</div>
           ))}
         </div>
-
         <div className="grid grid-cols-7 gap-1">
-          {daysWithOffset.map((day, index) => {
-            if (day === null) {
-              return <div key={`empty-${index}`} />;
-            }
-
+          {daysWithOffset.map((day, i) => {
+            if (day === null) return <div key={`e-${i}`} />;
             const ethDate: EthiopianDate = { year: ethViewYear, month: ethViewMonth, day };
             const gregDate = ethiopianToGregorian(ethDate);
-            
-            const isSelected = value &&
-              gregDate.getDate() === value.getDate() &&
-              gregDate.getMonth() === value.getMonth() &&
-              gregDate.getFullYear() === value.getFullYear();
-            
-            const today = new Date();
-            const todayEth = gregorianToEthiopian(today);
-            const isToday = 
-              ethDate.day === todayEth.day &&
-              ethDate.month === todayEth.month &&
-              ethDate.year === todayEth.year;
-
+            const isSelected = value && gregDate.getDate() === value.getDate() && gregDate.getMonth() === value.getMonth() && gregDate.getFullYear() === value.getFullYear();
+            const todayEth = gregorianToEthiopian(new Date());
+            const isToday = ethDate.day === todayEth.day && ethDate.month === todayEth.month && ethDate.year === todayEth.year;
             let isDisabled = false;
             if (minDate) {
-              const minYear = minDate.getFullYear();
-              const minMonth = minDate.getMonth();
-              const minDay = minDate.getDate();
-              const gregYear = gregDate.getFullYear();
-              const gregMonth = gregDate.getMonth();
-              const gregDay = gregDate.getDate();
-              
-              if (gregYear < minYear || 
-                  (gregYear === minYear && gregMonth < minMonth) ||
-                  (gregYear === minYear && gregMonth === minMonth && gregDay < minDay)) {
-                isDisabled = true;
-              }
+              const [mY, mM, mD] = [minDate.getFullYear(), minDate.getMonth(), minDate.getDate()];
+              const [gY, gM, gD] = [gregDate.getFullYear(), gregDate.getMonth(), gregDate.getDate()];
+              if (gY < mY || (gY === mY && gM < mM) || (gY === mY && gM === mM && gD < mD)) isDisabled = true;
             }
             if (maxDate && !isDisabled) {
-              const maxYear = maxDate.getFullYear();
-              const maxMonth = maxDate.getMonth();
-              const maxDay = maxDate.getDate();
-              const gregYear = gregDate.getFullYear();
-              const gregMonth = gregDate.getMonth();
-              const gregDay = gregDate.getDate();
-              
-              if (gregYear > maxYear || 
-                  (gregYear === maxYear && gregMonth > maxMonth) ||
-                  (gregYear === maxYear && gregMonth === maxMonth && gregDay > maxDay)) {
-                isDisabled = true;
-              }
+              const [mY, mM, mD] = [maxDate.getFullYear(), maxDate.getMonth(), maxDate.getDate()];
+              const [gY, gM, gD] = [gregDate.getFullYear(), gregDate.getMonth(), gregDate.getDate()];
+              if (gY > mY || (gY === mY && gM > mM) || (gY === mY && gM === mM && gD > mD)) isDisabled = true;
             }
-
             return (
-              <button
-                key={day}
-                type="button"
-                onClick={() => !isDisabled && handleEthiopianDateSelect(ethDate)}
-                disabled={isDisabled}
-                className={`
-                  aspect-square flex items-center justify-center text-sm rounded-lg transition-all
+              <button key={day} type="button" onClick={() => !isDisabled && handleEthiopianDateSelect(ethDate)} disabled={isDisabled}
+                className={`aspect-square flex items-center justify-center text-sm rounded-lg transition-all
                   ${isSelected ? 'bg-primary text-white font-semibold shadow-md scale-105' : ''}
                   ${isToday && !isSelected ? 'border-2 border-primary text-primary font-semibold' : ''}
                   ${!isSelected && !isToday && !isDisabled ? 'hover:bg-gray-100 dark:hover:bg-gray-700 text-gray-700 dark:text-gray-300' : ''}
-                  ${isDisabled ? 'text-gray-300 dark:text-gray-600 cursor-not-allowed' : ''}
-                `}
-              >
+                  ${isDisabled ? 'text-gray-300 dark:text-gray-600 cursor-not-allowed' : ''}`}>
                 {day}
               </button>
             );
@@ -333,62 +193,128 @@ export default function ModernDatePicker({
     );
   };
 
+  const calendarFooter = value && (
+    <div className="border-t border-gray-200 dark:border-gray-700 p-3 bg-gray-50 dark:bg-gray-800/60 space-y-1.5">
+      <div className="flex items-center justify-between text-xs">
+        <span className="text-gray-500 dark:text-gray-400">Gregorian:</span>
+        <span className="font-medium text-gray-700 dark:text-gray-300">{format(value, 'MMMM d, yyyy')}</span>
+      </div>
+      <div className="flex items-center justify-between text-xs">
+        <span className="text-gray-500 dark:text-gray-400">Ethiopian:</span>
+        <span className="font-medium text-gray-700 dark:text-gray-300">{formatEthiopianDate(gregorianToEthiopian(value))}</span>
+      </div>
+    </div>
+  );
+
+  // Shared modal content (used by both mobile and desktop)
+  const modalContent = (
+    <div className="flex flex-col h-full">
+      {/* Header row: title + close */}
+      <div className="flex items-center justify-between px-4 py-4 border-b border-gray-100 dark:border-gray-800 flex-shrink-0">
+        <div className="flex items-center gap-2">
+          <CalendarIcon className="w-4 h-4 text-primary" />
+          <h2 className="text-base font-bold text-gray-900 dark:text-white">Select Date</h2>
+        </div>
+        <button
+          type="button"
+          onClick={() => setIsOpen(false)}
+          className="w-9 h-9 flex items-center justify-center rounded-full hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors"
+        >
+          <X className="w-5 h-5 text-gray-500 dark:text-gray-400" />
+        </button>
+      </div>
+
+      {/* Toggle row: always full-width, clearly visible */}
+      <div className="px-4 py-2.5 border-b border-gray-100 dark:border-gray-800 flex-shrink-0">
+        <div className="flex rounded-lg overflow-hidden border-2 border-gray-200 dark:border-gray-700">
+          <button
+            type="button"
+            onClick={() => calendarType !== 'gregorian' && toggleCalendarType()}
+            className={`flex-1 flex items-center justify-center gap-1.5 py-2 text-xs font-semibold transition-colors ${
+              calendarType === 'gregorian'
+                ? 'bg-primary text-white'
+                : 'bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 hover:bg-gray-50 dark:hover:bg-gray-700'
+            }`}
+          >
+            <Globe className="w-3.5 h-3.5" />
+            Gregorian
+          </button>
+          <button
+            type="button"
+            onClick={() => calendarType !== 'ethiopian' && toggleCalendarType()}
+            className={`flex-1 flex items-center justify-center gap-1.5 py-2 text-xs font-semibold transition-colors ${
+              calendarType === 'ethiopian'
+                ? 'bg-primary text-white'
+                : 'bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 hover:bg-gray-50 dark:hover:bg-gray-700'
+            }`}
+          >
+            <Globe className="w-3.5 h-3.5" />
+            Ethiopian
+          </button>
+        </div>
+      </div>
+
+      {/* Calendar body */}
+      <div className="flex-1 overflow-y-auto">
+        {calendarType === 'gregorian' ? renderGregorianCalendar() : renderEthiopianCalendar()}
+        {calendarFooter}
+      </div>
+    </div>
+  );
+
   return (
     <div className="relative" ref={containerRef}>
+      {/* Trigger button */}
       <button
         type="button"
-        onClick={() => setIsOpen(!isOpen)}
-        className="w-full px-4 py-3.5 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent text-left flex items-center justify-between bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 transition-colors group"
+        onClick={() => setIsOpen(true)}
+        className="w-full px-3.5 py-3.5 border-2 border-gray-200 dark:border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary text-left flex items-center justify-between bg-white dark:bg-gray-800 hover:border-gray-300 dark:hover:border-gray-600 transition-all group"
       >
-        <span className={value ? 'text-gray-900 dark:text-gray-100' : 'text-gray-500 dark:text-gray-400'}>
-          {value ? format(value, 'EEEE, MMMM d, yyyy') : placeholder}
+        <span className={`text-sm ${value ? 'text-gray-900 dark:text-gray-100 font-medium' : 'text-gray-400'}`}>
+          {value ? format(value, 'EEE, MMM d, yyyy') : placeholder}
         </span>
-        <CalendarIcon className="w-5 h-5 text-gray-400 dark:text-gray-500 group-hover:text-primary transition-colors" />
+        <CalendarIcon className="w-4 h-4 text-gray-400 group-hover:text-primary transition-colors flex-shrink-0" />
       </button>
 
       {isOpen && (
-        <div className="absolute z-50 mt-2 bg-white dark:bg-gray-800 rounded-xl shadow-2xl border border-gray-200 dark:border-gray-700 w-80 animate-in fade-in slide-in-from-top-2 duration-200">
-          <div className="flex items-center justify-between p-3 border-b border-gray-200 dark:border-gray-700">
-            <div className="flex items-center gap-2">
-              <CalendarIcon className="w-4 h-4 text-primary" />
-              <span className="text-sm font-semibold text-gray-700 dark:text-gray-300">
-                {calendarType === 'gregorian' ? 'Gregorian Calendar' : 'Ethiopian Calendar'}
-              </span>
-            </div>
-            <div className="flex items-center gap-2">
-              <button
-                type="button"
-                onClick={toggleCalendarType}
-                className="flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-medium bg-primary/10 hover:bg-primary/20 dark:bg-primary/20 dark:hover:bg-primary/30 text-primary rounded-lg transition-colors"
-              >
-                <Globe className="w-3.5 h-3.5" />
-                {calendarType === 'gregorian' ? 'ET' : 'GC'}
-              </button>
-              <button
-                type="button"
-                onClick={() => setIsOpen(false)}
-                className="p-1.5 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
-              >
-                <X className="w-4 h-4 text-gray-500 dark:text-gray-400" />
-              </button>
-            </div>
-          </div>
+        <>
 
-          {calendarType === 'gregorian' ? renderGregorianCalendar() : renderEthiopianCalendar()}
-
-          {value && (
-            <div className="border-t border-gray-200 dark:border-gray-700 p-3 bg-gray-50 dark:bg-gray-900/50 space-y-1.5">
-              <div className="flex items-center justify-between text-xs">
-                <span className="text-gray-500 dark:text-gray-400">Gregorian:</span>
-                <span className="font-medium text-gray-700 dark:text-gray-300">{format(value, 'MMMM d, yyyy')}</span>
-              </div>
-              <div className="flex items-center justify-between text-xs">
-                <span className="text-gray-500 dark:text-gray-400">Ethiopian:</span>
-                <span className="font-medium text-gray-700 dark:text-gray-300">{formatEthiopianDate(gregorianToEthiopian(value))}</span>
-              </div>
+          {/* Mobile: full-screen takeover */}
+          {isMobileView ? (
+            <div
+              className="fixed inset-0 z-[100] bg-white dark:bg-gray-900 flex flex-col"
+              style={{ animation: 'mdp-slide-up 0.25s cubic-bezier(0.32,0.72,0,1)' }}
+            >
+              {modalContent}
             </div>
+          ) : (
+            /* Desktop: centred modal with backdrop */
+            <>
+              <div className="fixed inset-0 z-[99] bg-black/40 backdrop-blur-sm" onClick={() => setIsOpen(false)} />
+              <div
+                className="fixed inset-0 z-[100] flex items-center justify-center p-4 pointer-events-none"
+              >
+                <div
+                  className="bg-white dark:bg-gray-900 rounded-2xl shadow-2xl border border-gray-200 dark:border-gray-700 w-full max-w-sm pointer-events-auto"
+                  style={{ animation: 'mdp-scale-in 0.2s cubic-bezier(0.34,1.56,0.64,1)' }}
+                >
+                  {modalContent}
+                </div>
+              </div>
+            </>
           )}
-        </div>
+
+          <style>{`
+            @keyframes mdp-slide-up {
+              from { transform: translateY(100%); opacity: 0; }
+              to   { transform: translateY(0);    opacity: 1; }
+            }
+            @keyframes mdp-scale-in {
+              from { transform: scale(0.92); opacity: 0; }
+              to   { transform: scale(1);    opacity: 1; }
+            }
+          `}</style>
+        </>
       )}
     </div>
   );
diff --git a/apps/edr-passenger-web/portal/src/components/ProgressIndicator.tsx b/apps/edr-passenger-web/portal/src/components/ProgressIndicator.tsx
index a9a1f4253..9d0215c3a 100644
--- a/apps/edr-passenger-web/portal/src/components/ProgressIndicator.tsx
+++ b/apps/edr-passenger-web/portal/src/components/ProgressIndicator.tsx
@@ -1,87 +1,93 @@
 'use client';
 
 import { Check } from 'lucide-react';
+import { useEffect, useRef } from 'react';
 
-interface Step {
-  id: string;
-  name: string;
-  href: string;
-}
-
-const steps: Step[] = [
-  { id: 'search', name: 'Search', href: '/booking/search' },
-  { id: 'results', name: 'Results', href: '/booking/results' },
-  { id: 'passengers', name: 'Passengers', href: '/booking/passengers' },
-  { id: 'seats', name: 'Seats', href: '/booking/seats' },
-  { id: 'review', name: 'Review', href: '/booking/review' },
-  { id: 'payment', name: 'Payment', href: '/booking/payment' },
-  { id: 'confirmation', name: 'Confirmation', href: '/booking/confirmation' },
+const steps = [
+  { id: 'search',       name: 'Search' },
+  { id: 'results',      name: 'Results' },
+  { id: 'passengers',   name: 'Passengers' },
+  { id: 'seats',        name: 'Seats' },
+  { id: 'review',       name: 'Review' },
+  { id: 'payment',      name: 'Payment' },
+  { id: 'confirmation', name: 'Done' },
 ];
 
-interface ProgressIndicatorProps {
-  currentStep: string;
-}
-
-export function ProgressIndicator({ currentStep }: ProgressIndicatorProps) {
+export function ProgressIndicator({ currentStep }: { currentStep: string }) {
   const currentIndex = steps.findIndex((s) => s.id === currentStep);
+  const scrollRef   = useRef<HTMLDivElement>(null);
+  const activeRef   = useRef<HTMLLIElement>(null);
+
+  // Auto-scroll active step to centre on mobile
+  useEffect(() => {
+    const container = scrollRef.current;
+    const active    = activeRef.current;
+    if (!container || !active) return;
+    const offset = active.offsetLeft + active.offsetWidth / 2 - container.clientWidth / 2;
+    container.scrollTo({ left: offset, behavior: 'smooth' });
+  }, [currentIndex]);
+
+  const stepItem = (step: typeof steps[0], index: number) => {
+    const isComplete = index < currentIndex;
+    const isCurrent  = index === currentIndex;
+
+    return (
+      <li
+        key={step.id}
+        ref={isCurrent ? activeRef : undefined}
+        className="flex flex-col items-center flex-shrink-0 w-[4.5rem] md:flex-1"
+      >
+        {/* Line + Circle row */}
+        <div className="flex items-center w-full">
+          {/* Left connector */}
+          <div className={`flex-1 h-0.5 ${index === 0 ? 'invisible' : isComplete ? 'bg-primary' : 'bg-gray-200 dark:bg-gray-700'}`} />
+
+          {/* Circle */}
+          <div className={`flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-full transition-all duration-300 ${
+            isComplete ? 'bg-primary shadow-sm' :
+            isCurrent  ? 'border-[3px] border-primary bg-white dark:bg-gray-800 shadow-sm' :
+                         'border-2 border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800'
+          }`}>
+            {isComplete
+              ? <Check className="h-4 w-4 text-white" />
+              : <span className={`text-xs font-bold ${isCurrent ? 'text-primary' : 'text-gray-400 dark:text-gray-500'}`}>{index + 1}</span>
+            }
+          </div>
+
+          {/* Right connector */}
+          <div className={`flex-1 h-0.5 ${index === steps.length - 1 ? 'invisible' : isComplete ? 'bg-primary' : 'bg-gray-200 dark:bg-gray-700'}`} />
+        </div>
+
+        {/* Label */}
+        <p className={`mt-1.5 text-[10px] md:text-xs font-medium text-center leading-tight whitespace-nowrap ${
+          isCurrent  ? 'text-primary font-bold' :
+          isComplete ? 'text-gray-600 dark:text-gray-300' :
+                       'text-gray-400 dark:text-gray-500'
+        }`}>
+          {step.name}
+        </p>
+      </li>
+    );
+  };
 
   return (
-    <nav aria-label="Progress" className="py-6">
-      <ol className="flex items-center max-w-6xl mx-auto">
-        {steps.map((step, index) => {
-          const isComplete = index < currentIndex;
-          const isCurrent = index === currentIndex;
+    <nav aria-label="Progress">
+      {/* Mobile: full-bleed scrollable */}
+      <div
+        ref={scrollRef}
+        className="md:hidden overflow-x-auto scrollbar-hide px-4 py-3"
+      >
+        <ol className="flex items-start min-w-full">
+          {steps.map((s, i) => stepItem(s, i))}
+        </ol>
+      </div>
 
-          return (
-            <li key={step.id} className="flex flex-col items-center" style={{ width: `${100 / steps.length}%` }}>
-              <div className="flex items-center w-full">
-                <div
-                  className={`flex-1 h-1 transition-all duration-300 ${
-                    index === 0 ? 'opacity-0' : isComplete ? 'bg-primary' : 'bg-gray-200 dark:bg-gray-700'
-                  }`}
-                />
-                <div
-                  className={`relative flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full transition-all duration-300 ${
-                    isComplete
-                      ? 'bg-primary shadow-lg scale-110'
-                      : isCurrent
-                      ? 'border-4 border-primary bg-white dark:bg-gray-800 shadow-lg scale-110'
-                      : 'border-2 border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800'
-                  }`}
-                >
-                  {isComplete ? (
-                    <Check className="h-5 w-5 text-white" />
-                  ) : (
-                    <span
-                      className={`text-sm font-bold ${
-                        isCurrent ? 'text-primary' : 'text-gray-400 dark:text-gray-500'
-                      }`}
-                    >
-                      {index + 1}
-                    </span>
-                  )}
-                </div>
-                <div
-                  className={`flex-1 h-1 transition-all duration-300 ${
-                    index === steps.length - 1 ? 'opacity-0' : isComplete ? 'bg-primary' : 'bg-gray-200 dark:bg-gray-700'
-                  }`}
-                />
-              </div>
-              <div className="flex items-center w-full">
-                <div className={`flex-1 ${index === 0 ? 'opacity-0' : ''}`} />
-                <p
-                  className={`mt-3 text-xs md:text-sm font-medium transition-colors flex-shrink-0 ${
-                    isCurrent ? 'text-primary font-bold' : isComplete ? 'text-gray-700 dark:text-gray-300' : 'text-gray-400 dark:text-gray-500'
-                  }`}
-                >
-                  {step.name}
-                </p>
-                <div className={`flex-1 ${index === steps.length - 1 ? 'opacity-0' : ''}`} />
-              </div>
-            </li>
-          );
-        })}
-      </ol>
+      {/* Desktop: full container width matching header/footer */}
+      <div className="hidden md:block container mx-auto px-4 py-4">
+        <ol className="flex items-start max-w-6xl mx-auto">
+          {steps.map((s, i) => stepItem(s, i))}
+        </ol>
+      </div>
     </nav>
   );
 }
diff --git a/apps/edr-passenger-web/portal/src/components/SearchWidget.tsx b/apps/edr-passenger-web/portal/src/components/SearchWidget.tsx
index 5967fe331..180393aab 100644
--- a/apps/edr-passenger-web/portal/src/components/SearchWidget.tsx
+++ b/apps/edr-passenger-web/portal/src/components/SearchWidget.tsx
@@ -42,7 +42,7 @@ export function SearchWidget({ fullWidth = false, onSearch }: SearchWidgetProps)
   });
 
   const { register, handleSubmit, watch, setValue, formState: { errors } } = useForm<SearchForm>({
-    resolver: zodResolver(searchSchema),
+    resolver: zodResolver(searchSchema as any),
     defaultValues: {
       adultCount: 1,
       childCount: 0,
diff --git a/apps/edr-passenger-web/portal/src/lib/booking-store.ts b/apps/edr-passenger-web/portal/src/lib/booking-store.ts
index d51429bfd..32f836ac3 100644
--- a/apps/edr-passenger-web/portal/src/lib/booking-store.ts
+++ b/apps/edr-passenger-web/portal/src/lib/booking-store.ts
@@ -8,6 +8,7 @@ export interface SearchCriteria {
   adultCount: number;
   childCount: number;
   nationality: 'ETHIOPIAN' | 'DJIBOUTIAN' | 'OTHER';
+  promoCode?: string;
 }
 
 export interface PassengerDetail {
@@ -25,6 +26,7 @@ export interface PassengerDetail {
   idDocumentType?: string;
   isPrimaryPassenger: boolean;
   seatId?: string;
+  seatNumber?: string;
   phone?: string;
   email?: string;
   gender?: string;
diff --git a/apps/edr-passenger-web/portal/tailwind.config.js b/apps/edr-passenger-web/portal/tailwind.config.js
index ed5d063f7..f9ae9f63d 100644
--- a/apps/edr-passenger-web/portal/tailwind.config.js
+++ b/apps/edr-passenger-web/portal/tailwind.config.js
@@ -1,84 +1,84 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  darkMode: 'class',
+  darkMode: "class",
   content: [
-    './src/**/*.{js,ts,jsx,tsx,mdx}',
-    './src/app/**/*.{js,ts,jsx,tsx,mdx}',
-    './src/components/**/*.{js,ts,jsx,tsx,mdx}',
-    './src/pages/**/*.{js,ts,jsx,tsx,mdx}',
+    "./src/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
   ],
   theme: {
     extend: {
       colors: {
-        primary: 'rgb(20 113 76)',
+        primary: "rgb(20 113 76)",
       },
       backgroundColor: {
-        primary: 'rgb(20 113 76)',
+        primary: "rgb(20 113 76)",
       },
       textColor: {
-        primary: 'rgb(20 113 76)',
+        primary: "rgb(20 113 76)",
       },
       borderColor: {
-        primary: 'rgb(20 113 76)',
+        primary: "rgb(20 113 76)",
       },
       ringColor: {
-        primary: 'rgb(20 113 76)',
+        primary: "rgb(20 113 76)",
       },
       animation: {
-        'bounce-in': 'bounce-in 0.5s cubic-bezier(0.34, 1.56, 0.64, 1)',
-        'float': 'float 6s ease-in-out infinite',
-        'shimmer': 'shimmer 2s infinite',
-        'slide-in-left': 'slide-in-left 0.5s ease-out',
-        'slide-in-right': 'slide-in-right 0.5s ease-out',
+        "bounce-in": "bounce-in 0.5s cubic-bezier(0.34, 1.56, 0.64, 1)",
+        float: "float 6s ease-in-out infinite",
+        shimmer: "shimmer 2s infinite",
+        "slide-in-left": "slide-in-left 0.5s ease-out",
+        "slide-in-right": "slide-in-right 0.5s ease-out",
       },
       keyframes: {
-        'bounce-in': {
-          '0%': {
-            opacity: '0',
-            transform: 'translateY(20px) scale(0.9)',
+        "bounce-in": {
+          "0%": {
+            opacity: "0",
+            transform: "translateY(20px) scale(0.9)",
           },
-          '50%': {
-            opacity: '1',
+          "50%": {
+            opacity: "1",
           },
-          '100%': {
-            opacity: '1',
-            transform: 'translateY(0) scale(1)',
+          "100%": {
+            opacity: "1",
+            transform: "translateY(0) scale(1)",
           },
         },
-        'float': {
-          '0%, 100%': {
-            transform: 'translateY(0px)',
+        float: {
+          "0%, 100%": {
+            transform: "translateY(0px)",
           },
-          '50%': {
-            transform: 'translateY(-20px)',
+          "50%": {
+            transform: "translateY(-20px)",
           },
         },
-        'shimmer': {
-          '0%': {
-            'background-position': '-1000px 0',
+        shimmer: {
+          "0%": {
+            "background-position": "-1000px 0",
           },
-          '100%': {
-            'background-position': '1000px 0',
+          "100%": {
+            "background-position": "1000px 0",
           },
         },
-        'slide-in-left': {
-          'from': {
-            opacity: '0',
-            transform: 'translateX(-20px)',
+        "slide-in-left": {
+          from: {
+            opacity: "0",
+            transform: "translateX(-20px)",
           },
-          'to': {
-            opacity: '1',
-            transform: 'translateX(0)',
+          to: {
+            opacity: "1",
+            transform: "translateX(0)",
           },
         },
-        'slide-in-right': {
-          'from': {
-            opacity: '0',
-            transform: 'translateX(20px)',
+        "slide-in-right": {
+          from: {
+            opacity: "0",
+            transform: "translateX(20px)",
           },
-          'to': {
-            opacity: '1',
-            transform: 'translateX(0)',
+          to: {
+            opacity: "1",
+            transform: "translateX(0)",
           },
         },
       },
diff --git a/apps/edr-payment-api/Dockerfile b/apps/edr-payment-api/Dockerfile
new file mode 100644
index 000000000..ea35c1f39
--- /dev/null
+++ b/apps/edr-payment-api/Dockerfile
@@ -0,0 +1,41 @@
+# syntax=docker/dockerfile:1
+# Build from monorepo root: docker build -f apps/edr-freight-api/Dockerfile .
+
+FROM node:24.15.0-alpine AS base
+RUN apk add --no-cache libc6-compat
+RUN corepack enable
+WORKDIR /app
+
+FROM base AS pruner
+COPY . .
+RUN pnpm dlx turbo prune "@edr/payment-api" --docker
+
+FROM base AS installer
+COPY --from=pruner /app/out/json/ .
+COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
+RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
+    pnpm install --frozen-lockfile
+
+FROM base AS builder
+COPY --from=installer /app/ .
+COPY --from=pruner /app/out/full/ .
+RUN pnpm turbo build --filter="@edr/payment-api..."
+
+FROM base AS deployer
+COPY --from=builder /app/ .
+RUN pnpm deploy --filter="@edr/payment-api" --prod --legacy --ignore-scripts /deploy
+
+FROM node:24.15.0-alpine AS runner
+RUN apk add --no-cache libc6-compat
+ENV NODE_ENV=production
+WORKDIR /app
+RUN addgroup --system --gid 1001 nodejs \
+    && adduser --system --uid 1001 --ingroup nodejs nestjs
+COPY --from=deployer --chown=nestjs:nodejs /deploy .
+COPY apps/edr-payment-api/docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh \
+    && chown -R nestjs:nodejs /app
+USER nestjs
+EXPOSE 3008
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["node", "dist/main.js"]
diff --git a/apps/edr-payment-api/docker-entrypoint.sh b/apps/edr-payment-api/docker-entrypoint.sh
new file mode 100644
index 000000000..743319f70
--- /dev/null
+++ b/apps/edr-payment-api/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+cd /app
+
+# npm run executes the same package.json scripts as pnpm run (pnpm reinstalls in deploy layout)
+node dist/scripts/migrate.js
+
+exec "$@"
diff --git a/apps/edr-payment-api/nest-cli.json b/apps/edr-payment-api/nest-cli.json
new file mode 100644
index 000000000..89d7d6c57
--- /dev/null
+++ b/apps/edr-payment-api/nest-cli.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json.schemastore.org/nest-cli",
+  "collection": "@nestjs/schematics",
+  "sourceRoot": "src",
+  "compilerOptions": {
+    "deleteOutDir": false
+  }
+}
diff --git a/apps/edr-payment-api/package.json b/apps/edr-payment-api/package.json
new file mode 100644
index 000000000..bdcda721b
--- /dev/null
+++ b/apps/edr-payment-api/package.json
@@ -0,0 +1,75 @@
+{
+  "name": "@edr/payment-api",
+  "version": "0.0.0",
+  "private": true,
+  "description": "EDR Payment Microservice — owns provider integration, payment intents, webhooks, and outbox notifications for the whole platform",
+  "scripts": {
+    "clean": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true}); fs.rmSync('.tsbuildinfo',{force:true});\"",
+    "predev": "pnpm run clean",
+    "dev": "nest start --watch",
+    "prebuild": "pnpm run clean",
+    "build": "nest build",
+    "start": "node dist/main.js",
+    "lint": "eslint src",
+    "test": "jest",
+    "type-check": "tsc --noEmit",
+    "migration:run": "node dist/scripts/migrate.js",
+    "migration:revert": "ts-node src/scripts/migrate-revert.ts"
+  },
+  "dependencies": {
+    "@edr/api-common": "workspace:*",
+    "@edr/payment-providers": "workspace:*",
+    "@edr/types": "workspace:*",
+    "@golevelup/nestjs-rabbitmq": "^5.5.0",
+    "@nestjs/axios": "^4.0.1",
+    "@nestjs/common": "^11.0.0",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.0",
+    "@nestjs/platform-express": "^11.0.0",
+    "@nestjs/schedule": "^6.0.0",
+    "@nestjs/swagger": "^11.4.2",
+    "@nestjs/typeorm": "^11.0.1",
+    "axios": "^1.16.1",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
+    "dotenv": "^17.4.2",
+    "pg": "^8.13.0",
+    "reflect-metadata": "^0.2.2",
+    "rxjs": "^7.8.1",
+    "typeorm": "0.3.30"
+  },
+  "devDependencies": {
+    "@edr/eslint-config": "workspace:*",
+    "@edr/tsconfig": "workspace:*",
+    "@nestjs/cli": "^11.0.0",
+    "@nestjs/schematics": "^11.0.0",
+    "@nestjs/testing": "^11.0.0",
+    "@types/express": "^5.0.0",
+    "@types/jest": "^29.5.13",
+    "@types/node": "^20.14.0",
+    "@types/pg": "^8.6.7",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.5",
+    "ts-loader": "^9.5.1",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.5.4"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+}
diff --git a/apps/edr-payment-api/src/app.module.ts b/apps/edr-payment-api/src/app.module.ts
new file mode 100644
index 000000000..de92f3909
--- /dev/null
+++ b/apps/edr-payment-api/src/app.module.ts
@@ -0,0 +1,53 @@
+import { Module } from "@nestjs/common";
+import { ConfigModule, ConfigService } from "@nestjs/config";
+import { ScheduleModule } from "@nestjs/schedule";
+import { TypeOrmModule, TypeOrmModuleOptions } from "@nestjs/typeorm";
+import appConfig from "./config/app.config";
+import databaseConfig from "./config/database.config";
+import notifierConfig from "./config/notifier.config";
+import rabbitmqConfig from "./config/rabbitmq.config";
+import telebirrConfig from "./config/telebirr.config";
+import waafiConfig from "./config/waafi.config";
+import cbeConfig from "./config/cbe.config";
+import ebirrConfig from "./config/ebirr.config";
+import cardConfig from "./config/card.config";
+import dmoneyConfig from "./config/dmoney.config";
+import { HealthModule } from "./modules/health/health.module";
+import { IntentsModule } from "./modules/intents/intents.module";
+import { OutboxModule } from "./modules/outbox/outbox.module";
+import { ProvidersModule } from "./modules/providers/providers.module";
+import { ReconciliationModule } from "./modules/reconciliation/reconciliation.module";
+import { WebhooksModule } from "./modules/webhooks/webhooks.module";
+
+@Module({
+  imports: [
+    ConfigModule.forRoot({
+      isGlobal: true,
+      load: [
+        appConfig,
+        databaseConfig,
+        notifierConfig,
+        rabbitmqConfig,
+        telebirrConfig,
+        waafiConfig,
+        cbeConfig,
+        ebirrConfig,
+        cardConfig,
+        dmoneyConfig,
+      ],
+    }),
+    TypeOrmModule.forRootAsync({
+      inject: [ConfigService],
+      useFactory: (config: ConfigService) =>
+        config.get<TypeOrmModuleOptions>("database") as TypeOrmModuleOptions,
+    }),
+    ScheduleModule.forRoot(),
+    HealthModule,
+    ProvidersModule,
+    IntentsModule,
+    WebhooksModule,
+    OutboxModule,
+    ReconciliationModule,
+  ],
+})
+export class AppModule {}
diff --git a/apps/edr-payment-api/src/common/guards/service-auth.guard.ts b/apps/edr-payment-api/src/common/guards/service-auth.guard.ts
new file mode 100644
index 000000000..5b5fb39c5
--- /dev/null
+++ b/apps/edr-payment-api/src/common/guards/service-auth.guard.ts
@@ -0,0 +1,55 @@
+import {
+  CanActivate,
+  ExecutionContext,
+  Injectable,
+  Logger,
+  UnauthorizedException,
+} from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { timingSafeEqual } from "node:crypto";
+import { Request } from "express";
+
+/**
+ * Shared-secret service-to-service auth for the internal surface (/payments/*).
+ * Callers send `x-service-token: <SERVICE_AUTH_TOKEN>` (or `Authorization: Bearer …`).
+ * Webhook endpoints are intentionally NOT behind this guard — they are provider-facing and
+ * authenticate via signature verification instead.
+ */
+@Injectable()
+export class ServiceAuthGuard implements CanActivate {
+  private readonly logger = new Logger(ServiceAuthGuard.name);
+  private readonly token: string;
+  private warned = false;
+
+  constructor(config: ConfigService) {
+    this.token = config.get<string>("app.serviceAuthToken") ?? "";
+    if (!this.token && process.env.NODE_ENV === "production") {
+      throw new Error("SERVICE_AUTH_TOKEN must be set in production");
+    }
+  }
+
+  canActivate(context: ExecutionContext): boolean {
+    if (!this.token) {
+      if (!this.warned) {
+        this.logger.warn(
+          "SERVICE_AUTH_TOKEN unset — internal endpoints are UNGUARDED (dev only)",
+        );
+        this.warned = true;
+      }
+      return true;
+    }
+
+    const request = context.switchToHttp().getRequest<Request>();
+    const header = request.headers["x-service-token"];
+    const bearer = request.headers.authorization?.replace(/^Bearer\s+/i, "");
+    const presented =
+      (Array.isArray(header) ? header[0] : header) ?? bearer ?? "";
+
+    const expected = Buffer.from(this.token);
+    const actual = Buffer.from(presented);
+    const valid =
+      expected.length === actual.length && timingSafeEqual(expected, actual);
+    if (!valid) throw new UnauthorizedException("Invalid service token");
+    return true;
+  }
+}
diff --git a/apps/edr-payment-api/src/config/app.config.ts b/apps/edr-payment-api/src/config/app.config.ts
new file mode 100644
index 000000000..c1128a872
--- /dev/null
+++ b/apps/edr-payment-api/src/config/app.config.ts
@@ -0,0 +1,21 @@
+import { registerAs } from "@nestjs/config";
+
+export default registerAs("app", () => ({
+  port: parseInt(process.env.PORT ?? "3003", 10),
+  /**
+   * Shared secret for service-to-service auth (apps -> /payments/*, payment -> mark-paid).
+   * Required in production; in development an empty value disables the guard with a warning.
+   * TODO: integrate @tria-plc IAM / mTLS as the long-term mechanism (docs/payment-service §14).
+   */
+  serviceAuthToken: process.env.SERVICE_AUTH_TOKEN ?? "",
+  reconciliation: {
+    /** How often the stale-intent sweep runs. */
+    sweepIntervalMs: parseInt(
+      process.env.RECONCILE_SWEEP_INTERVAL_MS ?? "60000",
+      10,
+    ),
+    /** An intent is "stale" when non-terminal and untouched for this long. */
+    staleAfterMs: parseInt(process.env.RECONCILE_STALE_AFTER_MS ?? "60000", 10),
+    batchSize: parseInt(process.env.RECONCILE_BATCH_SIZE ?? "20", 10),
+  },
+}));
diff --git a/apps/edr-payment-api/src/config/card.config.ts b/apps/edr-payment-api/src/config/card.config.ts
new file mode 100644
index 000000000..fa9d4b30c
--- /dev/null
+++ b/apps/edr-payment-api/src/config/card.config.ts
@@ -0,0 +1,9 @@
+import { registerAs } from "@nestjs/config";
+
+export default registerAs("card", () => ({
+  baseUrl: process.env.CARD_BASE_URL || "",
+  apiKey: process.env.CARD_API_KEY || "",
+  webhookSecret: process.env.CARD_WEBHOOK_SECRET || "",
+  webhookUrl: process.env.CARD_WEBHOOK_URL || "",
+  returnUrl: process.env.CARD_RETURN_URL || "",
+}));
diff --git a/apps/edr-payment-api/src/config/cbe.config.ts b/apps/edr-payment-api/src/config/cbe.config.ts
new file mode 100644
index 000000000..eb2cd689f
--- /dev/null
+++ b/apps/edr-payment-api/src/config/cbe.config.ts
@@ -0,0 +1,9 @@
+import { registerAs } from "@nestjs/config";
+
+export default registerAs("cbe", () => ({
+  baseUrl: process.env.CBE_BASE_URL || "",
+  merchantId: process.env.CBE_MERCHANT_ID || "",
+  secretKey: process.env.CBE_SECRET_KEY || "",
+  notifyUrl: process.env.CBE_NOTIFY_URL || "",
+  returnUrl: process.env.CBE_RETURN_URL || "",
+}));
diff --git a/apps/edr-payment-api/src/config/database.config.ts b/apps/edr-payment-api/src/config/database.config.ts
new file mode 100644
index 000000000..43d8ca564
--- /dev/null
+++ b/apps/edr-payment-api/src/config/database.config.ts
@@ -0,0 +1,36 @@
+import { registerAs } from "@nestjs/config";
+import { TypeOrmModuleOptions } from "@nestjs/typeorm";
+import { DataSourceOptions } from "typeorm";
+
+/**
+ * Shared connection options for the Nest TypeORM module and the standalone DataSource
+ * (migration CLI). Payment tables live in the SAME Postgres database as the domain system
+ * (edr_database by default) but in the dedicated `edr_payment` schema; logical ownership is
+ * enforced with a dedicated DB user in non-dev environments (grants only on this schema).
+ */
+export function buildDataSourceOptions(): DataSourceOptions {
+  return {
+    type: "postgres",
+    host: process.env.DB_HOST ?? "localhost",
+    port: parseInt(process.env.DB_PORT ?? "5432", 10),
+    username: process.env.DB_USER ?? "edr",
+    password: process.env.DB_PASSWORD ?? "",
+    database: process.env.DB_NAME ?? "edr_database",
+    schema: process.env.DB_SCHEMA ?? "edr_payment",
+    entities: [__dirname + "/../**/*.entity.{ts,js}"],
+    migrations: [__dirname + "/../migrations/*.{ts,js}"],
+    // Schema changes go through migrations only — never synchronize (house rule).
+    synchronize: false,
+    logging: process.env.NODE_ENV === "development",
+  };
+}
+
+export default registerAs(
+  "database",
+  (): TypeOrmModuleOptions => ({
+    ...buildDataSourceOptions(),
+    autoLoadEntities: true,
+    // Run pending migrations on boot (main.ts ensures the database/schema exist first).
+    migrationsRun: true,
+  }),
+);
diff --git a/apps/edr-payment-api/src/config/dmoney.config.ts b/apps/edr-payment-api/src/config/dmoney.config.ts
new file mode 100644
index 000000000..78751f8d5
--- /dev/null
+++ b/apps/edr-payment-api/src/config/dmoney.config.ts
@@ -0,0 +1,10 @@
+import { registerAs } from "@nestjs/config";
+
+export default registerAs("dmoney", () => ({
+  baseUrl: process.env.DMONEY_BASE_URL ?? "",
+  appId: process.env.DMONEY_APP_ID ?? "",
+  appSecret: process.env.DMONEY_APP_SECRET ?? "",
+  publicKey: process.env.DMONEY_PUBLIC_KEY ?? "",
+  privateKey: process.env.DMONEY_PRIVATE_KEY ?? "",
+  notifyUrl: process.env.DMONEY_NOTIFY_URL ?? "",
+}));
diff --git a/apps/edr-payment-api/src/config/ebirr.config.ts b/apps/edr-payment-api/src/config/ebirr.config.ts
new file mode 100644
index 000000000..4c5dd68e6
--- /dev/null
+++ b/apps/edr-payment-api/src/config/ebirr.config.ts
@@ -0,0 +1,9 @@
+import { registerAs } from "@nestjs/config";
+
+export default registerAs("ebirr", () => ({
+  baseUrl: process.env.EBIRR_BASE_URL || "",
+  merchantCode: process.env.EBIRR_MERCHANT_CODE || "",
+  secretKey: process.env.EBIRR_SECRET_KEY || "",
+  notifyUrl: process.env.EBIRR_NOTIFY_URL || "",
+  returnUrl: process.env.EBIRR_RETURN_URL || "",
+}));
diff --git a/apps/edr-payment-api/src/config/ensure-schema.ts b/apps/edr-payment-api/src/config/ensure-schema.ts
new file mode 100644
index 000000000..9f7a5bb52
--- /dev/null
+++ b/apps/edr-payment-api/src/config/ensure-schema.ts
@@ -0,0 +1,52 @@
+import { Client } from "pg";
+
+const IDENTIFIER = /^[a-z_][a-z0-9_]*$/;
+
+function connectionEnv() {
+  return {
+    host: process.env.DB_HOST ?? "localhost",
+    port: parseInt(process.env.DB_PORT ?? "5432", 10),
+    user: process.env.DB_USER ?? "edr",
+    password: process.env.DB_PASSWORD ?? "",
+  };
+}
+
+/**
+ * Dev/bootstrap convenience: make sure the `edr_payment` schema exists in the shared
+ * database before TypeORM initializes (the migrations table itself lives in the schema, so
+ * migrations cannot create it). In production the schema/grants are provisioned out-of-band
+ * by ops; this is then a no-op.
+ */
+export async function ensurePaymentSchema(): Promise<void> {
+  const database = process.env.DB_NAME ?? "edr_database";
+  const schema = process.env.DB_SCHEMA ?? "edr_payment";
+  if (!IDENTIFIER.test(database) || !IDENTIFIER.test(schema)) {
+    throw new Error(
+      `Invalid DB_NAME/DB_SCHEMA identifier: ${database}/${schema}`,
+    );
+  }
+
+  let client = new Client({ ...connectionEnv(), database });
+  try {
+    await client.connect();
+  } catch (err) {
+    // 3D000 = database does not exist — create it from the maintenance DB, then reconnect.
+    if ((err as { code?: string }).code !== "3D000") throw err;
+    await client.end().catch(() => undefined);
+    const admin = new Client({ ...connectionEnv(), database: "postgres" });
+    await admin.connect();
+    try {
+      await admin.query(`CREATE DATABASE "${database}"`);
+    } finally {
+      await admin.end();
+    }
+    client = new Client({ ...connectionEnv(), database });
+    await client.connect();
+  }
+
+  try {
+    await client.query(`CREATE SCHEMA IF NOT EXISTS "${schema}"`);
+  } finally {
+    await client.end();
+  }
+}
diff --git a/apps/edr-payment-api/src/config/notifier.config.ts b/apps/edr-payment-api/src/config/notifier.config.ts
new file mode 100644
index 000000000..cddc66761
--- /dev/null
+++ b/apps/edr-payment-api/src/config/notifier.config.ts
@@ -0,0 +1,15 @@
+import { registerAs } from "@nestjs/config";
+
+export default registerAs("notifier", () => ({
+  /** mark-paid callback URL per owning service (PaymentService discriminator routes here). */
+  passengerUrl:
+    process.env.PAYMENT_NOTIFY_PASSENGER_URL ??
+    "http://localhost:3002/internal/payments/mark-paid",
+  freightUrl:
+    process.env.PAYMENT_NOTIFY_FREIGHT_URL ??
+    "http://localhost:3001/internal/payments/mark-paid",
+  relayIntervalMs: parseInt(process.env.OUTBOX_RELAY_INTERVAL_MS ?? "5000", 10),
+  maxAttempts: parseInt(process.env.OUTBOX_MAX_ATTEMPTS ?? "10", 10),
+  httpTimeoutMs: parseInt(process.env.NOTIFY_HTTP_TIMEOUT_MS ?? "10000", 10),
+  relayBatchSize: parseInt(process.env.OUTBOX_RELAY_BATCH_SIZE ?? "20", 10),
+}));
diff --git a/apps/edr-payment-api/src/config/rabbitmq.config.ts b/apps/edr-payment-api/src/config/rabbitmq.config.ts
new file mode 100644
index 000000000..631a5cb68
--- /dev/null
+++ b/apps/edr-payment-api/src/config/rabbitmq.config.ts
@@ -0,0 +1,23 @@
+import { registerAs } from "@nestjs/config";
+
+/**
+ * RabbitMQ connection for the outbox event publisher (payment -> apps).
+ * `publisherTransport` selects which PaymentEventPublisher the outbox relay uses:
+ *   "rabbitmq" -> RabbitMqPaymentEventPublisher (publish to the payment.events exchange) [DEFAULT]
+ *   "http"     -> HttpPaymentEventPublisher (POST to each app's mark-paid endpoint) [rollback]
+ * RabbitMQ is the default; set PUBLISHER_TRANSPORT=http explicitly to fall back to HTTP.
+ */
+export default registerAs("rabbitmq", () => ({
+  url: process.env.PAYMENT_RABBITMQ_URL ?? "amqp://localhost:5672/payment",
+  publisherTransport: (process.env.PUBLISHER_TRANSPORT ?? "rabbitmq").toLowerCase(),
+  /** Publish is failed (so the relay retries) if the broker does not confirm within this. */
+  publishTimeoutMs: parseInt(process.env.PAYMENT_PUBLISH_TIMEOUT_MS ?? "10000", 10),
+}));
+
+/**
+ * True when the outbox relay should publish to RabbitMQ rather than POST over HTTP.
+ * RabbitMQ is the default; only an explicit PUBLISHER_TRANSPORT=http opts out.
+ */
+export function isRabbitPublisher(): boolean {
+  return (process.env.PUBLISHER_TRANSPORT ?? "rabbitmq").toLowerCase() !== "http";
+}
diff --git a/apps/edr-payment-api/src/config/telebirr.config.ts b/apps/edr-payment-api/src/config/telebirr.config.ts
new file mode 100644
index 000000000..8e5d1712a
--- /dev/null
+++ b/apps/edr-payment-api/src/config/telebirr.config.ts
@@ -0,0 +1,16 @@
+import { registerAs } from "@nestjs/config";
+
+export default registerAs("telebirr", () => ({
+  baseUrl: process.env.TELEBIRR_BASE_URL ?? "",
+  webBaseUrl: process.env.TELEBIRR_WEB_BASE_URL ?? "",
+  fabricAppId: process.env.TELEBIRR_FABRIC_APP_ID ?? "",
+  appSecret: process.env.TELEBIRR_APP_SECRET ?? "",
+  merchantAppId: process.env.TELEBIRR_MERCHANT_APP_ID ?? "",
+  merchantCode: process.env.TELEBIRR_MERCHANT_CODE ?? "",
+  notifyUrl: process.env.TELEBIRR_NOTIFY_URL ?? "",
+  returnUrl: process.env.TELEBIRR_RETURN_URL ?? "",
+  timeoutExpress: process.env.TELEBIRR_TIMEOUT_EXPRESS ?? "15m",
+  privateKey: process.env.TELEBIRR_PRIVATE_KEY ?? "",
+  publicKey: process.env.TELEBIRR_PUBLIC_KEY ?? "",
+  insecureTls: process.env.TELEBIRR_INSECURE_TLS === "true",
+}));
diff --git a/apps/edr-payment-api/src/config/waafi.config.ts b/apps/edr-payment-api/src/config/waafi.config.ts
new file mode 100644
index 000000000..05624922f
--- /dev/null
+++ b/apps/edr-payment-api/src/config/waafi.config.ts
@@ -0,0 +1,27 @@
+import { registerAs } from "@nestjs/config";
+
+export default registerAs("waafi", () => ({
+  // `/asm` is appended in the provider; use sandbox by default, switch to
+  // https://api.waafipay.net in production.
+  baseUrl: process.env.WAAFI_BASE_URL ?? "https://sandbox.waafipay.net",
+  // HPP credentials (Hosted Payment Page family).
+  merchantUid: process.env.WAAFI_MERCHANT_UID ?? "",
+  storeId: process.env.WAAFI_STORE_ID ?? "",
+  hppKey: process.env.WAAFI_HPP_KEY ?? "",
+  // HMAC secret returned once by WEBHOOK_REGISTER; verifies inbound webhooks.
+  webhookSecret: process.env.WAAFI_WEBHOOK_SECRET ?? "",
+  // Wallet payment method (EVC/ZAAD/Sahal) — MWALLET_ACCOUNT requires the payer phone up front.
+  paymentMethod: process.env.WAAFI_PAYMENT_METHOD ?? "MWALLET_ACCOUNT",
+  // Waafi has no ETB; when set this overrides the asserted currency (USD/DJF/SLSH).
+  currency: process.env.WAAFI_CURRENCY ?? "DJF",
+  // Browser redirect targets after the hosted page completes/fails (UX only; webhook is source of truth).
+  successUrl: process.env.WAAFI_HPP_SUCCESS_URL ?? "",
+  failureUrl: process.env.WAAFI_HPP_FAILURE_URL ?? "",
+  // Callback data format: 1 = POST, 2 = GET, 4 = Result Token.
+  respDataFormat: Number(process.env.WAAFI_HPP_RESP_FORMAT ?? "1"),
+  // Registered webhook URL (reference only; registration is performed out-of-band).
+  notifyUrl: process.env.WAAFI_NOTIFY_URL ?? "",
+  // DEV ONLY: disable TLS cert verification. The Waafi sandbox serves a *.waafi.com cert that
+  // does not match sandbox.waafipay.net (ERR_TLS_CERT_ALTNAME_INVALID). Never enable in prod.
+  insecureTls: process.env.WAAFI_INSECURE_TLS === "true",
+}));
diff --git a/apps/edr-payment-api/src/data-source.ts b/apps/edr-payment-api/src/data-source.ts
new file mode 100644
index 000000000..2aa708300
--- /dev/null
+++ b/apps/edr-payment-api/src/data-source.ts
@@ -0,0 +1,8 @@
+import "dotenv/config";
+import { DataSource } from "typeorm";
+import { buildDataSourceOptions } from "./config/database.config";
+
+/** Standalone DataSource for the TypeORM CLI and the migrate script. */
+export const AppDataSource = new DataSource(buildDataSourceOptions());
+
+export default AppDataSource;
diff --git a/apps/edr-payment-api/src/main.ts b/apps/edr-payment-api/src/main.ts
new file mode 100644
index 000000000..c9ad69494
--- /dev/null
+++ b/apps/edr-payment-api/src/main.ts
@@ -0,0 +1,54 @@
+import "reflect-metadata";
+import "dotenv/config";
+import { NestFactory } from "@nestjs/core";
+import { ValidationPipe } from "@nestjs/common";
+import { DocumentBuilder, SwaggerModule } from "@nestjs/swagger";
+import { AppModule } from "./app.module";
+import { ensurePaymentSchema } from "./config/ensure-schema";
+
+async function bootstrap() {
+  // The edr_payment database/schema must exist before TypeORM boots (migrationsRun: true).
+  await ensurePaymentSchema();
+
+  // rawBody: true buffers the unparsed request body onto req.rawBody so webhook handlers
+  // (e.g. Waafi HMAC verification) can sign over the exact bytes the provider signed.
+  const app = await NestFactory.create(AppModule, { rawBody: true });
+
+  app.useGlobalPipes(
+    new ValidationPipe({
+      whitelist: true,
+      transform: true,
+      forbidUnknownValues: false,
+    }),
+  );
+
+  const config = new DocumentBuilder()
+    .setTitle("EDR Payment API")
+    .setDescription(
+      "Platform payment microservice: payment intents, provider integration, the single " +
+        "registered webhook per provider, and reliable (outbox) notification of the owning app. " +
+        "Internal endpoints (/payments/*) require the x-service-token header; /webhooks/* is the " +
+        "only public surface. See docs/payment-service/.",
+    )
+    .setVersion("1.0.0")
+    .addApiKey(
+      { type: "apiKey", name: "x-service-token", in: "header" },
+      "service-token",
+    )
+    .build();
+  SwaggerModule.setup(
+    "api-docs",
+    app,
+    SwaggerModule.createDocument(app, config),
+    {
+      customSiteTitle: "EDR Payment API",
+      swaggerOptions: { persistAuthorization: true },
+    },
+  );
+
+  const port = process.env.PORT ?? 3003;
+  await app.listen(port);
+  console.log(`🚀 EDR Payment API running on port ${port}`);
+  console.log(`📚 Swagger: http://localhost:${port}/api-docs`);
+}
+bootstrap();
diff --git a/apps/edr-payment-api/src/migrations/1781136000000-InitPaymentSchema.ts b/apps/edr-payment-api/src/migrations/1781136000000-InitPaymentSchema.ts
new file mode 100644
index 000000000..bbff2e7f1
--- /dev/null
+++ b/apps/edr-payment-api/src/migrations/1781136000000-InitPaymentSchema.ts
@@ -0,0 +1,124 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Initial edr_payment schema: payment_intent, payment_webhook_event, notification_outbox.
+ *
+ * Enum-valued columns are varchar on purpose (values mirror the @edr/types enums) so new
+ * providers/statuses never need an ALTER TYPE. uuid defaults use gen_random_uuid() (built into
+ * Postgres 13+; no extension required).
+ */
+export class InitPaymentSchema1781136000000 implements MigrationInterface {
+  name = "InitPaymentSchema1781136000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Defensive — bootstrap (ensure-schema) normally creates this before migrations run.
+    await queryRunner.query(`CREATE SCHEMA IF NOT EXISTS "edr_payment"`);
+
+    await queryRunner.query(`
+      CREATE TABLE "edr_payment"."payment_intent" (
+        "id"                     uuid        NOT NULL DEFAULT gen_random_uuid(),
+        "created_at"             timestamptz NOT NULL DEFAULT now(),
+        "updated_at"             timestamptz NOT NULL DEFAULT now(),
+        "deleted_at"             timestamptz,
+        "service"                varchar(16) NOT NULL,
+        "reference_type"         varchar(16) NOT NULL,
+        "reference_id"           varchar(64) NOT NULL,
+        "merchant_order_id"      varchar(64) NOT NULL,
+        "provider"               varchar(16) NOT NULL,
+        "provider_order_id"      varchar(128),
+        "provider_txn_id"        varchar(128),
+        "amount_minor"           integer     NOT NULL,
+        "confirmed_amount_minor" integer,
+        "currency"               varchar(8)  NOT NULL,
+        "status"                 varchar(24) NOT NULL DEFAULT 'REQUIRES_ACTION',
+        "client_action"          jsonb,
+        "failure_code"           varchar(64),
+        "failure_message"        text,
+        "idempotency_key"        varchar(128),
+        "expires_at"             timestamptz,
+        "paid_at"                timestamptz,
+        "raw_initiation"         jsonb,
+        CONSTRAINT "pk_payment_intent" PRIMARY KEY ("id"),
+        CONSTRAINT "uq_payment_intent_merchant_order_id" UNIQUE ("merchant_order_id")
+      )
+    `);
+    // One ACTIVE intent per domain order; terminal-failed attempts remain as audit rows.
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX "uq_payment_intent_active_reference"
+        ON "edr_payment"."payment_intent" ("service", "reference_type", "reference_id")
+        WHERE status NOT IN ('FAILED','CANCELLED') AND deleted_at IS NULL
+    `);
+    await queryRunner.query(`
+      CREATE INDEX "idx_payment_intent_provider_txn"
+        ON "edr_payment"."payment_intent" ("provider_txn_id")
+    `);
+    await queryRunner.query(`
+      CREATE INDEX "idx_payment_intent_sweep"
+        ON "edr_payment"."payment_intent" ("status", "updated_at")
+    `);
+    await queryRunner.query(`
+      CREATE INDEX "idx_payment_intent_idempotency"
+        ON "edr_payment"."payment_intent" ("service", "idempotency_key")
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE "edr_payment"."payment_webhook_event" (
+        "id"                uuid         NOT NULL DEFAULT gen_random_uuid(),
+        "created_at"        timestamptz  NOT NULL DEFAULT now(),
+        "updated_at"        timestamptz  NOT NULL DEFAULT now(),
+        "deleted_at"        timestamptz,
+        "provider"          varchar(16)  NOT NULL,
+        "external_event_id" varchar(191) NOT NULL,
+        "merchant_order_id" varchar(64),
+        "provider_txn_id"   varchar(128),
+        "signature_valid"   boolean      NOT NULL DEFAULT false,
+        "status"            varchar(64),
+        "payload"           jsonb        NOT NULL,
+        "received_at"       timestamptz  NOT NULL DEFAULT now(),
+        "processed_at"      timestamptz,
+        "processing_error"  text,
+        CONSTRAINT "pk_payment_webhook_event" PRIMARY KEY ("id")
+      )
+    `);
+    // The webhook dedupe key: duplicate provider deliveries hit this and short-circuit.
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX "uq_payment_webhook_event_external"
+        ON "edr_payment"."payment_webhook_event" ("provider", "external_event_id")
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE "edr_payment"."notification_outbox" (
+        "id"             uuid        NOT NULL DEFAULT gen_random_uuid(),
+        "created_at"     timestamptz NOT NULL DEFAULT now(),
+        "updated_at"     timestamptz NOT NULL DEFAULT now(),
+        "deleted_at"     timestamptz,
+        "event_type"     varchar(32) NOT NULL,
+        "service"        varchar(16) NOT NULL,
+        "intent_id"      uuid        NOT NULL,
+        "reference_type" varchar(16) NOT NULL,
+        "reference_id"   varchar(64) NOT NULL,
+        "payload"        jsonb       NOT NULL,
+        "status"         varchar(16) NOT NULL DEFAULT 'PENDING',
+        "attempts"       integer     NOT NULL DEFAULT 0,
+        "next_retry_at"  timestamptz,
+        "last_error"     text,
+        "sent_at"        timestamptz,
+        CONSTRAINT "pk_notification_outbox" PRIMARY KEY ("id")
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX "idx_notification_outbox_relay"
+        ON "edr_payment"."notification_outbox" ("status", "next_retry_at")
+    `);
+    await queryRunner.query(`
+      CREATE INDEX "idx_notification_outbox_intent"
+        ON "edr_payment"."notification_outbox" ("intent_id")
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE "edr_payment"."notification_outbox"`);
+    await queryRunner.query(`DROP TABLE "edr_payment"."payment_webhook_event"`);
+    await queryRunner.query(`DROP TABLE "edr_payment"."payment_intent"`);
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/health/health.controller.ts b/apps/edr-payment-api/src/modules/health/health.controller.ts
new file mode 100644
index 000000000..86eee1cc0
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/health/health.controller.ts
@@ -0,0 +1,16 @@
+import { Controller, Get } from "@nestjs/common";
+import { ApiOperation, ApiTags } from "@nestjs/swagger";
+
+@ApiTags("Health")
+@Controller("health")
+export class HealthController {
+  @Get()
+  @ApiOperation({ summary: "Liveness probe" })
+  check() {
+    return {
+      status: "ok",
+      service: "edr-payment-api",
+      timestamp: new Date().toISOString(),
+    };
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/health/health.module.ts b/apps/edr-payment-api/src/modules/health/health.module.ts
new file mode 100644
index 000000000..40b7bdfae
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/health/health.module.ts
@@ -0,0 +1,7 @@
+import { Module } from "@nestjs/common";
+import { HealthController } from "./health.controller";
+
+@Module({
+  controllers: [HealthController],
+})
+export class HealthModule {}
diff --git a/apps/edr-payment-api/src/modules/intents/dto/initiate-payment.dto.ts b/apps/edr-payment-api/src/modules/intents/dto/initiate-payment.dto.ts
new file mode 100644
index 000000000..13a2f71a4
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/intents/dto/initiate-payment.dto.ts
@@ -0,0 +1,119 @@
+import {
+  IsEnum,
+  IsIn,
+  IsInt,
+  IsOptional,
+  IsPositive,
+  IsString,
+  Length,
+  MaxLength,
+} from "class-validator";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import {
+  InitiatePaymentRequest,
+  PaymentPlatform,
+  PaymentReferenceType,
+  PaymentService,
+  ProviderMethod,
+} from "@edr/types";
+
+/** Wire shape is the shared `InitiatePaymentRequest` contract from @edr/types. */
+export class InitiatePaymentRequestDto implements InitiatePaymentRequest {
+  @ApiProperty({ enum: PaymentService })
+  @IsEnum(PaymentService)
+  service!: PaymentService;
+
+  @ApiProperty({ enum: PaymentReferenceType })
+  @IsEnum(PaymentReferenceType)
+  referenceType!: PaymentReferenceType;
+
+  @ApiProperty({
+    description:
+      "Domain order id (booking/shipment id) — already validated by the calling app",
+  })
+  @IsString()
+  @Length(1, 64)
+  referenceId!: string;
+
+  @ApiPropertyOptional({
+    description:
+      "Human-readable order ref shown on provider pages; defaults to referenceId",
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(64)
+  orderRef?: string;
+
+  @ApiProperty({
+    description:
+      "Authoritative amount in minor units, computed server-side by the app",
+  })
+  @IsInt()
+  @IsPositive()
+  amountMinor!: number;
+
+  @ApiProperty({ example: "ETB" })
+  @IsString()
+  @Length(3, 8)
+  currency!: string;
+
+  @ApiProperty({ enum: ProviderMethod })
+  @IsEnum(ProviderMethod)
+  provider!: ProviderMethod;
+
+  @ApiPropertyOptional({ enum: ["web", "mobile"] })
+  @IsOptional()
+  @IsIn(["web", "mobile"])
+  platform?: PaymentPlatform;
+
+  @ApiPropertyOptional({
+    description:
+      "Payer wallet MSISDN for providers that pre-fill it (e.g. Waafi MWALLET_ACCOUNT)",
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(32)
+  payerAccount?: string;
+
+  @ApiPropertyOptional({
+    description:
+      "Per-transaction browser return URL on success — each calling app passes its own UI " +
+      "(passenger portal vs freight portal). UX only; never confirms payment. Falls back to " +
+      "the provider config when omitted.",
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(2048)
+  returnUrl?: string;
+
+  @ApiPropertyOptional({
+    description: "Failure/cancel counterpart of returnUrl",
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(2048)
+  failureUrl?: string;
+
+  @ApiPropertyOptional({
+    description: "Caller key to dedupe retried initiations",
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(128)
+  idempotencyKey?: string;
+}
+
+export class IntentReferenceQueryDto {
+  @ApiProperty({ enum: PaymentService })
+  @IsEnum(PaymentService)
+  service!: PaymentService;
+
+  @ApiProperty({ enum: PaymentReferenceType })
+  @IsEnum(PaymentReferenceType)
+  referenceType!: PaymentReferenceType;
+
+  @ApiProperty()
+  @IsString()
+  @Length(1, 64)
+  referenceId!: string;
+}
diff --git a/apps/edr-payment-api/src/modules/intents/entities/payment-intent.entity.ts b/apps/edr-payment-api/src/modules/intents/entities/payment-intent.entity.ts
new file mode 100644
index 000000000..68c519604
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/intents/entities/payment-intent.entity.ts
@@ -0,0 +1,135 @@
+import { Column, Entity, Index } from "typeorm";
+import { BaseEntity } from "@edr/api-common";
+import {
+  ClientAction,
+  PaymentReferenceType,
+  PaymentService,
+  ProviderMethod,
+  ProviderPaymentStatus,
+} from "@edr/types";
+
+/**
+ * One payment attempt for one domain order — the platform-wide source of truth for payment
+ * state. `reference_id` is a soft reference into the owning app's schema (never a FK; see
+ * docs/payment-service/architecture.md §5).
+ *
+ * Enum-valued columns are stored as varchar (values mirror the shared @edr/types enums) so
+ * adding a provider/status never needs an ALTER TYPE migration.
+ */
+@Entity({ name: "payment_intent" })
+// One ACTIVE intent per domain order; FAILED/CANCELLED attempts may accumulate as audit rows.
+@Index(
+  "uq_payment_intent_active_reference",
+  ["service", "referenceType", "referenceId"],
+  {
+    unique: true,
+    where: `status NOT IN ('FAILED','CANCELLED') AND deleted_at IS NULL`,
+  },
+)
+@Index("idx_payment_intent_sweep", ["status", "updatedAt"])
+@Index("idx_payment_intent_idempotency", ["service", "idempotencyKey"])
+export class PaymentIntent extends BaseEntity {
+  /** Owning domain app — routing discriminator for notifications. */
+  @Column({ name: "service", type: "varchar", length: 16 })
+  service!: PaymentService;
+
+  @Column({ name: "reference_type", type: "varchar", length: 16 })
+  referenceType!: PaymentReferenceType;
+
+  /** Domain order id (booking/shipment). Soft reference — no cross-schema FK. */
+  @Column({ name: "reference_id", type: "varchar", length: 64 })
+  referenceId!: string;
+
+  /** Provider-facing reference, prefixed PSG-/FRT- so webhooks route before a DB lookup. */
+  @Column({
+    name: "merchant_order_id",
+    type: "varchar",
+    length: 64,
+    unique: true,
+  })
+  merchantOrderId!: string;
+
+  @Column({ name: "provider", type: "varchar", length: 16 })
+  provider!: ProviderMethod;
+
+  /** Provider-side order/session id (prepay id, HPP orderId, …). */
+  @Column({
+    name: "provider_order_id",
+    type: "varchar",
+    length: 128,
+    nullable: true,
+  })
+  providerOrderId?: string | null;
+
+  /** Final provider transaction id, set on terminal success. */
+  @Index("idx_payment_intent_provider_txn")
+  @Column({
+    name: "provider_txn_id",
+    type: "varchar",
+    length: 128,
+    nullable: true,
+  })
+  providerTxnId?: string | null;
+
+  /** App-asserted authoritative amount in minor units. */
+  @Column({ name: "amount_minor", type: "integer" })
+  amountMinor!: number;
+
+  /** Provider-reported amount; reconciled against amount_minor (e.g. Waafi truncates decimals). */
+  @Column({ name: "confirmed_amount_minor", type: "integer", nullable: true })
+  confirmedAmountMinor?: number | null;
+
+  @Column({ name: "currency", type: "varchar", length: 8 })
+  currency!: string;
+
+  /** State machine: REQUIRES_ACTION → PROCESSING → SUCCEEDED | FAILED | CANCELLED (absorbing). */
+  @Column({
+    name: "status",
+    type: "varchar",
+    length: 24,
+    default: ProviderPaymentStatus.REQUIRES_ACTION,
+  })
+  status!: ProviderPaymentStatus;
+
+  /** Redirect/launch payload returned to the app for the user to complete payment. */
+  @Column({ name: "client_action", type: "jsonb", nullable: true })
+  clientAction?: ClientAction | null;
+
+  @Column({ name: "failure_code", type: "varchar", length: 64, nullable: true })
+  failureCode?: string | null;
+
+  @Column({ name: "failure_message", type: "text", nullable: true })
+  failureMessage?: string | null;
+
+  /** Caller-supplied initiate dedupe key (in addition to the per-reference upsert). */
+  @Column({
+    name: "idempotency_key",
+    type: "varchar",
+    length: 128,
+    nullable: true,
+  })
+  idempotencyKey?: string | null;
+
+  @Column({ name: "expires_at", type: "timestamptz", nullable: true })
+  expiresAt?: Date | null;
+
+  @Column({ name: "paid_at", type: "timestamptz", nullable: true })
+  paidAt?: Date | null;
+
+  /** Audit copy of the provider initiation request/response (secrets redacted upstream). */
+  @Column({ name: "raw_initiation", type: "jsonb", nullable: true })
+  rawInitiation?: Record<string, unknown> | null;
+}
+
+/** Statuses that keep the per-reference unique index "active" (block a new intent). */
+export const ACTIVE_INTENT_STATUSES = [
+  ProviderPaymentStatus.REQUIRES_ACTION,
+  ProviderPaymentStatus.PROCESSING,
+  ProviderPaymentStatus.SUCCEEDED,
+] as const;
+
+export const TERMINAL_INTENT_STATUSES = [
+  ProviderPaymentStatus.SUCCEEDED,
+  ProviderPaymentStatus.FAILED,
+  ProviderPaymentStatus.CANCELLED,
+] as const;
diff --git a/apps/edr-payment-api/src/modules/intents/intents.controller.ts b/apps/edr-payment-api/src/modules/intents/intents.controller.ts
new file mode 100644
index 000000000..858ad3bae
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/intents/intents.controller.ts
@@ -0,0 +1,69 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Query,
+  UseGuards,
+} from "@nestjs/common";
+import { ApiOperation, ApiTags } from "@nestjs/swagger";
+import { PaymentIntentSnapshot } from "@edr/types";
+import { ServiceAuthGuard } from "../../common/guards/service-auth.guard";
+import {
+  InitiatePaymentRequestDto,
+  IntentReferenceQueryDto,
+} from "./dto/initiate-payment.dto";
+import { IntentsService } from "./intents.service";
+
+/**
+ * Internal surface — called only by the domain apps (service-authenticated), never by
+ * browsers. Domain validation ("is this booking payable", authoritative amount) has already
+ * happened in the calling app.
+ */
+@ApiTags("Payments (internal)")
+@UseGuards(ServiceAuthGuard)
+@Controller("payments")
+export class IntentsController {
+  constructor(private readonly intentsService: IntentsService) {}
+
+  @Post("initiate")
+  @ApiOperation({
+    summary:
+      "Create (or idempotently reuse) a payment intent and open a provider session",
+    description:
+      "One active intent per (service, referenceType, referenceId). Re-initiating a non-terminal intent returns the existing clientAction.",
+  })
+  async initiate(
+    @Body() dto: InitiatePaymentRequestDto,
+  ): Promise<PaymentIntentSnapshot> {
+    return this.intentsService.initiate(dto);
+  }
+
+  @Get("intents/:id")
+  @ApiOperation({
+    summary: "Intent status by id (pull/reconcile)",
+    description:
+      "Stale non-terminal intents trigger a provider status query before returning.",
+  })
+  async getIntent(
+    @Param("id", ParseUUIDPipe) id: string,
+  ): Promise<PaymentIntentSnapshot> {
+    return this.intentsService.getIntent(id);
+  }
+
+  @Get("intents")
+  @ApiOperation({
+    summary: "Active intent status by domain reference (pull/reconcile)",
+  })
+  async getIntentByReference(
+    @Query() query: IntentReferenceQueryDto,
+  ): Promise<PaymentIntentSnapshot> {
+    return this.intentsService.getIntentByReference(
+      query.service,
+      query.referenceType,
+      query.referenceId,
+    );
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/intents/intents.module.ts b/apps/edr-payment-api/src/modules/intents/intents.module.ts
new file mode 100644
index 000000000..9e9774ad9
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/intents/intents.module.ts
@@ -0,0 +1,21 @@
+import { Module } from "@nestjs/common";
+import { TypeOrmModule } from "@nestjs/typeorm";
+import { ProvidersModule } from "../providers/providers.module";
+import { NotificationOutbox } from "../outbox/entities/notification-outbox.entity";
+import { PaymentIntent } from "./entities/payment-intent.entity";
+import { IntentsController } from "./intents.controller";
+import { IntentsRepository } from "./intents.repository";
+import { IntentsService } from "./intents.service";
+
+@Module({
+  // NotificationOutbox is registered here because terminal transitions insert outbox rows
+  // inside the intent-finalizing transaction (transactional outbox).
+  imports: [
+    TypeOrmModule.forFeature([PaymentIntent, NotificationOutbox]),
+    ProvidersModule,
+  ],
+  controllers: [IntentsController],
+  providers: [IntentsService, IntentsRepository],
+  exports: [IntentsService, IntentsRepository],
+})
+export class IntentsModule {}
diff --git a/apps/edr-payment-api/src/modules/intents/intents.repository.ts b/apps/edr-payment-api/src/modules/intents/intents.repository.ts
new file mode 100644
index 000000000..a17407069
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/intents/intents.repository.ts
@@ -0,0 +1,73 @@
+import { Injectable } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { In, LessThan, Not, Repository } from "typeorm";
+import { BaseRepository } from "@edr/api-common";
+import {
+  PaymentReferenceType,
+  PaymentService,
+  ProviderPaymentStatus,
+} from "@edr/types";
+import { PaymentIntent } from "./entities/payment-intent.entity";
+
+@Injectable()
+export class IntentsRepository extends BaseRepository<PaymentIntent> {
+  constructor(
+    @InjectRepository(PaymentIntent)
+    repository: Repository<PaymentIntent>,
+  ) {
+    super(repository);
+  }
+
+  /** The single non-FAILED/CANCELLED intent for a domain order (matches the partial unique index). */
+  async findActiveByReference(
+    service: PaymentService,
+    referenceType: PaymentReferenceType,
+    referenceId: string,
+  ): Promise<PaymentIntent | null> {
+    return this.repository.findOne({
+      where: {
+        service,
+        referenceType,
+        referenceId,
+        status: Not(
+          In([ProviderPaymentStatus.FAILED, ProviderPaymentStatus.CANCELLED]),
+        ),
+      },
+      order: { createdAt: "DESC" },
+    });
+  }
+
+  async findByMerchantOrderId(
+    merchantOrderId: string,
+  ): Promise<PaymentIntent | null> {
+    return this.repository.findOne({ where: { merchantOrderId } });
+  }
+
+  async findByIdempotencyKey(
+    service: PaymentService,
+    idempotencyKey: string,
+  ): Promise<PaymentIntent | null> {
+    return this.repository.findOne({
+      where: { service, idempotencyKey },
+      order: { createdAt: "DESC" },
+    });
+  }
+
+  /** Non-terminal intents untouched since `updatedBefore` — input for the reconciliation sweep. */
+  async findStale(
+    updatedBefore: Date,
+    limit: number,
+  ): Promise<PaymentIntent[]> {
+    return this.repository.find({
+      where: {
+        status: In([
+          ProviderPaymentStatus.REQUIRES_ACTION,
+          ProviderPaymentStatus.PROCESSING,
+        ]),
+        updatedAt: LessThan(updatedBefore),
+      },
+      order: { updatedAt: "ASC" },
+      take: limit,
+    });
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/intents/intents.service.ts b/apps/edr-payment-api/src/modules/intents/intents.service.ts
new file mode 100644
index 000000000..492a86b78
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/intents/intents.service.ts
@@ -0,0 +1,343 @@
+import {
+  BadRequestException,
+  Inject,
+  Injectable,
+  Logger,
+  NotFoundException,
+} from "@nestjs/common";
+import { DataSource, QueryFailedError } from "typeorm";
+import { createMerchantOrderId } from "@edr/payment-providers";
+import {
+  InitiatePaymentRequest,
+  PaymentIntentSnapshot,
+  PaymentReferenceType,
+  PaymentService,
+  ProviderPaymentStatus,
+  ProviderStatus,
+} from "@edr/types";
+import {
+  PAYMENT_PROVIDER_MAP,
+  PaymentProviderMap,
+} from "../providers/providers.module";
+import { NotificationOutbox } from "../outbox/entities/notification-outbox.entity";
+import { buildOutboxRow } from "../outbox/payment-event.factory";
+import {
+  PaymentIntent,
+  TERMINAL_INTENT_STATUSES,
+} from "./entities/payment-intent.entity";
+import { IntentsRepository } from "./intents.repository";
+
+const PG_UNIQUE_VIOLATION = "23505";
+/** Don't hit the provider again if the intent was refreshed this recently. */
+const REFRESH_MIN_AGE_MS = 5_000;
+
+/** Result of a provider signal (webhook or status query) applied to the state machine. */
+export interface ProviderResultInput {
+  status: ProviderPaymentStatus;
+  providerTxnId?: string;
+  paidAt?: Date;
+  confirmedAmountMinor?: number;
+  failureCode?: string;
+  failureMessage?: string;
+}
+
+@Injectable()
+export class IntentsService {
+  private readonly logger = new Logger(IntentsService.name);
+
+  constructor(
+    private readonly intentsRepository: IntentsRepository,
+    // DataSource is used only for the finalize transaction (intent update + outbox insert
+    // must commit atomically); routine access still goes through the custom repository.
+    private readonly dataSource: DataSource,
+    @Inject(PAYMENT_PROVIDER_MAP)
+    private readonly providers: PaymentProviderMap,
+  ) {}
+
+  /* ------------------------------------------------------------------ initiate */
+
+  async initiate(
+    request: InitiatePaymentRequest,
+  ): Promise<PaymentIntentSnapshot> {
+
+    if (request.idempotencyKey) {
+      const byKey = await this.intentsRepository.findByIdempotencyKey(
+        request.service,
+        request.idempotencyKey,
+      );
+      if (byKey) return this.toSnapshot(byKey);
+    }
+
+    const existing = await this.intentsRepository.findActiveByReference(
+      request.service,
+      request.referenceType,
+      request.referenceId,
+    );
+    if (existing) {
+      const reusable = await this.reuseOrRetire(existing);
+      if (reusable) return this.toSnapshot(reusable);
+    }
+
+    const provider = this.providers.get(request.provider);
+    if (!provider) {
+      throw new BadRequestException(
+        `Unsupported payment provider: ${request.provider}`,
+      );
+    }
+
+    const merchantOrderId = createMerchantOrderId();
+    const result = await provider.initiate({
+      merchantOrderId,
+      orderRef: request.orderRef ?? request.referenceId,
+      amountMinor: request.amountMinor,
+      currency: request.currency,
+      platform: request.platform,
+      payerAccount: request.payerAccount,
+      returnUrl: request.returnUrl,
+      redirectUrl: request.returnUrl,
+      failureUrl: request.failureUrl,
+    });
+
+    try {
+      const intent = await this.intentsRepository.create({
+        service: request.service,
+        referenceType: request.referenceType,
+        referenceId: request.referenceId,
+        merchantOrderId,
+        provider: request.provider,
+        providerOrderId: result.providerOrderId,
+        amountMinor: request.amountMinor,
+        currency: request.currency,
+        status: ProviderPaymentStatus.REQUIRES_ACTION,
+        clientAction: result.clientAction,
+        idempotencyKey: request.idempotencyKey ?? null,
+        expiresAt: result.expiresAt,
+        rawInitiation: result.rawInitiation,
+      });
+      this.logger.log(
+        `intent ${intent.id} created: ${request.service}/${request.referenceType}/${request.referenceId} via ${request.provider} (${merchantOrderId})`,
+      );
+      return this.toSnapshot(intent);
+    } catch (err) {
+      if (
+        err instanceof QueryFailedError &&
+        (err.driverError as { code?: string })?.code === PG_UNIQUE_VIOLATION
+      ) {
+        const winner = await this.intentsRepository.findActiveByReference(
+          request.service,
+          request.referenceType,
+          request.referenceId,
+        );
+        if (winner) return this.toSnapshot(winner);
+      }
+      throw err;
+    }
+  }
+
+  /**
+   * Decide whether an existing active intent can be returned as-is. An expired
+   * REQUIRES_ACTION intent is retired (CANCELLED, no notification — nothing was paid)
+   * so a fresh provider session can be opened.
+   */
+  private async reuseOrRetire(
+    intent: PaymentIntent,
+  ): Promise<PaymentIntent | null> {
+    const expired =
+      intent.status === ProviderPaymentStatus.REQUIRES_ACTION &&
+      intent.expiresAt != null &&
+      intent.expiresAt.getTime() < Date.now();
+    if (!expired) return intent;
+
+    await this.intentsRepository.update(intent.id, {
+      status: ProviderPaymentStatus.CANCELLED,
+      failureCode: "EXPIRED",
+      failureMessage: "Provider session expired before the payer acted",
+    });
+    return null;
+  }
+
+  /* ------------------------------------------------------------------ lookups */
+
+  async getIntent(id: string): Promise<PaymentIntentSnapshot> {
+    const intent = await this.intentsRepository.findById(id);
+    if (!intent) throw new NotFoundException("PaymentIntent not found");
+    return this.toSnapshot(await this.refreshIfStale(intent));
+  }
+
+  async getIntentByReference(
+    service: PaymentService,
+    referenceType: PaymentReferenceType,
+    referenceId: string,
+  ): Promise<PaymentIntentSnapshot> {
+    const intent = await this.intentsRepository.findActiveByReference(
+      service,
+      referenceType,
+      referenceId,
+    );
+    if (!intent) throw new NotFoundException("PaymentIntent not found");
+    return this.toSnapshot(await this.refreshIfStale(intent));
+  }
+
+  /**
+   * Pull-side reconciliation: when a polled intent is non-terminal and stale, ask the
+   * provider for the truth and run the answer through the state machine. The browser
+   * redirect never confirms payment — this query (or a webhook) does.
+   */
+  private async refreshIfStale(intent: PaymentIntent): Promise<PaymentIntent> {
+    const refreshable =
+      intent.status === ProviderPaymentStatus.REQUIRES_ACTION ||
+      intent.status === ProviderPaymentStatus.PROCESSING;
+    const stale = intent.updatedAt.getTime() < Date.now() - REFRESH_MIN_AGE_MS;
+    const provider = this.providers.get(intent.provider);
+    if (!refreshable || !stale || !provider) return intent;
+
+    try {
+      const status = await provider.queryStatus(intent.merchantOrderId);
+      await this.applyProviderResult(
+        intent.id,
+        this.fromProviderStatus(status),
+      );
+      return (await this.intentsRepository.findById(intent.id)) ?? intent;
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.logger.warn(
+        `queryStatus failed for intent ${intent.id}: ${message}; returning cached`,
+      );
+      return intent;
+    }
+  }
+
+  fromProviderStatus(status: ProviderStatus): ProviderResultInput {
+    return {
+      status: status.status,
+      providerTxnId: status.providerTxnId,
+      failureCode: status.failureCode,
+      failureMessage: status.failureMessage,
+    };
+  }
+
+  /* ------------------------------------------------------------------ state machine */
+
+  /**
+   * Advance the intent state machine with a verified provider signal. Terminal states are
+   * absorbing; a terminal transition writes the notification_outbox row IN THE SAME
+   * TRANSACTION as the intent update (transactional outbox — architecture.md §8).
+   */
+  async applyProviderResult(
+    intentId: string,
+    result: ProviderResultInput,
+  ): Promise<{ alreadyTerminal: boolean }> {
+    return this.dataSource.transaction(async (manager) => {
+      const intent = await manager
+        .getRepository(PaymentIntent)
+        .createQueryBuilder("intent")
+        .setLock("pessimistic_write")
+        .where("intent.id = :intentId", { intentId })
+        .getOne();
+      if (!intent) throw new NotFoundException("PaymentIntent not found");
+
+      if (
+        (TERMINAL_INTENT_STATUSES as readonly ProviderPaymentStatus[]).includes(
+          intent.status,
+        )
+      ) {
+        return { alreadyTerminal: true };
+      }
+
+      if (result.status === ProviderPaymentStatus.SUCCEEDED) {
+        const paidAt = result.paidAt ?? new Date();
+        intent.status = ProviderPaymentStatus.SUCCEEDED;
+        intent.providerTxnId = result.providerTxnId ?? intent.providerTxnId;
+        intent.paidAt = paidAt;
+        intent.confirmedAmountMinor =
+          result.confirmedAmountMinor ?? intent.confirmedAmountMinor;
+        intent.failureCode = null;
+        intent.failureMessage = null;
+        await manager.save(intent);
+        await manager.getRepository(NotificationOutbox).save(
+          buildOutboxRow(intent, {
+            eventType: "payment.succeeded",
+            providerTxnId: intent.providerTxnId ?? undefined,
+            paidAt,
+          }),
+        );
+        if (
+          result.confirmedAmountMinor != null &&
+          result.confirmedAmountMinor !== intent.amountMinor
+        ) {
+          this.logger.error(
+            `intent ${intent.id} amount mismatch: asserted=${intent.amountMinor} confirmed=${result.confirmedAmountMinor}`,
+          );
+        }
+        this.logger.log(
+          `intent ${intent.id} SUCCEEDED (txn=${intent.providerTxnId ?? "n/a"})`,
+        );
+        return { alreadyTerminal: false };
+      }
+
+      if (
+        result.status === ProviderPaymentStatus.FAILED ||
+        result.status === ProviderPaymentStatus.CANCELLED
+      ) {
+        intent.status = result.status;
+        intent.providerTxnId = result.providerTxnId ?? intent.providerTxnId;
+        intent.failureCode = result.failureCode ?? null;
+        intent.failureMessage = result.failureMessage ?? null;
+        await manager.save(intent);
+        await manager.getRepository(NotificationOutbox).save(
+          buildOutboxRow(intent, {
+            eventType: "payment.failed",
+            failureCode: result.failureCode,
+            failureMessage: result.failureMessage,
+          }),
+        );
+        this.logger.log(
+          `intent ${intent.id} ${result.status} (${result.failureCode ?? "n/a"})`,
+        );
+        return { alreadyTerminal: false };
+      }
+
+      // Non-terminal: REQUIRES_ACTION may move to PROCESSING; never the reverse.
+      if (
+        result.status === ProviderPaymentStatus.PROCESSING &&
+        intent.status === ProviderPaymentStatus.REQUIRES_ACTION
+      ) {
+        intent.status = ProviderPaymentStatus.PROCESSING;
+      }
+      intent.providerTxnId = result.providerTxnId ?? intent.providerTxnId;
+      await manager.save(intent);
+      return { alreadyTerminal: false };
+    });
+  }
+
+  /** Expire an abandoned intent (reconciliation sweep) — CANCELLED + payment.failed event. */
+  async expireIntent(intentId: string): Promise<void> {
+    await this.applyProviderResult(intentId, {
+      status: ProviderPaymentStatus.CANCELLED,
+      failureCode: "EXPIRED",
+      failureMessage: "Payment session expired before completion",
+    });
+  }
+
+  /* ------------------------------------------------------------------ mapping */
+
+  toSnapshot(intent: PaymentIntent): PaymentIntentSnapshot {
+    return {
+      intentId: intent.id,
+      service: intent.service,
+      referenceType: intent.referenceType,
+      referenceId: intent.referenceId,
+      merchantOrderId: intent.merchantOrderId,
+      provider: intent.provider,
+      status: intent.status,
+      amountMinor: intent.amountMinor,
+      currency: intent.currency,
+      clientAction: intent.clientAction ?? undefined,
+      providerTxnId: intent.providerTxnId ?? undefined,
+      paidAt: intent.paidAt?.toISOString(),
+      failureCode: intent.failureCode ?? undefined,
+      failureMessage: intent.failureMessage ?? undefined,
+      expiresAt: intent.expiresAt?.toISOString(),
+    };
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/outbox/entities/notification-outbox.entity.ts b/apps/edr-payment-api/src/modules/outbox/entities/notification-outbox.entity.ts
new file mode 100644
index 000000000..55b34e968
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/outbox/entities/notification-outbox.entity.ts
@@ -0,0 +1,55 @@
+import { Column, Entity, Index } from "typeorm";
+import { BaseEntity } from "@edr/api-common";
+import {
+  PaymentEvent,
+  PaymentEventType,
+  PaymentReferenceType,
+  PaymentService,
+} from "@edr/types";
+
+export type OutboxStatus = "PENDING" | "SENT" | "FAILED";
+
+/**
+ * Transactional outbox: a row is inserted in the SAME transaction that finalizes an intent,
+ * so "payment succeeded" and "a notification is owed" commit or roll back together. The relay
+ * drains PENDING rows and retries until acked (at-least-once delivery; consumers are idempotent).
+ */
+@Entity({ name: "notification_outbox" })
+@Index("idx_notification_outbox_relay", ["status", "nextRetryAt"])
+export class NotificationOutbox extends BaseEntity {
+  @Column({ name: "event_type", type: "varchar", length: 32 })
+  eventType!: PaymentEventType;
+
+  /** Routing discriminator — which app's mark-paid endpoint the relay delivers to. */
+  @Column({ name: "service", type: "varchar", length: 16 })
+  service!: PaymentService;
+
+  @Index("idx_notification_outbox_intent")
+  @Column({ name: "intent_id", type: "uuid" })
+  intentId!: string;
+
+  @Column({ name: "reference_type", type: "varchar", length: 16 })
+  referenceType!: PaymentReferenceType;
+
+  @Column({ name: "reference_id", type: "varchar", length: 64 })
+  referenceId!: string;
+
+  /** The full versioned event envelope delivered verbatim to the consumer. */
+  @Column({ name: "payload", type: "jsonb" })
+  payload!: PaymentEvent;
+
+  @Column({ name: "status", type: "varchar", length: 16, default: "PENDING" })
+  status!: OutboxStatus;
+
+  @Column({ name: "attempts", type: "integer", default: 0 })
+  attempts!: number;
+
+  @Column({ name: "next_retry_at", type: "timestamptz", nullable: true })
+  nextRetryAt?: Date | null;
+
+  @Column({ name: "last_error", type: "text", nullable: true })
+  lastError?: string | null;
+
+  @Column({ name: "sent_at", type: "timestamptz", nullable: true })
+  sentAt?: Date | null;
+}
diff --git a/apps/edr-payment-api/src/modules/outbox/outbox-relay.service.ts b/apps/edr-payment-api/src/modules/outbox/outbox-relay.service.ts
new file mode 100644
index 000000000..f1d8076a5
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/outbox/outbox-relay.service.ts
@@ -0,0 +1,119 @@
+import {
+  Inject,
+  Injectable,
+  Logger,
+  OnModuleDestroy,
+  OnModuleInit,
+} from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { SchedulerRegistry } from "@nestjs/schedule";
+import { NotificationOutbox } from "./entities/notification-outbox.entity";
+import { OutboxRepository } from "./outbox.repository";
+import {
+  PAYMENT_EVENT_PUBLISHER,
+  PaymentEventPublisher,
+} from "./publisher/payment-event-publisher";
+
+const RELAY_INTERVAL_NAME = "outbox-relay";
+/** Retry backoff: base doubles per attempt, capped. */
+const BACKOFF_BASE_MS = 10_000;
+const BACKOFF_CAP_MS = 10 * 60_000;
+
+/**
+ * Drains the transactional outbox: PENDING rows are published (HTTP now, RabbitMQ later),
+ * marked SENT on ack, retried with exponential backoff on failure, and flagged FAILED after
+ * OUTBOX_MAX_ATTEMPTS (an alertable condition — delivery is at-least-once, never dropped
+ * silently). A crash between commit and publish only delays delivery.
+ */
+@Injectable()
+export class OutboxRelayService implements OnModuleInit, OnModuleDestroy {
+  private readonly logger = new Logger(OutboxRelayService.name);
+  private readonly intervalMs: number;
+  private readonly maxAttempts: number;
+  private readonly batchSize: number;
+  private draining = false;
+
+  constructor(
+    config: ConfigService,
+    private readonly outboxRepository: OutboxRepository,
+    private readonly schedulerRegistry: SchedulerRegistry,
+    @Inject(PAYMENT_EVENT_PUBLISHER)
+    private readonly publisher: PaymentEventPublisher,
+  ) {
+    this.intervalMs = config.get<number>("notifier.relayIntervalMs") ?? 5_000;
+    this.maxAttempts = config.get<number>("notifier.maxAttempts") ?? 10;
+    this.batchSize = config.get<number>("notifier.relayBatchSize") ?? 20;
+  }
+
+  onModuleInit(): void {
+    const interval = setInterval(() => void this.drain(), this.intervalMs);
+    this.schedulerRegistry.addInterval(RELAY_INTERVAL_NAME, interval);
+  }
+
+  onModuleDestroy(): void {
+    if (this.schedulerRegistry.doesExist("interval", RELAY_INTERVAL_NAME)) {
+      this.schedulerRegistry.deleteInterval(RELAY_INTERVAL_NAME);
+    }
+  }
+
+  /** One relay pass; re-entrant ticks are skipped so slow deliveries don't overlap. */
+  async drain(): Promise<void> {
+    if (this.draining) return;
+    this.draining = true;
+    try {
+      const due = await this.outboxRepository.findDue(this.batchSize);
+      for (const row of due) {
+        await this.deliver(row);
+      }
+    } catch (err) {
+      this.logger.error(
+        `relay pass failed: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    } finally {
+      this.draining = false;
+    }
+  }
+
+  private async deliver(row: NotificationOutbox): Promise<void> {
+    try {
+      await this.publisher.publish(row.payload);
+      await this.outboxRepository.markSent(row.id);
+    } catch (err) {
+      const message = this.describeError(err);
+      const attempts = row.attempts + 1;
+      const exhausted = attempts >= this.maxAttempts;
+      const backoffMs = Math.min(
+        BACKOFF_BASE_MS * 2 ** row.attempts,
+        BACKOFF_CAP_MS,
+      );
+      await this.outboxRepository.markAttemptFailed(
+        row,
+        message,
+        exhausted ? null : new Date(Date.now() + backoffMs),
+        exhausted,
+      );
+      if (exhausted) {
+        // ALERT: a paid order may not be confirmed in the owning app — needs operator action.
+        this.logger.error(
+          `outbox ${row.id} (${row.eventType} intent=${row.intentId}) FAILED after ${attempts} attempts: ${message}`,
+        );
+      } else {
+        this.logger.warn(
+          `outbox ${row.id} delivery attempt ${attempts} failed (retry in ${backoffMs}ms): ${message}`,
+        );
+      }
+    }
+  }
+
+  /** Connection failures surface as AggregateError with an empty message — dig out the code. */
+  private describeError(err: unknown): string {
+    if (err instanceof Error) {
+      if (err.message) return err.message;
+      const code = (err as { code?: string }).code;
+      if (code) return code;
+      const inner = (err as { errors?: unknown[] }).errors?.[0];
+      if (inner instanceof Error && inner.message) return inner.message;
+    }
+    return String(err);
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/outbox/outbox.module.ts b/apps/edr-payment-api/src/modules/outbox/outbox.module.ts
new file mode 100644
index 000000000..eae5515e8
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/outbox/outbox.module.ts
@@ -0,0 +1,57 @@
+import { Module } from "@nestjs/common";
+import { HttpModule } from "@nestjs/axios";
+import { ConfigService } from "@nestjs/config";
+import { TypeOrmModule } from "@nestjs/typeorm";
+import { RabbitMQModule } from "@golevelup/nestjs-rabbitmq";
+import { PAYMENT_EVENTS_DLX, PAYMENT_EVENTS_EXCHANGE } from "@edr/types";
+import { isRabbitPublisher } from "../../config/rabbitmq.config";
+import { NotificationOutbox } from "./entities/notification-outbox.entity";
+import { OutboxRelayService } from "./outbox-relay.service";
+import { OutboxRepository } from "./outbox.repository";
+import { HttpPaymentEventPublisher } from "./publisher/http-payment-event-publisher";
+import { PAYMENT_EVENT_PUBLISHER } from "./publisher/payment-event-publisher";
+import { RabbitMqPaymentEventPublisher } from "./publisher/rabbitmq-payment-event-publisher";
+
+const rabbitImports = isRabbitPublisher()
+  ? [
+      RabbitMQModule.forRootAsync({
+        inject: [ConfigService],
+        useFactory: (config: ConfigService) => ({
+          uri: config.get<string>("rabbitmq.url") as string,
+          exchanges: [
+            {
+              name: PAYMENT_EVENTS_EXCHANGE,
+              type: "topic",
+              options: { durable: true },
+            },
+            {
+              name: PAYMENT_EVENTS_DLX,
+              type: "topic",
+              options: { durable: true },
+            },
+          ],
+          connectionInitOptions: { wait: false },
+        }),
+      }),
+    ]
+  : [];
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([NotificationOutbox]),
+    HttpModule,
+    ...rabbitImports,
+  ],
+  providers: [
+    OutboxRepository,
+    OutboxRelayService,
+    {
+      provide: PAYMENT_EVENT_PUBLISHER,
+      useClass: isRabbitPublisher()
+        ? RabbitMqPaymentEventPublisher
+        : HttpPaymentEventPublisher,
+    },
+  ],
+  exports: [OutboxRepository],
+})
+export class OutboxModule {}
diff --git a/apps/edr-payment-api/src/modules/outbox/outbox.repository.ts b/apps/edr-payment-api/src/modules/outbox/outbox.repository.ts
new file mode 100644
index 000000000..20000d9c6
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/outbox/outbox.repository.ts
@@ -0,0 +1,58 @@
+import { Injectable } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { Repository } from "typeorm";
+import { BaseRepository } from "@edr/api-common";
+import { NotificationOutbox } from "./entities/notification-outbox.entity";
+
+@Injectable()
+export class OutboxRepository extends BaseRepository<NotificationOutbox> {
+  constructor(
+    @InjectRepository(NotificationOutbox)
+    repository: Repository<NotificationOutbox>,
+  ) {
+    super(repository);
+  }
+
+  /**
+   * PENDING rows whose retry time has come, oldest first. The relay runs as a single
+   * non-overlapping loop per instance; with multiple service instances this should move to a
+   * SELECT … FOR UPDATE SKIP LOCKED claim.
+   */
+  async findDue(limit: number): Promise<NotificationOutbox[]> {
+    return this.repository
+      .createQueryBuilder("outbox")
+      .where(`outbox.status = 'PENDING'`)
+      .andWhere(
+        "(outbox.next_retry_at IS NULL OR outbox.next_retry_at <= now())",
+      )
+      .orderBy("outbox.created_at", "ASC")
+      .take(limit)
+      .getMany();
+  }
+
+  async markSent(id: string): Promise<void> {
+    await this.update(id, {
+      status: "SENT",
+      sentAt: new Date(),
+      lastError: null,
+    });
+  }
+
+  async markAttemptFailed(
+    row: NotificationOutbox,
+    error: string,
+    nextRetryAt: Date | null,
+    exhausted: boolean,
+  ): Promise<void> {
+    await this.update(row.id, {
+      attempts: row.attempts + 1,
+      lastError: error,
+      nextRetryAt,
+      status: exhausted ? "FAILED" : "PENDING",
+    });
+  }
+
+  async countBacklog(): Promise<number> {
+    return this.repository.count({ where: { status: "PENDING" } });
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/outbox/payment-event.factory.ts b/apps/edr-payment-api/src/modules/outbox/payment-event.factory.ts
new file mode 100644
index 000000000..85b67c444
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/outbox/payment-event.factory.ts
@@ -0,0 +1,66 @@
+import { randomUUID } from "node:crypto";
+import {
+  PaymentEvent,
+  PaymentFailedEvent,
+  PaymentSucceededEvent,
+} from "@edr/types";
+import { PaymentIntent } from "../intents/entities/payment-intent.entity";
+import { NotificationOutbox } from "./entities/notification-outbox.entity";
+
+/**
+ * Build a ready-to-insert outbox row for a terminal intent. Pure (no DI) so the intents
+ * state machine can insert it inside its own DB transaction without a module cycle.
+ * The row id is generated here because the event envelope embeds it as `eventId`.
+ */
+export function buildOutboxRow(
+  intent: PaymentIntent,
+  terminal:
+    | { eventType: "payment.succeeded"; providerTxnId?: string; paidAt: Date }
+    | {
+        eventType: "payment.failed";
+        failureCode?: string;
+        failureMessage?: string;
+      },
+): Partial<NotificationOutbox> {
+  const id = randomUUID();
+  const base = {
+    version: 1 as const,
+    eventId: id,
+    occurredAt: new Date().toISOString(),
+    service: intent.service,
+    intentId: intent.id,
+    referenceType: intent.referenceType,
+    referenceId: intent.referenceId,
+    merchantOrderId: intent.merchantOrderId,
+    provider: intent.provider,
+    amountMinor: intent.amountMinor,
+    currency: intent.currency,
+  };
+
+  const event: PaymentEvent =
+    terminal.eventType === "payment.succeeded"
+      ? ({
+          ...base,
+          eventType: "payment.succeeded",
+          providerTxnId: terminal.providerTxnId,
+          paidAt: terminal.paidAt.toISOString(),
+        } satisfies PaymentSucceededEvent)
+      : ({
+          ...base,
+          eventType: "payment.failed",
+          failureCode: terminal.failureCode,
+          failureMessage: terminal.failureMessage,
+        } satisfies PaymentFailedEvent);
+
+  return {
+    id,
+    eventType: event.eventType,
+    service: intent.service,
+    intentId: intent.id,
+    referenceType: intent.referenceType,
+    referenceId: intent.referenceId,
+    payload: event,
+    status: "PENDING",
+    attempts: 0,
+  };
+}
diff --git a/apps/edr-payment-api/src/modules/outbox/publisher/http-payment-event-publisher.ts b/apps/edr-payment-api/src/modules/outbox/publisher/http-payment-event-publisher.ts
new file mode 100644
index 000000000..867119d09
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/outbox/publisher/http-payment-event-publisher.ts
@@ -0,0 +1,53 @@
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { HttpService } from "@nestjs/axios";
+import { firstValueFrom } from "rxjs";
+import { PaymentEvent, PaymentService } from "@edr/types";
+import { PaymentEventPublisher } from "./payment-event-publisher";
+
+/**
+ * Delivers events by POSTing to the owning app's idempotent mark-paid endpoint, routed by
+ * the `service` discriminator. Authenticated with the shared service token (the same secret
+ * the apps use to call /payments/initiate).
+ */
+@Injectable()
+export class HttpPaymentEventPublisher implements PaymentEventPublisher {
+  private readonly logger = new Logger(HttpPaymentEventPublisher.name);
+  private readonly routes: Record<PaymentService, string>;
+  private readonly timeoutMs: number;
+  private readonly serviceToken: string;
+
+  constructor(
+    config: ConfigService,
+    private readonly http: HttpService,
+  ) {
+    this.routes = {
+      [PaymentService.PASSENGER]:
+        config.get<string>("notifier.passengerUrl") ?? "",
+      [PaymentService.FREIGHT]: config.get<string>("notifier.freightUrl") ?? "",
+    };
+    this.timeoutMs = config.get<number>("notifier.httpTimeoutMs") ?? 10_000;
+    this.serviceToken = config.get<string>("app.serviceAuthToken") ?? "";
+  }
+
+  async publish(event: PaymentEvent): Promise<void> {
+    const url = this.routes[event.service];
+    if (!url) {
+      throw new Error(
+        `No mark-paid URL configured for service ${event.service}`,
+      );
+    }
+
+    const response = await firstValueFrom(
+      this.http.post(url, event, {
+        timeout: this.timeoutMs,
+        headers: this.serviceToken
+          ? { "x-service-token": this.serviceToken }
+          : {},
+      }),
+    );
+    this.logger.log(
+      `delivered ${event.eventType} (${event.eventId}) to ${event.service} — HTTP ${response.status}`,
+    );
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/outbox/publisher/payment-event-publisher.ts b/apps/edr-payment-api/src/modules/outbox/publisher/payment-event-publisher.ts
new file mode 100644
index 000000000..7586c1509
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/outbox/publisher/payment-event-publisher.ts
@@ -0,0 +1,13 @@
+import { PaymentEvent } from "@edr/types";
+
+/**
+ * Publisher port (architecture.md §12): how a payment event leaves this service.
+ * HTTP implementation now; a RabbitMQ implementation later is a DI swap only — the outbox
+ * and relay stay exactly as they are.
+ */
+export interface PaymentEventPublisher {
+  /** Deliver one event; throw on failure so the relay can retry with backoff. */
+  publish(event: PaymentEvent): Promise<void>;
+}
+
+export const PAYMENT_EVENT_PUBLISHER = Symbol("PAYMENT_EVENT_PUBLISHER");
diff --git a/apps/edr-payment-api/src/modules/outbox/publisher/rabbitmq-payment-event-publisher.ts b/apps/edr-payment-api/src/modules/outbox/publisher/rabbitmq-payment-event-publisher.ts
new file mode 100644
index 000000000..0453b22ca
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/outbox/publisher/rabbitmq-payment-event-publisher.ts
@@ -0,0 +1,61 @@
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { AmqpConnection } from "@golevelup/nestjs-rabbitmq";
+import {
+  PAYMENT_EVENTS_EXCHANGE,
+  PaymentEvent,
+  paymentRoutingKey,
+} from "@edr/types";
+import { PaymentEventPublisher } from "./payment-event-publisher";
+
+@Injectable()
+export class RabbitMqPaymentEventPublisher implements PaymentEventPublisher {
+  private readonly logger = new Logger(RabbitMqPaymentEventPublisher.name);
+  private readonly publishTimeoutMs: number;
+
+  constructor(
+    private readonly amqp: AmqpConnection,
+    config: ConfigService,
+  ) {
+    this.publishTimeoutMs =
+      config.get<number>("rabbitmq.publishTimeoutMs") ?? 10_000;
+  }
+
+  async publish(event: PaymentEvent): Promise<void> {
+    const routingKey = paymentRoutingKey(event.service, event.eventType);
+
+    const confirmed = await this.withTimeout(
+      this.amqp.publish(PAYMENT_EVENTS_EXCHANGE, routingKey, event, {
+        persistent: true,
+        messageId: event.eventId,
+        contentType: "application/json",
+        type: event.eventType,
+        headers: { "x-event-version": event.version },
+      }),
+    );
+
+    if (!confirmed) {
+      throw new Error(
+        `broker did not confirm publish of ${event.eventType} (${event.eventId})`,
+      );
+    }
+
+    this.logger.log(
+      `published ${event.eventType} (${event.eventId}) -> ${routingKey}`,
+    );
+  }
+
+  private withTimeout(p: Promise<boolean>): Promise<boolean> {
+    let timer: NodeJS.Timeout;
+    const timeout = new Promise<boolean>((_, reject) => {
+      timer = setTimeout(
+        () =>
+          reject(
+            new Error(`publish confirm timed out after ${this.publishTimeoutMs}ms`),
+          ),
+        this.publishTimeoutMs,
+      );
+    });
+    return Promise.race([p, timeout]).finally(() => clearTimeout(timer));
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/providers/providers.module.ts b/apps/edr-payment-api/src/modules/providers/providers.module.ts
new file mode 100644
index 000000000..af2983ee4
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/providers/providers.module.ts
@@ -0,0 +1,46 @@
+import { Module } from "@nestjs/common";
+import { HttpModule } from "@nestjs/axios";
+import {
+  CardProvider,
+  CbeBirrProvider,
+  DMoneyProvider,
+  EBirrProvider,
+  PaymentProvider,
+  TelebirrProvider,
+  WaafiProvider,
+} from "@edr/payment-providers";
+import { ProviderMethod } from "@edr/types";
+
+/** Injection token for the Map<ProviderMethod, PaymentProvider> used to select a gateway. */
+export const PAYMENT_PROVIDER_MAP = Symbol("PAYMENT_PROVIDER_MAP");
+
+export type PaymentProviderMap = Map<ProviderMethod, PaymentProvider>;
+
+const providerClasses = [
+  TelebirrProvider,
+  CbeBirrProvider,
+  EBirrProvider,
+  CardProvider,
+  WaafiProvider,
+  DMoneyProvider,
+];
+
+/**
+ * Thin DI wiring around @edr/payment-providers — the exact provider set the passenger app
+ * used to construct, relocated here. After cutover this service is the only consumer of the
+ * provider SDK and of the provider secrets (config/{waafi,telebirr,…}.config.ts).
+ */
+@Module({
+  imports: [HttpModule.register({ timeout: 10_000 })],
+  providers: [
+    ...providerClasses,
+    {
+      provide: PAYMENT_PROVIDER_MAP,
+      useFactory: (...providers: PaymentProvider[]): PaymentProviderMap =>
+        new Map(providers.map((provider) => [provider.method, provider])),
+      inject: providerClasses,
+    },
+  ],
+  exports: [PAYMENT_PROVIDER_MAP, ...providerClasses],
+})
+export class ProvidersModule {}
diff --git a/apps/edr-payment-api/src/modules/reconciliation/reconciliation.module.ts b/apps/edr-payment-api/src/modules/reconciliation/reconciliation.module.ts
new file mode 100644
index 000000000..b424dcfec
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/reconciliation/reconciliation.module.ts
@@ -0,0 +1,10 @@
+import { Module } from "@nestjs/common";
+import { IntentsModule } from "../intents/intents.module";
+import { ProvidersModule } from "../providers/providers.module";
+import { ReconciliationService } from "./reconciliation.service";
+
+@Module({
+  imports: [IntentsModule, ProvidersModule],
+  providers: [ReconciliationService],
+})
+export class ReconciliationModule {}
diff --git a/apps/edr-payment-api/src/modules/reconciliation/reconciliation.service.ts b/apps/edr-payment-api/src/modules/reconciliation/reconciliation.service.ts
new file mode 100644
index 000000000..5216798f2
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/reconciliation/reconciliation.service.ts
@@ -0,0 +1,114 @@
+import {
+  Inject,
+  Injectable,
+  Logger,
+  OnModuleDestroy,
+  OnModuleInit,
+} from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { SchedulerRegistry } from "@nestjs/schedule";
+import { ProviderPaymentStatus } from "@edr/types";
+import {
+  PAYMENT_PROVIDER_MAP,
+  PaymentProviderMap,
+} from "../providers/providers.module";
+import { PaymentIntent } from "../intents/entities/payment-intent.entity";
+import { IntentsRepository } from "../intents/intents.repository";
+import { IntentsService } from "../intents/intents.service";
+
+const SWEEP_INTERVAL_NAME = "reconciliation-sweep";
+
+/**
+ * Safety net (architecture.md §7.4): webhooks get lost, users abandon hosted pages. The sweep
+ * queries the provider for stale non-terminal intents and feeds the answer through the same
+ * state machine the webhooks use; intents whose provider session expired are CANCELLED.
+ */
+@Injectable()
+export class ReconciliationService implements OnModuleInit, OnModuleDestroy {
+  private readonly logger = new Logger(ReconciliationService.name);
+  private readonly intervalMs: number;
+  private readonly staleAfterMs: number;
+  private readonly batchSize: number;
+  private sweeping = false;
+
+  constructor(
+    config: ConfigService,
+    private readonly intentsRepository: IntentsRepository,
+    private readonly intentsService: IntentsService,
+    private readonly schedulerRegistry: SchedulerRegistry,
+    @Inject(PAYMENT_PROVIDER_MAP)
+    private readonly providers: PaymentProviderMap,
+  ) {
+    this.intervalMs =
+      config.get<number>("app.reconciliation.sweepIntervalMs") ?? 60_000;
+    this.staleAfterMs =
+      config.get<number>("app.reconciliation.staleAfterMs") ?? 60_000;
+    this.batchSize = config.get<number>("app.reconciliation.batchSize") ?? 20;
+  }
+
+  onModuleInit(): void {
+    const interval = setInterval(() => void this.sweep(), this.intervalMs);
+    this.schedulerRegistry.addInterval(SWEEP_INTERVAL_NAME, interval);
+  }
+
+  onModuleDestroy(): void {
+    if (this.schedulerRegistry.doesExist("interval", SWEEP_INTERVAL_NAME)) {
+      this.schedulerRegistry.deleteInterval(SWEEP_INTERVAL_NAME);
+    }
+  }
+
+  async sweep(): Promise<void> {
+    if (this.sweeping) return;
+    this.sweeping = true;
+    try {
+      const cutoff = new Date(Date.now() - this.staleAfterMs);
+      const stale = await this.intentsRepository.findStale(
+        cutoff,
+        this.batchSize,
+      );
+      for (const intent of stale) {
+        await this.reconcileIntent(intent);
+      }
+    } catch (err) {
+      this.logger.error(
+        `sweep failed: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    } finally {
+      this.sweeping = false;
+    }
+  }
+
+  private async reconcileIntent(intent: PaymentIntent): Promise<void> {
+    try {
+      const provider = this.providers.get(intent.provider);
+      if (provider) {
+        const status = await provider.queryStatus(intent.merchantOrderId);
+        const result = this.intentsService.fromProviderStatus(status);
+        if (result.status !== intent.status || result.providerTxnId) {
+          await this.intentsService.applyProviderResult(intent.id, result);
+        }
+        if (
+          result.status === ProviderPaymentStatus.SUCCEEDED ||
+          result.status === ProviderPaymentStatus.FAILED ||
+          result.status === ProviderPaymentStatus.CANCELLED
+        ) {
+          this.logger.log(`reconciled intent ${intent.id} → ${result.status}`);
+          return;
+        }
+      }
+
+      // Provider still says pending (or is unknown): expire only once the session is dead.
+      if (intent.expiresAt && intent.expiresAt.getTime() < Date.now()) {
+        await this.intentsService.expireIntent(intent.id);
+        this.logger.log(
+          `expired abandoned intent ${intent.id} (${intent.merchantOrderId})`,
+        );
+      }
+    } catch (err) {
+      // Per-intent failures must not stall the sweep; the row stays stale and is retried.
+      this.logger.warn(
+        `reconcile failed for intent ${intent.id}: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/entities/payment-webhook-event.entity.ts b/apps/edr-payment-api/src/modules/webhooks/entities/payment-webhook-event.entity.ts
new file mode 100644
index 000000000..2e104bf17
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/entities/payment-webhook-event.entity.ts
@@ -0,0 +1,57 @@
+import { Column, Entity, Index } from "typeorm";
+import { BaseEntity } from "@edr/api-common";
+import { ProviderMethod } from "@edr/types";
+
+/**
+ * Idempotency + audit record for every inbound provider webhook. The unique
+ * (provider, external_event_id) pair is the dedupe key: a duplicate insert hits the unique
+ * violation and the handler short-circuits with a 200 ack.
+ */
+@Entity({ name: "payment_webhook_event" })
+@Index("uq_payment_webhook_event_external", ["provider", "externalEventId"], {
+  unique: true,
+})
+export class PaymentWebhookEvent extends BaseEntity {
+  @Column({ name: "provider", type: "varchar", length: 16 })
+  provider!: ProviderMethod;
+
+  /** Provider event id when given (e.g. Waafi X-Webhook-Event-Id), else derived from the payload. */
+  @Column({ name: "external_event_id", type: "varchar", length: 191 })
+  externalEventId!: string;
+
+  @Column({
+    name: "merchant_order_id",
+    type: "varchar",
+    length: 64,
+    nullable: true,
+  })
+  merchantOrderId?: string | null;
+
+  @Column({
+    name: "provider_txn_id",
+    type: "varchar",
+    length: 128,
+    nullable: true,
+  })
+  providerTxnId?: string | null;
+
+  @Column({ name: "signature_valid", type: "boolean", default: false })
+  signatureValid!: boolean;
+
+  /** Raw provider status string as sent (pre-mapping). */
+  @Column({ name: "status", type: "varchar", length: 64, nullable: true })
+  status?: string | null;
+
+  /** Full webhook body — hostile input, stored verbatim for audit/replay analysis. */
+  @Column({ name: "payload", type: "jsonb" })
+  payload!: Record<string, unknown>;
+
+  @Column({ name: "received_at", type: "timestamptz", default: () => "now()" })
+  receivedAt!: Date;
+
+  @Column({ name: "processed_at", type: "timestamptz", nullable: true })
+  processedAt?: Date | null;
+
+  @Column({ name: "processing_error", type: "text", nullable: true })
+  processingError?: string | null;
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/handlers/card-webhook.service.ts b/apps/edr-payment-api/src/modules/webhooks/handlers/card-webhook.service.ts
new file mode 100644
index 000000000..8f9c9a9ab
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/handlers/card-webhook.service.ts
@@ -0,0 +1,35 @@
+import { Injectable } from "@nestjs/common";
+import { CardProvider, CardWebhookPayload } from "@edr/payment-providers";
+import { WebhookProcessorService } from "../webhook-processor.service";
+
+@Injectable()
+export class CardWebhookService {
+  constructor(
+    private readonly provider: CardProvider,
+    private readonly processor: WebhookProcessorService,
+  ) {}
+
+  async handle(payload: CardWebhookPayload, signature: string): Promise<void> {
+    const signatureValid = this.provider.verifyWebhookSignature(
+      payload as unknown as Record<string, unknown>,
+      signature,
+    );
+    const object = payload.data.object;
+    const mapped = this.provider.mapWebhookStatus(object.status);
+
+    await this.processor.process({
+      provider: this.provider.method,
+      externalEventId: `${payload.id}_${payload.type}`,
+      merchantOrderId: object.metadata.merchantOrderId,
+      providerTxnId: object.transaction_id,
+      signatureValid,
+      rawStatus: object.status,
+      payload: payload as unknown as Record<string, unknown>,
+      result: {
+        status: mapped,
+        providerTxnId: object.transaction_id,
+        failureCode: object.status,
+      },
+    });
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/handlers/cbe-birr-webhook.service.ts b/apps/edr-payment-api/src/modules/webhooks/handlers/cbe-birr-webhook.service.ts
new file mode 100644
index 000000000..6621aa3b2
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/handlers/cbe-birr-webhook.service.ts
@@ -0,0 +1,30 @@
+import { Injectable } from "@nestjs/common";
+import { CbeBirrProvider, CbeBirrWebhookPayload } from "@edr/payment-providers";
+import { WebhookProcessorService } from "../webhook-processor.service";
+
+@Injectable()
+export class CbeBirrWebhookService {
+  constructor(
+    private readonly provider: CbeBirrProvider,
+    private readonly processor: WebhookProcessorService,
+  ) {}
+
+  async handle(payload: CbeBirrWebhookPayload): Promise<void> {
+    const signatureValid = this.provider.verifyWebhookSignature(
+      payload as unknown as Record<string, unknown>,
+    );
+    const mapped = this.provider.mapWebhookStatus(payload.status);
+    const providerTxnId = payload.transactionId ?? payload.orderId;
+
+    await this.processor.process({
+      provider: this.provider.method,
+      externalEventId: `${payload.orderId}_${payload.status}`,
+      merchantOrderId: payload.merchantOrderId,
+      providerTxnId,
+      signatureValid,
+      rawStatus: payload.status,
+      payload: payload as unknown as Record<string, unknown>,
+      result: { status: mapped, providerTxnId, failureCode: payload.status },
+    });
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/handlers/dmoney-webhook.service.ts b/apps/edr-payment-api/src/modules/webhooks/handlers/dmoney-webhook.service.ts
new file mode 100644
index 000000000..51937dee4
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/handlers/dmoney-webhook.service.ts
@@ -0,0 +1,34 @@
+import { Injectable } from "@nestjs/common";
+import { DMoneyProvider, DMoneyWebhookPayload } from "@edr/payment-providers";
+import { WebhookProcessorService } from "../webhook-processor.service";
+
+@Injectable()
+export class DMoneyWebhookService {
+  constructor(
+    private readonly provider: DMoneyProvider,
+    private readonly processor: WebhookProcessorService,
+  ) {}
+
+  async handle(payload: DMoneyWebhookPayload): Promise<void> {
+    const signatureValid = this.provider.verifyWebhookSignature(
+      payload as unknown as Record<string, unknown>,
+    );
+    const mapped = this.provider.mapWebhookStatus(payload.status);
+
+    await this.processor.process({
+      provider: this.provider.method,
+      externalEventId: `${payload.orderId}_${payload.status}`,
+      merchantOrderId: payload.merchantOrderId,
+      providerTxnId: payload.transactionId,
+      signatureValid,
+      rawStatus: payload.status,
+      payload: payload as unknown as Record<string, unknown>,
+      result: {
+        status: mapped,
+        providerTxnId: payload.transactionId,
+        paidAt: payload.paidAt ? new Date(payload.paidAt) : undefined,
+        failureCode: payload.status,
+      },
+    });
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/handlers/ebirr-webhook.service.ts b/apps/edr-payment-api/src/modules/webhooks/handlers/ebirr-webhook.service.ts
new file mode 100644
index 000000000..3f8b923cd
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/handlers/ebirr-webhook.service.ts
@@ -0,0 +1,33 @@
+import { Injectable } from "@nestjs/common";
+import { EBirrProvider, EBirrWebhookPayload } from "@edr/payment-providers";
+import { WebhookProcessorService } from "../webhook-processor.service";
+
+@Injectable()
+export class EBirrWebhookService {
+  constructor(
+    private readonly provider: EBirrProvider,
+    private readonly processor: WebhookProcessorService,
+  ) {}
+
+  async handle(payload: EBirrWebhookPayload): Promise<void> {
+    const signatureValid = this.provider.verifyWebhookSignature(
+      payload as unknown as Record<string, unknown>,
+    );
+    const mapped = this.provider.mapWebhookStatus(payload.tradeStatus);
+
+    await this.processor.process({
+      provider: this.provider.method,
+      externalEventId: `${payload.orderNo}_${payload.tradeStatus}_${payload.timestamp}`,
+      merchantOrderId: payload.orderNo,
+      providerTxnId: payload.tradeNo,
+      signatureValid,
+      rawStatus: payload.tradeStatus,
+      payload: payload as unknown as Record<string, unknown>,
+      result: {
+        status: mapped,
+        providerTxnId: payload.tradeNo,
+        failureCode: payload.tradeStatus,
+      },
+    });
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/handlers/telebirr-webhook.service.ts b/apps/edr-payment-api/src/modules/webhooks/handlers/telebirr-webhook.service.ts
new file mode 100644
index 000000000..e207e1d21
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/handlers/telebirr-webhook.service.ts
@@ -0,0 +1,46 @@
+import { Injectable } from "@nestjs/common";
+import {
+  TelebirrProvider,
+  TelebirrWebhookPayload,
+} from "@edr/payment-providers";
+import { WebhookProcessorService } from "../webhook-processor.service";
+
+@Injectable()
+export class TelebirrWebhookService {
+  constructor(
+    private readonly provider: TelebirrProvider,
+    private readonly processor: WebhookProcessorService,
+  ) {}
+
+  async handle(payload: TelebirrWebhookPayload): Promise<void> {
+    // TODO: re-enable Telebirr public-key signature verification — skipped for now
+    // (carried over from the passenger handler; see telebirr.provider verifyWebhookSignature).
+    const signatureValid = true;
+
+    const mapped = this.provider.mapWebhookTradeStatus(payload.trade_status);
+    const providerTxnId = payload.trans_id ?? payload.payment_order_id;
+
+    await this.processor.process({
+      provider: this.provider.method,
+      externalEventId: `${payload.payment_order_id}_${payload.trade_status}`,
+      merchantOrderId: payload.merch_order_id,
+      providerTxnId,
+      signatureValid,
+      rawStatus: payload.trade_status,
+      payload: payload as unknown as Record<string, unknown>,
+      result: {
+        status: mapped,
+        providerTxnId,
+        paidAt: this.parseEpochSeconds(payload.trans_end_time),
+        failureCode: payload.trade_status,
+      },
+    });
+  }
+
+  private parseEpochSeconds(raw: string | undefined): Date | undefined {
+    if (!raw) return undefined;
+    const n = parseInt(raw, 10);
+    if (Number.isNaN(n)) return undefined;
+    return new Date(n * 1000);
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/handlers/waafi-webhook.service.ts b/apps/edr-payment-api/src/modules/webhooks/handlers/waafi-webhook.service.ts
new file mode 100644
index 000000000..232957f79
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/handlers/waafi-webhook.service.ts
@@ -0,0 +1,82 @@
+import { Injectable, Logger } from "@nestjs/common";
+import {
+  WaafiProvider,
+  WaafiWebhookHeaders,
+  WaafiWebhookPayload,
+} from "@edr/payment-providers";
+import { WebhookProcessorService } from "../webhook-processor.service";
+
+/** Reject webhooks whose timestamp is older than this (replay protection). */
+const WAAFI_REPLAY_WINDOW_SECONDS = 300;
+
+@Injectable()
+export class WaafiWebhookService {
+  private readonly logger = new Logger(WaafiWebhookService.name);
+
+  constructor(
+    private readonly provider: WaafiProvider,
+    private readonly processor: WebhookProcessorService,
+  ) {}
+
+  async handle(
+    payload: WaafiWebhookPayload,
+    rawBody: string,
+    headers: WaafiWebhookHeaders,
+  ): Promise<void> {
+    // Unsigned validation ping sent on registration — acknowledge without verifying or persisting.
+    if (payload.event === "webhook.test") {
+      this.logger.log("Waafi webhook.test ping received");
+      return;
+    }
+
+    const { payment } = payload;
+    const eventId = headers["x-webhook-event-id"];
+    const timestamp = headers["x-webhook-timestamp"];
+    const signature = headers["x-webhook-signature"];
+
+    const signatureValid =
+      this.isFresh(timestamp) &&
+      this.provider.verifyWebhookSignature(
+        rawBody,
+        signature,
+        timestamp,
+        eventId,
+      );
+
+    const mapped = this.provider.mapWebhookStatus(payment.status);
+
+    await this.processor.process({
+      provider: this.provider.method,
+      // X-Webhook-Event-Id is unique per event; fall back to a derived id if absent.
+      externalEventId: eventId ?? `${payment.transaction_id}_${payment.status}`,
+      merchantOrderId: payment.reference_id,
+      providerTxnId: payment.transaction_id,
+      signatureValid,
+      rawStatus: payment.status,
+      payload: payload as unknown as Record<string, unknown>,
+      result: {
+        status: mapped,
+        providerTxnId: payment.transaction_id,
+        paidAt: this.parseDate(payment.date),
+        failureCode: payment.status,
+        failureMessage: payment.description,
+      },
+    });
+  }
+
+  /** True when the webhook timestamp (unix seconds) is within the replay window. */
+  private isFresh(timestamp: string | undefined): boolean {
+    if (!timestamp) return false;
+    const ts = parseInt(timestamp, 10);
+    if (Number.isNaN(ts)) return false;
+    const now = Math.floor(Date.now() / 1000);
+    return Math.abs(now - ts) <= WAAFI_REPLAY_WINDOW_SECONDS;
+  }
+
+  /** Parse Waafi's "YYYY-MM-DD HH:mm:ss" payment date; undefined when unparseable. */
+  private parseDate(raw: string | undefined): Date | undefined {
+    if (!raw) return undefined;
+    const d = new Date(raw);
+    return Number.isNaN(d.getTime()) ? undefined : d;
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/webhook-events.repository.ts b/apps/edr-payment-api/src/modules/webhooks/webhook-events.repository.ts
new file mode 100644
index 000000000..7d4aeff95
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/webhook-events.repository.ts
@@ -0,0 +1,44 @@
+import { Injectable } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { QueryFailedError, Repository } from "typeorm";
+import { BaseRepository } from "@edr/api-common";
+import { PaymentWebhookEvent } from "./entities/payment-webhook-event.entity";
+
+const PG_UNIQUE_VIOLATION = "23505";
+
+@Injectable()
+export class WebhookEventsRepository extends BaseRepository<PaymentWebhookEvent> {
+  constructor(
+    @InjectRepository(PaymentWebhookEvent)
+    repository: Repository<PaymentWebhookEvent>,
+  ) {
+    super(repository);
+  }
+
+  /**
+   * Insert the event, relying on the unique (provider, external_event_id) index for dedupe.
+   * Returns null when the event was already recorded (duplicate delivery / provider replay).
+   */
+  async createDeduped(
+    data: Partial<PaymentWebhookEvent>,
+  ): Promise<PaymentWebhookEvent | null> {
+    try {
+      return await this.create(data);
+    } catch (err) {
+      if (
+        err instanceof QueryFailedError &&
+        (err.driverError as { code?: string })?.code === PG_UNIQUE_VIOLATION
+      ) {
+        return null;
+      }
+      throw err;
+    }
+  }
+
+  async markProcessed(id: string, processingError?: string): Promise<void> {
+    await this.update(id, {
+      processedAt: new Date(),
+      processingError: processingError ?? null,
+    });
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/webhook-processor.service.ts b/apps/edr-payment-api/src/modules/webhooks/webhook-processor.service.ts
new file mode 100644
index 000000000..b8b54579a
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/webhook-processor.service.ts
@@ -0,0 +1,94 @@
+import { Injectable, Logger } from "@nestjs/common";
+import { ProviderMethod } from "@edr/types";
+import { IntentsRepository } from "../intents/intents.repository";
+import {
+  IntentsService,
+  ProviderResultInput,
+} from "../intents/intents.service";
+import { WebhookEventsRepository } from "./webhook-events.repository";
+
+/** A provider webhook reduced to the fields the shared pipeline needs. */
+export interface NormalizedWebhook {
+  provider: ProviderMethod;
+  /** Provider event id (or a deterministic derivation) — the dedupe key. */
+  externalEventId: string;
+  merchantOrderId: string;
+  providerTxnId?: string;
+  signatureValid: boolean;
+  /** Raw provider status string, stored for audit. */
+  rawStatus: string;
+  payload: Record<string, unknown>;
+  /** Mapped outcome to feed the intent state machine. */
+  result: ProviderResultInput;
+}
+
+/**
+ * The shared webhook pipeline every provider handler funnels into:
+ * persist+dedupe → signature gate → intent lookup → prefix/service cross-check →
+ * state machine → mark processed. Always returns (never throws) so controllers can
+ * ack 200 fast — providers like Waafi time out at 5s and do not retry.
+ */
+@Injectable()
+export class WebhookProcessorService {
+  private readonly logger = new Logger(WebhookProcessorService.name);
+
+  constructor(
+    private readonly webhookEvents: WebhookEventsRepository,
+    private readonly intentsRepository: IntentsRepository,
+    private readonly intentsService: IntentsService,
+  ) {}
+
+  async process(webhook: NormalizedWebhook): Promise<void> {
+    const { provider, merchantOrderId } = webhook;
+
+    const eventRow = await this.webhookEvents.createDeduped({
+      provider,
+      externalEventId: webhook.externalEventId,
+      merchantOrderId,
+      providerTxnId: webhook.providerTxnId ?? null,
+      signatureValid: webhook.signatureValid,
+      status: webhook.rawStatus,
+      payload: webhook.payload,
+    });
+    if (!eventRow) {
+      this.logger.log(
+        `${provider} webhook duplicate: ${webhook.externalEventId} — short-circuit OK`,
+      );
+      return;
+    }
+
+    if (!webhook.signatureValid) {
+      this.logger.warn(
+        `${provider} webhook signature invalid/stale for ref=${merchantOrderId}`,
+      );
+      await this.webhookEvents.markProcessed(eventRow.id, "signature-invalid");
+      return;
+    }
+
+    const intent =
+      await this.intentsRepository.findByMerchantOrderId(merchantOrderId);
+    if (!intent) {
+      // Tolerated: webhook may have raced the intent commit, or the reference is foreign.
+      // The provider gets a 200; retry/poll/reconciliation converges later.
+      this.logger.warn(
+        `${provider} webhook: no PaymentIntent for ref=${merchantOrderId}`,
+      );
+      await this.webhookEvents.markProcessed(eventRow.id, "intent-not-found");
+      return;
+    }
+
+    try {
+      await this.intentsService.applyProviderResult(intent.id, webhook.result);
+      await this.webhookEvents.markProcessed(eventRow.id);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.logger.error(
+        `${provider} webhook processing failed for ${merchantOrderId}: ${message}`,
+      );
+      await this.webhookEvents.markProcessed(
+        eventRow.id,
+        `processing-error: ${message}`,
+      );
+    }
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/webhooks.controller.ts b/apps/edr-payment-api/src/modules/webhooks/webhooks.controller.ts
new file mode 100644
index 000000000..8f1d1bd9e
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/webhooks.controller.ts
@@ -0,0 +1,145 @@
+import {
+  All,
+  Body,
+  Controller,
+  Headers,
+  HttpCode,
+  HttpStatus,
+  Logger,
+  Post,
+  Req,
+} from "@nestjs/common";
+import { ApiOperation, ApiTags } from "@nestjs/swagger";
+import {
+  CardWebhookPayload,
+  CbeBirrWebhookPayload,
+  DMoneyWebhookPayload,
+  EBirrWebhookPayload,
+  TelebirrWebhookPayload,
+  WaafiWebhookHeaders,
+  WaafiWebhookPayload,
+} from "@edr/payment-providers";
+import { TelebirrWebhookService } from "./handlers/telebirr-webhook.service";
+import { CbeBirrWebhookService } from "./handlers/cbe-birr-webhook.service";
+import { EBirrWebhookService } from "./handlers/ebirr-webhook.service";
+import { CardWebhookService } from "./handlers/card-webhook.service";
+import { WaafiWebhookService } from "./handlers/waafi-webhook.service";
+import { DMoneyWebhookService } from "./handlers/dmoney-webhook.service";
+
+/**
+ * The ONLY public surface of the payment service — the single registered webhook URL per
+ * provider for the whole platform. No service auth here (provider-facing); trust comes from
+ * signature verification inside each handler. Every route acks 2xx fast and never rethrows:
+ * Waafi times out at 5s and does NOT retry.
+ */
+@ApiTags("Provider Webhooks")
+@Controller("webhooks")
+export class WebhooksController {
+  private readonly logger = new Logger(WebhooksController.name);
+
+  constructor(
+    private readonly telebirr: TelebirrWebhookService,
+    private readonly cbeBirr: CbeBirrWebhookService,
+    private readonly eBirr: EBirrWebhookService,
+    private readonly card: CardWebhookService,
+    private readonly waafi: WaafiWebhookService,
+    private readonly dMoney: DMoneyWebhookService,
+  ) {}
+
+  @All("telebirr")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: "Telebirr payment notification callback (Ethiopia)",
+  })
+  async receiveTelebirr(@Body() payload: TelebirrWebhookPayload) {
+    this.logger.log("Telebirr webhook called");
+    try {
+      await this.telebirr.handle(payload);
+    } catch (err) {
+      this.logger.error(`Telebirr webhook handler threw: ${this.message(err)}`);
+    }
+    return { code: "0", message: "OK" };
+  }
+
+  @Post("cbe-birr")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: "CBE Birr payment notification callback (Ethiopia)",
+  })
+  async receiveCbeBirr(@Body() payload: CbeBirrWebhookPayload) {
+    try {
+      await this.cbeBirr.handle(payload);
+    } catch (err) {
+      this.logger.error(`CBE Birr webhook handler threw: ${this.message(err)}`);
+    }
+    return { success: true };
+  }
+
+  @Post("ebirr")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: "eBirr payment notification callback (Ethiopia)" })
+  async receiveEBirr(@Body() payload: EBirrWebhookPayload) {
+    try {
+      await this.eBirr.handle(payload);
+    } catch (err) {
+      this.logger.error(`eBirr webhook handler threw: ${this.message(err)}`);
+    }
+    return { code: "0000", message: "success" };
+  }
+
+  @Post("card")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: "Card payment notification callback (International)",
+  })
+  async receiveCard(
+    @Body() payload: CardWebhookPayload,
+    @Headers("stripe-signature") signature: string,
+  ) {
+    try {
+      await this.card.handle(payload, signature);
+    } catch (err) {
+      this.logger.error(`Card webhook handler threw: ${this.message(err)}`);
+    }
+    return { received: true };
+  }
+
+  @Post("waafi")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: "Waafi payment notification callback (Djibouti)" })
+  async receiveWaafi(
+    @Body() payload: WaafiWebhookPayload,
+    @Headers() headers: WaafiWebhookHeaders,
+    @Req() req: { rawBody?: Buffer },
+  ) {
+
+    this.logger.log("\n\n\n\nWaafi payment notification callback (Djibouti)\n\n\n\n");
+    this.logger.log(
+      `Waafi webhook hit: event=${payload?.event ?? "unknown"} eventId=${headers["x-webhook-event-id"] ?? "n/a"}`,
+    );
+    try {
+      // HMAC verification must sign over the exact raw bytes Waafi sent, not re-serialized JSON.
+      const rawBody = req.rawBody?.toString("utf8") ?? "";
+      await this.waafi.handle(payload, rawBody, headers);
+    } catch (err) {
+      this.logger.error(`Waafi webhook handler threw: ${this.message(err)}`);
+    }
+    return { responseCode: "2001", responseMsg: "Success" };
+  }
+
+  @Post("dmoney")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: "D-Money payment notification callback (Djibouti)" })
+  async receiveDMoney(@Body() payload: DMoneyWebhookPayload) {
+    try {
+      await this.dMoney.handle(payload);
+    } catch (err) {
+      this.logger.error(`D-Money webhook handler threw: ${this.message(err)}`);
+    }
+    return { success: true };
+  }
+
+  private message(err: unknown): string {
+    return err instanceof Error ? err.message : String(err);
+  }
+}
diff --git a/apps/edr-payment-api/src/modules/webhooks/webhooks.module.ts b/apps/edr-payment-api/src/modules/webhooks/webhooks.module.ts
new file mode 100644
index 000000000..86b94032b
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/webhooks/webhooks.module.ts
@@ -0,0 +1,34 @@
+import { Module } from "@nestjs/common";
+import { TypeOrmModule } from "@nestjs/typeorm";
+import { IntentsModule } from "../intents/intents.module";
+import { ProvidersModule } from "../providers/providers.module";
+import { PaymentWebhookEvent } from "./entities/payment-webhook-event.entity";
+import { WebhookEventsRepository } from "./webhook-events.repository";
+import { WebhookProcessorService } from "./webhook-processor.service";
+import { WebhooksController } from "./webhooks.controller";
+import { TelebirrWebhookService } from "./handlers/telebirr-webhook.service";
+import { CbeBirrWebhookService } from "./handlers/cbe-birr-webhook.service";
+import { EBirrWebhookService } from "./handlers/ebirr-webhook.service";
+import { CardWebhookService } from "./handlers/card-webhook.service";
+import { WaafiWebhookService } from "./handlers/waafi-webhook.service";
+import { DMoneyWebhookService } from "./handlers/dmoney-webhook.service";
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([PaymentWebhookEvent]),
+    IntentsModule,
+    ProvidersModule,
+  ],
+  controllers: [WebhooksController],
+  providers: [
+    WebhookEventsRepository,
+    WebhookProcessorService,
+    TelebirrWebhookService,
+    CbeBirrWebhookService,
+    EBirrWebhookService,
+    CardWebhookService,
+    WaafiWebhookService,
+    DMoneyWebhookService,
+  ],
+})
+export class WebhooksModule {}
diff --git a/apps/edr-payment-api/src/scripts/migrate-revert.ts b/apps/edr-payment-api/src/scripts/migrate-revert.ts
new file mode 100644
index 000000000..88b1500e5
--- /dev/null
+++ b/apps/edr-payment-api/src/scripts/migrate-revert.ts
@@ -0,0 +1,18 @@
+import "dotenv/config";
+import { AppDataSource } from "../data-source";
+
+/** `pnpm --filter @edr/payment-api migration:revert` — undo the most recent migration. */
+async function main(): Promise<void> {
+  await AppDataSource.initialize();
+  try {
+    await AppDataSource.undoLastMigration();
+    console.log("reverted last migration");
+  } finally {
+    await AppDataSource.destroy();
+  }
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});
diff --git a/apps/edr-payment-api/src/scripts/migrate.ts b/apps/edr-payment-api/src/scripts/migrate.ts
new file mode 100644
index 000000000..05f59f1b9
--- /dev/null
+++ b/apps/edr-payment-api/src/scripts/migrate.ts
@@ -0,0 +1,23 @@
+import "dotenv/config";
+import { AppDataSource } from "../data-source";
+import { ensurePaymentSchema } from "../config/ensure-schema";
+
+/** `pnpm --filter @edr/payment-api migration:run` — ensure schema, then run pending migrations. */
+async function main(): Promise<void> {
+  await ensurePaymentSchema();
+  await AppDataSource.initialize();
+  try {
+    const applied = await AppDataSource.runMigrations();
+    for (const migration of applied) {
+      console.log(`applied: ${migration.name}`);
+    }
+    if (applied.length === 0) console.log("no pending migrations");
+  } finally {
+    await AppDataSource.destroy();
+  }
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});
diff --git a/apps/edr-payment-api/tsconfig.build.json b/apps/edr-payment-api/tsconfig.build.json
new file mode 100644
index 000000000..64f86c6bd
--- /dev/null
+++ b/apps/edr-payment-api/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
+}
diff --git a/apps/edr-payment-api/tsconfig.json b/apps/edr-payment-api/tsconfig.json
new file mode 100644
index 000000000..467c474ee
--- /dev/null
+++ b/apps/edr-payment-api/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "@edr/tsconfig/nestjs.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "noEmit": false,
+    "incremental": true,
+    "tsBuildInfoFile": "./.tsbuildinfo",
+    "module": "node16",
+    "moduleResolution": "node16"
+  },
+  "include": ["src"]
+}
diff --git a/checkpoint.md b/checkpoint.md
index 31eb86b2b..f5cee29ea 100644
--- a/checkpoint.md
+++ b/checkpoint.md
@@ -35,6 +35,37 @@
 12. Added deployment runbook:
     - `DEPLOYMENT.md`
 
+## Passenger Web Migration to Next.js
+
+13. Passenger web apps migrated from Vite/SPA to Next.js:
+    - Updated `apps/edr-passenger-web/portal/next.config.js` and `apps/edr-passenger-web/backoffice/next.config.js`:
+      - Removed `output: 'export'` to enable server mode
+      - Preserved `transpilePackages` for @edr/* shared packages
+14. Created dedicated Next.js Dockerfile:
+    - `infrastructure/docker/Dockerfile.passenger-web`
+    - Uses Node.js server (not nginx) for better Next.js support
+    - Builds with turbo, runs `npx next start` in the final stage
+    - Accepts build args: `APP_PACKAGE`, `APP_PATH`, `NEXT_PUBLIC_API_URL`
+15. Updated docker-compose.yaml:
+    - `passenger-portal` and `passenger-backoffice` now use `infrastructure/docker/Dockerfile.passenger-web`
+    - Port mappings are fully dynamic: both host and container ports use `${PASSENGER_PORTAL_PORT}` / `${PASSENGER_BACKOFFICE_PORT}`, driven by `PORT` in the service env file
+    - `NEXT_PUBLIC_API_URL` build arg sourced directly from the service env file (no separate build env file needed)
+16. Updated DEPLOYMENT.md to reflect all of the above.
+
+## Port Mapping Fix (Latest)
+
+17. Fixed passenger web port mapping mismatch (`0.0.0.0:8003->5184/tcp`):
+    - Container port was hardcoded (`5174`/`5184`); host port came from `PORT` in the env file via the sync script
+    - Both sides of the mapping now use `${PASSENGER_PORTAL_PORT:-5174}` / `${PASSENGER_BACKOFFICE_PORT:-5184}`
+    - Removed hardcoded `PORT` build arg from docker-compose.yaml (runtime `env_file` supplies it to Next.js)
+
+## NEXT_PUBLIC_API_URL Build-Time Fix (Latest)
+
+18. Fixed passenger web apps using `localhost:4000` instead of the configured API URL:
+    - Root cause: `NEXT_PUBLIC_*` vars are baked into the JS bundle at build time; setting them in the runtime `env_file` has no effect
+    - `sync-env-from-server.sh` now extracts any `NEXT_PUBLIC_*` vars from the service `.env` and writes them to `GITHUB_ENV` before the build step
+    - `docker-compose.yaml` build arg renamed from `PASSENGER_NEXT_PUBLIC_API_URL` to `NEXT_PUBLIC_API_URL` to match the key used in the service env files directly
+
 ## Key Files to Review
 
 - `.github/workflows/deploy.yml`
@@ -43,7 +74,10 @@
 - `scripts/deploy/create-npmrc.sh`
 - `apps/edr-passenger-api/docker-entrypoint.sh`
 - `apps/edr-passenger-api/prisma/seed.ts`
-- `DEPLOYMENT.md`
+- `infrastructure/docker/Dockerfile.passenger-web` (NEW)
+- `apps/edr-passenger-web/portal/next.config.js` (MODIFIED)
+- `apps/edr-passenger-web/backoffice/next.config.js` (MODIFIED)
+- `DEPLOYMENT.md` (MODIFIED)
 
 ## Next Actions
 
@@ -60,4 +94,9 @@
 2. Prisma warns about `package.json#prisma` deprecation (Prisma 7 migration pending).
 3. Matrix parallelism increases runner load; ensure self-hosted runner capacity is sufficient.
 4. Port collisions are prevented by env-driven mapping, but bad env values can still cause runtime conflicts.
+5. Passenger web uses Next.js server mode (not static export):
+   - Requires Node.js at runtime (previously could use pure static hosting)
+   - `NEXT_PUBLIC_API_URL` must be set in the service env file (`passenger-portal.env` / `passenger-backoffice.env`) — the sync script forwards it to the build automatically
+   - Each portal/backoffice instance runs its own Node.js process (watch container memory usage)
+6. Freight web still uses Vite+nginx (different from passenger web) — maintain both Dockerfiles separately
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index cef40c81e..a8271a01e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,6 +6,24 @@
 # Run:    docker compose up -d
 
 services:
+  # Message broker for payment event delivery (payment-api -> passenger/freight).
+  # Management UI: http://localhost:15672 (login edr / edr_secret). vhost: payment.
+  # In deployed envs this is a shared/managed RabbitMQ; only PAYMENT_RABBITMQ_URL changes.
+  rabbitmq:
+    image: rabbitmq:3.13-management
+    ports:
+      - "5672:5672" # AMQP — apps connect here
+      - "15672:15672" # management UI
+    environment:
+      RABBITMQ_DEFAULT_USER: edr
+      RABBITMQ_DEFAULT_PASS: edr_secret
+      RABBITMQ_DEFAULT_VHOST: payment
+    healthcheck:
+      test: ["CMD", "rabbitmq-diagnostics", "-q", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
   freight-api:
     build:
       context: .
@@ -25,6 +43,11 @@ services:
       - "${PASSENGER_API_PORT:-4000}:${PASSENGER_API_PORT:-4000}"
     env_file:
       - apps/edr-passenger-api/.env
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+    extra_hosts:
+      - "paymentcallback.triaplc.com:10.18.7.179"
 
   freight-portal:
     build:
@@ -56,28 +79,49 @@ services:
   passenger-portal:
     build:
       context: .
-      dockerfile: infrastructure/docker/Dockerfile.web
+      dockerfile: infrastructure/docker/Dockerfile.passenger-web
       args:
-        TURBO_FILTER: "@edr/passenger-portal"
+        APP_PACKAGE: "@edr/passenger-portal"
         APP_PATH: apps/edr-passenger-web/portal
-        NEXT_PUBLIC_API_URL: ${PASSENGER_API_URL:-http://localhost:4000}
+        NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://localhost:4000}
       secrets:
         - npmrc
     ports:
-      - "${PASSENGER_PORTAL_PORT:-5174}:80"
+      - "${PASSENGER_PORTAL_PORT:-5174}:${PASSENGER_PORTAL_PORT:-5174}"
+    env_file:
+      - apps/edr-passenger-web/portal/.env
 
   passenger-backoffice:
     build:
       context: .
-      dockerfile: infrastructure/docker/Dockerfile.web
+      dockerfile: infrastructure/docker/Dockerfile.passenger-web
       args:
-        TURBO_FILTER: "@edr/passenger-backoffice"
+        APP_PACKAGE: "@edr/passenger-backoffice"
         APP_PATH: apps/edr-passenger-web/backoffice
-        NEXT_PUBLIC_API_URL: ${PASSENGER_API_URL:-http://localhost:4000}
+        NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://localhost:4000}
       secrets:
         - npmrc
     ports:
-      - "${PASSENGER_BACKOFFICE_PORT:-5184}:80"
+      - "${PASSENGER_BACKOFFICE_PORT:-5184}:${PASSENGER_BACKOFFICE_PORT:-5184}"
+    env_file:
+      - apps/edr-passenger-web/backoffice/.env
+
+  payment-api:
+    build:
+      context: .
+      dockerfile: apps/edr-payment-api/Dockerfile
+      args:
+        APP_PACKAGE: "@edr/payment-api"
+        APP_PATH: apps/edr-payment-api
+      secrets:
+        - npmrc
+    ports:
+      - "${PAYMENT_API_PORT:-3008}:${PAYMENT_API_PORT:-3008}"
+    env_file:
+      - apps/edr-payment-api/.env
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
 
 secrets:
   npmrc:
diff --git a/infrastructure/docker/Dockerfile.passenger-web b/infrastructure/docker/Dockerfile.passenger-web
new file mode 100644
index 000000000..735a19e8e
--- /dev/null
+++ b/infrastructure/docker/Dockerfile.passenger-web
@@ -0,0 +1,61 @@
+# syntax=docker/dockerfile:1
+#
+# Next.js Dockerfile for passenger web (portal + backoffice).
+# Builds with turbo, runs with Node.js (not nginx).
+#
+# Build example (portal):
+#   DOCKER_BUILDKIT=1 docker build \
+#     --build-arg APP_PACKAGE=@edr/passenger-portal \
+#     --build-arg APP_PATH=apps/edr-passenger-web/portal \
+#     --build-arg PORT=5174 \
+#     -f infrastructure/docker/Dockerfile.passenger-web .
+#
+
+ARG APP_PACKAGE=@edr/passenger-portal
+ARG APP_PATH=apps/edr-passenger-web/portal
+ARG PORT=5174
+ARG NEXT_PUBLIC_API_URL
+
+FROM node:24.15.0-alpine AS base
+RUN apk add --no-cache libc6-compat
+RUN corepack enable
+WORKDIR /app
+
+FROM base AS pruner
+ARG APP_PACKAGE
+COPY . .
+RUN pnpm dlx turbo prune "${APP_PACKAGE}" --docker
+
+FROM base AS installer
+COPY --from=pruner /app/out/json/ .
+COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
+RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
+    --mount=type=cache,id=pnpm,target=/pnpm/store \
+    pnpm install --frozen-lockfile
+
+FROM base AS builder
+ARG APP_PACKAGE
+ARG APP_PATH
+ARG NEXT_PUBLIC_API_URL
+ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
+COPY --from=installer /app/ .
+COPY --from=pruner /app/out/full/ .
+RUN pnpm turbo build --filter="${APP_PACKAGE}..."
+
+FROM base AS deployer
+ARG APP_PACKAGE
+COPY --from=builder /app/ .
+RUN pnpm deploy --filter="${APP_PACKAGE}" --prod --legacy /deploy
+
+FROM node:24.15.0-alpine AS runner
+ARG APP_PATH
+ARG PORT=5174
+ENV PORT=${PORT}
+ENV NODE_ENV=production
+WORKDIR /app
+COPY --from=deployer /deploy .
+COPY --from=builder /app/${APP_PATH}/.next .next
+COPY --from=builder /app/${APP_PATH}/public public
+USER node
+EXPOSE ${PORT}
+CMD ["npx", "next", "start"]
diff --git a/package.json b/package.json
index 399ded0bf..575de8c41 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "dev": "turbo run dev",
     "dev:freight": "turbo run dev --filter=@edr/freight-api... --filter=@edr/freight-portal... --filter=@edr/freight-backoffice... --filter=@edr/ui-common...",
     "dev:passenger": "turbo run dev --filter=@edr/passenger-api... --filter=@edr/passenger-portal... --filter=@edr/passenger-backoffice...",
+    "dev:payment": "turbo run dev --filter=@edr/payment-api...",
     "build": "turbo run build",
     "build:freight": "turbo run build --filter=@edr/freight-api... --filter=@edr/freight-portal... --filter=@edr/freight-backoffice...",
     "build:passenger": "turbo run build --filter=@edr/passenger-api... --filter=@edr/passenger-portal... --filter=@edr/passenger-backoffice...",
diff --git a/packages/payment-providers/src/index.ts b/packages/payment-providers/src/index.ts
index ef308a44a..7b77b5684 100644
--- a/packages/payment-providers/src/index.ts
+++ b/packages/payment-providers/src/index.ts
@@ -40,12 +40,28 @@ export type {
   TelebirrTradeStatus,
 } from './providers/telebirr/telebirr.types';
 
+// Waafi HPP request/response types (exported for apps that build/inspect requests directly)
+export type {
+  WaafiState,
+  WaafiHppPurchaseRequest,
+  WaafiHppPurchaseResponse,
+  WaafiGetTranInfoRequest,
+  WaafiGetTranInfoResponse,
+} from './providers/waafi/waafi.types';
+
 // Webhook payload types
 export type { TelebirrWebhookPayload } from './webhooks/telebirr-webhook.types';
 export type { CbeBirrWebhookPayload } from './webhooks/cbe-birr-webhook.types';
 export type { EBirrWebhookPayload } from './webhooks/ebirr-webhook.types';
 export type { CardWebhookPayload } from './webhooks/card-webhook.types';
-export type { WaafiWebhookPayload } from './webhooks/waafi-webhook.types';
+export type {
+  WaafiWebhookPayload,
+  WaafiWebhookTransactionPayload,
+  WaafiWebhookTestPayload,
+  WaafiWebhookHeaders,
+  WaafiWebhookEvent,
+  WaafiWebhookStatus,
+} from './webhooks/waafi-webhook.types';
 export type { DMoneyWebhookPayload } from './webhooks/dmoney-webhook.types';
 
 // DI token for injecting all providers as an array (future multi-provider wiring)
diff --git a/packages/payment-providers/src/providers/card/card.provider.ts b/packages/payment-providers/src/providers/card/card.provider.ts
index c296f39a3..eaa9aed46 100644
--- a/packages/payment-providers/src/providers/card/card.provider.ts
+++ b/packages/payment-providers/src/providers/card/card.provider.ts
@@ -1,6 +1,6 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { HttpService } from '@nestjs/axios';
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { HttpService } from "@nestjs/axios";
 import {
   PaymentProvider,
   ProviderInitiationInput,
@@ -8,10 +8,10 @@ import {
   ProviderStatus,
   ProviderPaymentStatus,
   ProviderMethod,
-} from '@edr/types';
-import { AxiosError, AxiosRequestConfig } from 'axios';
-import { firstValueFrom } from 'rxjs';
-import * as crypto from 'node:crypto';
+} from "@edr/types";
+import { AxiosError, AxiosRequestConfig } from "axios";
+import { firstValueFrom } from "rxjs";
+import * as crypto from "node:crypto";
 
 interface CardInitiateRequest {
   amount: number;
@@ -54,7 +54,9 @@ export class CardProvider implements PaymentProvider {
     private readonly http: HttpService,
   ) {}
 
-  async initiate(input: ProviderInitiationInput): Promise<ProviderInitiationResult> {
+  async initiate(
+    input: ProviderInitiationInput,
+  ): Promise<ProviderInitiationResult> {
     const amount = input.amountMinor / 100;
 
     const requestBody: CardInitiateRequest = {
@@ -65,7 +67,8 @@ export class CardProvider implements PaymentProvider {
         merchantOrderId: input.merchantOrderId,
         orderRef: input.orderRef,
       },
-      return_url: this.returnUrl,
+      // Per-transaction browser return target (each calling app has its own UI); config is fallback.
+      return_url: input.returnUrl ?? this.returnUrl,
       webhook_url: this.webhookUrl,
     };
 
@@ -75,14 +78,16 @@ export class CardProvider implements PaymentProvider {
     );
 
     if (!response.id) {
-      throw new Error(`Card gateway initiate failed: ${JSON.stringify(response)}`);
+      throw new Error(
+        `Card gateway initiate failed: ${JSON.stringify(response)}`,
+      );
     }
 
     const expiresAt = new Date(response.expires_at * 1000);
 
     return {
       providerOrderId: response.id,
-      clientAction: { type: 'REDIRECT', url: response.checkout_url },
+      clientAction: { type: "REDIRECT", url: response.checkout_url },
       expiresAt,
       rawInitiation: {
         request: requestBody,
@@ -109,12 +114,15 @@ export class CardProvider implements PaymentProvider {
     };
   }
 
-  verifyWebhookSignature(payload: Record<string, unknown>, signature: string): boolean {
+  verifyWebhookSignature(
+    payload: Record<string, unknown>,
+    signature: string,
+  ): boolean {
     const payloadString = JSON.stringify(payload);
     const expectedSignature = crypto
-      .createHmac('sha256', this.webhookSecret)
+      .createHmac("sha256", this.webhookSecret)
       .update(payloadString)
-      .digest('hex');
+      .digest("hex");
 
     try {
       return crypto.timingSafeEqual(
@@ -132,18 +140,18 @@ export class CardProvider implements PaymentProvider {
 
   private mapStatus(status: string): ProviderPaymentStatus {
     switch (status?.toLowerCase()) {
-      case 'succeeded':
-      case 'paid':
+      case "succeeded":
+      case "paid":
         return ProviderPaymentStatus.SUCCEEDED;
-      case 'failed':
-      case 'canceled':
-      case 'expired':
+      case "failed":
+      case "canceled":
+      case "expired":
         return ProviderPaymentStatus.FAILED;
-      case 'requires_payment_method':
-      case 'requires_confirmation':
-      case 'requires_action':
+      case "requires_payment_method":
+      case "requires_confirmation":
+      case "requires_action":
         return ProviderPaymentStatus.REQUIRES_ACTION;
-      case 'processing':
+      case "processing":
         return ProviderPaymentStatus.PROCESSING;
       default:
         return ProviderPaymentStatus.PROCESSING;
@@ -153,8 +161,8 @@ export class CardProvider implements PaymentProvider {
   private async postJson<T>(url: string, body: unknown): Promise<T> {
     const config: AxiosRequestConfig = {
       headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${this.apiKey}`,
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${this.apiKey}`,
       },
       timeout: 10_000,
     };
@@ -162,7 +170,9 @@ export class CardProvider implements PaymentProvider {
     const started = Date.now();
     try {
       const res = await firstValueFrom(this.http.post<T>(url, body, config));
-      this.logger.debug(`Card Gateway POST ${url} status=${res.status} latency=${Date.now() - started}ms`);
+      this.logger.debug(
+        `Card Gateway POST ${url} status=${res.status} latency=${Date.now() - started}ms`,
+      );
       return res.data;
     } catch (err) {
       if (err instanceof AxiosError) {
@@ -170,7 +180,9 @@ export class CardProvider implements PaymentProvider {
           `Card Gateway POST ${url} failed: status=${err.response?.status} body=${JSON.stringify(err.response?.data)}`,
         );
       } else {
-        this.logger.error(`Card Gateway POST ${url} threw: ${err instanceof Error ? err.message : err}`);
+        this.logger.error(
+          `Card Gateway POST ${url} threw: ${err instanceof Error ? err.message : err}`,
+        );
       }
       throw err;
     }
@@ -179,7 +191,7 @@ export class CardProvider implements PaymentProvider {
   private async getJson<T>(url: string): Promise<T> {
     const config: AxiosRequestConfig = {
       headers: {
-        'Authorization': `Bearer ${this.apiKey}`,
+        Authorization: `Bearer ${this.apiKey}`,
       },
       timeout: 10_000,
     };
@@ -187,7 +199,9 @@ export class CardProvider implements PaymentProvider {
     const started = Date.now();
     try {
       const res = await firstValueFrom(this.http.get<T>(url, config));
-      this.logger.debug(`Card Gateway GET ${url} status=${res.status} latency=${Date.now() - started}ms`);
+      this.logger.debug(
+        `Card Gateway GET ${url} status=${res.status} latency=${Date.now() - started}ms`,
+      );
       return res.data;
     } catch (err) {
       if (err instanceof AxiosError) {
@@ -195,25 +209,27 @@ export class CardProvider implements PaymentProvider {
           `Card Gateway GET ${url} failed: status=${err.response?.status} body=${JSON.stringify(err.response?.data)}`,
         );
       } else {
-        this.logger.error(`Card Gateway GET ${url} threw: ${err instanceof Error ? err.message : err}`);
+        this.logger.error(
+          `Card Gateway GET ${url} threw: ${err instanceof Error ? err.message : err}`,
+        );
       }
       throw err;
     }
   }
 
   private get baseUrl(): string {
-    return this.config.get<string>('card.baseUrl') ?? '';
+    return this.config.get<string>("card.baseUrl") ?? "";
   }
   private get apiKey(): string {
-    return this.config.get<string>('card.apiKey') ?? '';
+    return this.config.get<string>("card.apiKey") ?? "";
   }
   private get webhookSecret(): string {
-    return this.config.get<string>('card.webhookSecret') ?? '';
+    return this.config.get<string>("card.webhookSecret") ?? "";
   }
   private get webhookUrl(): string {
-    return this.config.get<string>('card.webhookUrl') ?? '';
+    return this.config.get<string>("card.webhookUrl") ?? "";
   }
   private get returnUrl(): string {
-    return this.config.get<string>('card.returnUrl') ?? '';
+    return this.config.get<string>("card.returnUrl") ?? "";
   }
 }
diff --git a/packages/payment-providers/src/providers/cbe-birr/cbe-birr.provider.ts b/packages/payment-providers/src/providers/cbe-birr/cbe-birr.provider.ts
index ebce5caba..2f3303374 100644
--- a/packages/payment-providers/src/providers/cbe-birr/cbe-birr.provider.ts
+++ b/packages/payment-providers/src/providers/cbe-birr/cbe-birr.provider.ts
@@ -1,6 +1,6 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { HttpService } from '@nestjs/axios';
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { HttpService } from "@nestjs/axios";
 import {
   PaymentProvider,
   ProviderInitiationInput,
@@ -8,10 +8,10 @@ import {
   ProviderStatus,
   ProviderPaymentStatus,
   ProviderMethod,
-} from '@edr/types';
-import { AxiosError, AxiosRequestConfig } from 'axios';
-import { firstValueFrom } from 'rxjs';
-import * as crypto from 'node:crypto';
+} from "@edr/types";
+import { AxiosError, AxiosRequestConfig } from "axios";
+import { firstValueFrom } from "rxjs";
+import * as crypto from "node:crypto";
 
 interface CbeBirrInitiateRequest {
   merchantId: string;
@@ -51,7 +51,9 @@ export class CbeBirrProvider implements PaymentProvider {
     private readonly http: HttpService,
   ) {}
 
-  async initiate(input: ProviderInitiationInput): Promise<ProviderInitiationResult> {
+  async initiate(
+    input: ProviderInitiationInput,
+  ): Promise<ProviderInitiationResult> {
     const amount = (input.amountMinor / 100).toFixed(2);
     const timestamp = new Date().toISOString();
 
@@ -61,7 +63,8 @@ export class CbeBirrProvider implements PaymentProvider {
       amount,
       currency: input.currency,
       description: `EDR ${input.orderRef}`,
-      returnUrl: this.returnUrl,
+      // Per-transaction browser return target (each calling app has its own UI); config is fallback.
+      returnUrl: input.returnUrl ?? this.returnUrl,
       notifyUrl: this.notifyUrl,
       timestamp,
       signature: this.signRequest({
@@ -85,7 +88,7 @@ export class CbeBirrProvider implements PaymentProvider {
 
     return {
       providerOrderId: response.orderId,
-      clientAction: { type: 'REDIRECT', url: response.paymentUrl },
+      clientAction: { type: "REDIRECT", url: response.paymentUrl },
       expiresAt,
       rawInitiation: {
         request: this.sanitize(requestBody),
@@ -117,14 +120,15 @@ export class CbeBirrProvider implements PaymentProvider {
     return {
       status: mapped,
       providerTxnId: response.transactionId,
-      failureCode: mapped === ProviderPaymentStatus.FAILED ? response.status : undefined,
+      failureCode:
+        mapped === ProviderPaymentStatus.FAILED ? response.status : undefined,
       rawResponse: response as unknown as Record<string, unknown>,
     };
   }
 
   verifyWebhookSignature(payload: Record<string, unknown>): boolean {
     const { signature, ...data } = payload;
-    if (!signature || typeof signature !== 'string') return false;
+    if (!signature || typeof signature !== "string") return false;
 
     const expectedSignature = this.signRequest(data);
     return crypto.timingSafeEqual(
@@ -139,16 +143,16 @@ export class CbeBirrProvider implements PaymentProvider {
 
   private mapStatus(status: string): ProviderPaymentStatus {
     switch (status?.toUpperCase()) {
-      case 'SUCCESS':
-      case 'COMPLETED':
+      case "SUCCESS":
+      case "COMPLETED":
         return ProviderPaymentStatus.SUCCEEDED;
-      case 'FAILED':
-      case 'REJECTED':
-      case 'EXPIRED':
+      case "FAILED":
+      case "REJECTED":
+      case "EXPIRED":
         return ProviderPaymentStatus.FAILED;
-      case 'PENDING':
+      case "PENDING":
         return ProviderPaymentStatus.REQUIRES_ACTION;
-      case 'PROCESSING':
+      case "PROCESSING":
         return ProviderPaymentStatus.PROCESSING;
       default:
         return ProviderPaymentStatus.PROCESSING;
@@ -157,21 +161,19 @@ export class CbeBirrProvider implements PaymentProvider {
 
   private signRequest(data: Record<string, unknown>): string {
     const sortedKeys = Object.keys(data).sort();
-    const signString = sortedKeys
-      .map((key) => `${key}=${data[key]}`)
-      .join('&');
+    const signString = sortedKeys.map((key) => `${key}=${data[key]}`).join("&");
 
     return crypto
-      .createHmac('sha256', this.secretKey)
+      .createHmac("sha256", this.secretKey)
       .update(signString)
-      .digest('hex');
+      .digest("hex");
   }
 
   private async postJson<T>(url: string, body: unknown): Promise<T> {
     const config: AxiosRequestConfig = {
       headers: {
-        'Content-Type': 'application/json',
-        'X-Merchant-Id': this.merchantId,
+        "Content-Type": "application/json",
+        "X-Merchant-Id": this.merchantId,
       },
       timeout: 10_000,
     };
@@ -179,7 +181,9 @@ export class CbeBirrProvider implements PaymentProvider {
     const started = Date.now();
     try {
       const res = await firstValueFrom(this.http.post<T>(url, body, config));
-      this.logger.debug(`CBE Birr POST ${url} status=${res.status} latency=${Date.now() - started}ms`);
+      this.logger.debug(
+        `CBE Birr POST ${url} status=${res.status} latency=${Date.now() - started}ms`,
+      );
       return res.data;
     } catch (err) {
       if (err instanceof AxiosError) {
@@ -187,7 +191,9 @@ export class CbeBirrProvider implements PaymentProvider {
           `CBE Birr POST ${url} failed: status=${err.response?.status} body=${JSON.stringify(err.response?.data)}`,
         );
       } else {
-        this.logger.error(`CBE Birr POST ${url} threw: ${err instanceof Error ? err.message : err}`);
+        this.logger.error(
+          `CBE Birr POST ${url} threw: ${err instanceof Error ? err.message : err}`,
+        );
       }
       throw err;
     }
@@ -199,18 +205,18 @@ export class CbeBirrProvider implements PaymentProvider {
   }
 
   private get baseUrl(): string {
-    return this.config.get<string>('cbe.baseUrl') ?? '';
+    return this.config.get<string>("cbe.baseUrl") ?? "";
   }
   private get merchantId(): string {
-    return this.config.get<string>('cbe.merchantId') ?? '';
+    return this.config.get<string>("cbe.merchantId") ?? "";
   }
   private get secretKey(): string {
-    return this.config.get<string>('cbe.secretKey') ?? '';
+    return this.config.get<string>("cbe.secretKey") ?? "";
   }
   private get notifyUrl(): string {
-    return this.config.get<string>('cbe.notifyUrl') ?? '';
+    return this.config.get<string>("cbe.notifyUrl") ?? "";
   }
   private get returnUrl(): string {
-    return this.config.get<string>('cbe.returnUrl') ?? '';
+    return this.config.get<string>("cbe.returnUrl") ?? "";
   }
 }
diff --git a/packages/payment-providers/src/providers/dmoney/dmoney.provider.ts b/packages/payment-providers/src/providers/dmoney/dmoney.provider.ts
index a4aae8ca3..35ca54a3b 100644
--- a/packages/payment-providers/src/providers/dmoney/dmoney.provider.ts
+++ b/packages/payment-providers/src/providers/dmoney/dmoney.provider.ts
@@ -1,6 +1,6 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { HttpService } from '@nestjs/axios';
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { HttpService } from "@nestjs/axios";
 import {
   PaymentProvider,
   ProviderInitiationInput,
@@ -8,10 +8,10 @@ import {
   ProviderStatus,
   ProviderPaymentStatus,
   ProviderMethod,
-} from '@edr/types';
-import { AxiosError, AxiosRequestConfig } from 'axios';
-import { firstValueFrom } from 'rxjs';
-import * as crypto from 'node:crypto';
+} from "@edr/types";
+import { AxiosError, AxiosRequestConfig } from "axios";
+import { firstValueFrom } from "rxjs";
+import * as crypto from "node:crypto";
 
 interface DMoneyAuthResponse {
   token: string;
@@ -58,7 +58,9 @@ export class DMoneyProvider implements PaymentProvider {
     private readonly http: HttpService,
   ) {}
 
-  async initiate(input: ProviderInitiationInput): Promise<ProviderInitiationResult> {
+  async initiate(
+    input: ProviderInitiationInput,
+  ): Promise<ProviderInitiationResult> {
     const token = await this.getFabricToken();
     const amount = (input.amountMinor / 100).toFixed(2);
     const timestamp = new Date().toISOString();
@@ -95,8 +97,11 @@ export class DMoneyProvider implements PaymentProvider {
     return {
       providerOrderId: response.orderId,
       clientAction: response.checkoutUrl
-        ? { type: 'REDIRECT', url: response.checkoutUrl }
-        : { type: 'REDIRECT', url: `${this.baseUrl}/checkout/${response.orderId}` },
+        ? { type: "REDIRECT", url: response.checkoutUrl }
+        : {
+            type: "REDIRECT",
+            url: `${this.baseUrl}/checkout/${response.orderId}`,
+          },
       expiresAt,
       rawInitiation: {
         request: this.sanitize(requestBody),
@@ -106,7 +111,7 @@ export class DMoneyProvider implements PaymentProvider {
   }
 
   async queryStatus(merchantOrderId: string): Promise<ProviderStatus> {
-    const token = await this.authenticate();
+    const token = await this.getFabricToken();
     const timestamp = new Date().toISOString();
     const signature = this.signRequest({
       merchantId: this.merchantId,
@@ -130,14 +135,15 @@ export class DMoneyProvider implements PaymentProvider {
     return {
       status: mapped,
       providerTxnId: response.transactionId,
-      failureCode: mapped === ProviderPaymentStatus.FAILED ? response.status : undefined,
+      failureCode:
+        mapped === ProviderPaymentStatus.FAILED ? response.status : undefined,
       rawResponse: response as unknown as Record<string, unknown>,
     };
   }
 
   verifyWebhookSignature(payload: Record<string, unknown>): boolean {
     const { signature, ...data } = payload;
-    if (!signature || typeof signature !== 'string') return false;
+    if (!signature || typeof signature !== "string") return false;
 
     const expectedSignature = this.signRequest(data);
     return crypto.timingSafeEqual(
@@ -152,17 +158,17 @@ export class DMoneyProvider implements PaymentProvider {
 
   private mapStatus(status: string): ProviderPaymentStatus {
     switch (status?.toUpperCase()) {
-      case 'SUCCESS':
-      case 'COMPLETED':
+      case "SUCCESS":
+      case "COMPLETED":
         return ProviderPaymentStatus.SUCCEEDED;
-      case 'FAILED':
-      case 'REJECTED':
-      case 'EXPIRED':
-      case 'CANCELLED':
+      case "FAILED":
+      case "REJECTED":
+      case "EXPIRED":
+      case "CANCELLED":
         return ProviderPaymentStatus.FAILED;
-      case 'PENDING':
+      case "PENDING":
         return ProviderPaymentStatus.REQUIRES_ACTION;
-      case 'PROCESSING':
+      case "PROCESSING":
         return ProviderPaymentStatus.PROCESSING;
       default:
         return ProviderPaymentStatus.PROCESSING;
@@ -178,7 +184,9 @@ export class DMoneyProvider implements PaymentProvider {
     );
 
     if (!response.token) {
-      throw new Error(`DMoney authentication failed: ${JSON.stringify(response)}`);
+      throw new Error(
+        `DMoney authentication failed: ${JSON.stringify(response)}`,
+      );
     }
 
     return response.token;
@@ -186,22 +194,24 @@ export class DMoneyProvider implements PaymentProvider {
 
   private signRequest(data: Record<string, unknown>): string {
     const sortedKeys = Object.keys(data).sort();
-    const signString = sortedKeys
-      .map((key) => `${key}=${data[key]}`)
-      .join('&');
+    const signString = sortedKeys.map((key) => `${key}=${data[key]}`).join("&");
 
     return crypto
-      .createHmac('sha256', this.secretKey)
+      .createHmac("sha256", this.secretKey)
       .update(signString)
-      .digest('hex');
+      .digest("hex");
   }
 
-  private async postJson<T>(url: string, body: unknown, token?: string): Promise<T> {
+  private async postJson<T>(
+    url: string,
+    body: unknown,
+    token?: string,
+  ): Promise<T> {
     const headers: Record<string, string> = {
-      'Content-Type': 'application/json',
+      "Content-Type": "application/json",
     };
     if (token) {
-      headers['Authorization'] = `Bearer ${token}`;
+      headers["Authorization"] = `Bearer ${token}`;
     }
 
     const config: AxiosRequestConfig = {
@@ -212,7 +222,9 @@ export class DMoneyProvider implements PaymentProvider {
     const started = Date.now();
     try {
       const res = await firstValueFrom(this.http.post<T>(url, body, config));
-      this.logger.debug(`DMoney POST ${url} status=${res.status} latency=${Date.now() - started}ms`);
+      this.logger.debug(
+        `DMoney POST ${url} status=${res.status} latency=${Date.now() - started}ms`,
+      );
       return res.data;
     } catch (err) {
       if (err instanceof AxiosError) {
@@ -220,7 +232,9 @@ export class DMoneyProvider implements PaymentProvider {
           `DMoney POST ${url} failed: status=${err.response?.status} body=${JSON.stringify(err.response?.data)}`,
         );
       } else {
-        this.logger.error(`DMoney POST ${url} threw: ${err instanceof Error ? err.message : err}`);
+        this.logger.error(
+          `DMoney POST ${url} threw: ${err instanceof Error ? err.message : err}`,
+        );
       }
       throw err;
     }
@@ -232,21 +246,21 @@ export class DMoneyProvider implements PaymentProvider {
   }
 
   private get baseUrl(): string {
-    return this.config.get<string>('dmoney.baseUrl') ?? '';
+    return this.config.get<string>("dmoney.baseUrl") ?? "";
   }
   private get merchantId(): string {
-    return this.config.get<string>('dmoney.merchantId') ?? '';
+    return this.config.get<string>("dmoney.merchantId") ?? "";
   }
   private get appSecret(): string {
-    return this.config.get<string>('dmoney.appSecret') ?? '';
+    return this.config.get<string>("dmoney.appSecret") ?? "";
   }
   private get secretKey(): string {
-    return this.config.get<string>('dmoney.secretKey') ?? '';
+    return this.config.get<string>("dmoney.secretKey") ?? "";
   }
   private get notifyUrl(): string {
-    return this.config.get<string>('dmoney.notifyUrl') ?? '';
+    return this.config.get<string>("dmoney.notifyUrl") ?? "";
   }
   private get returnUrl(): string {
-    return this.config.get<string>('dmoney.returnUrl') ?? '';
+    return this.config.get<string>("dmoney.returnUrl") ?? "";
   }
 }
diff --git a/packages/payment-providers/src/providers/ebirr/ebirr.provider.ts b/packages/payment-providers/src/providers/ebirr/ebirr.provider.ts
index ee84bf611..2f8e954cf 100644
--- a/packages/payment-providers/src/providers/ebirr/ebirr.provider.ts
+++ b/packages/payment-providers/src/providers/ebirr/ebirr.provider.ts
@@ -1,6 +1,6 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { HttpService } from '@nestjs/axios';
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { HttpService } from "@nestjs/axios";
 import {
   PaymentProvider,
   ProviderInitiationInput,
@@ -8,10 +8,10 @@ import {
   ProviderStatus,
   ProviderPaymentStatus,
   ProviderMethod,
-} from '@edr/types';
-import { AxiosError, AxiosRequestConfig } from 'axios';
-import { firstValueFrom } from 'rxjs';
-import * as crypto from 'node:crypto';
+} from "@edr/types";
+import { AxiosError, AxiosRequestConfig } from "axios";
+import { firstValueFrom } from "rxjs";
+import * as crypto from "node:crypto";
 
 interface EBirrInitiateRequest {
   merchantCode: string;
@@ -58,7 +58,9 @@ export class EBirrProvider implements PaymentProvider {
     private readonly http: HttpService,
   ) {}
 
-  async initiate(input: ProviderInitiationInput): Promise<ProviderInitiationResult> {
+  async initiate(
+    input: ProviderInitiationInput,
+  ): Promise<ProviderInitiationResult> {
     const amount = input.amountMinor / 100;
     const timestamp = Date.now();
 
@@ -70,7 +72,8 @@ export class EBirrProvider implements PaymentProvider {
       subject: `EDR Ticket`,
       body: `Order ${input.orderRef}`,
       notifyUrl: this.notifyUrl,
-      returnUrl: this.returnUrl,
+      // Per-transaction browser return target (each calling app has its own UI); config is fallback.
+      returnUrl: input.returnUrl ?? this.returnUrl,
       timestamp,
       sign: this.signRequest({
         merchantCode: this.merchantCode,
@@ -85,7 +88,7 @@ export class EBirrProvider implements PaymentProvider {
       requestBody,
     );
 
-    if (response.code !== '0000' || !response.data?.orderNo) {
+    if (response.code !== "0000" || !response.data?.orderNo) {
       throw new Error(`eBirr initiate failed: ${response.message}`);
     }
 
@@ -93,7 +96,7 @@ export class EBirrProvider implements PaymentProvider {
 
     return {
       providerOrderId: response.data.orderNo,
-      clientAction: { type: 'REDIRECT', url: response.data.payUrl },
+      clientAction: { type: "REDIRECT", url: response.data.payUrl },
       expiresAt,
       rawInitiation: {
         request: this.sanitize(requestBody),
@@ -120,7 +123,7 @@ export class EBirrProvider implements PaymentProvider {
       requestBody,
     );
 
-    if (response.code !== '0000' || !response.data) {
+    if (response.code !== "0000" || !response.data) {
       throw new Error(`eBirr query failed: ${response.message}`);
     }
 
@@ -129,20 +132,20 @@ export class EBirrProvider implements PaymentProvider {
     return {
       status: mapped,
       providerTxnId: response.data.tradeNo,
-      failureCode: mapped === ProviderPaymentStatus.FAILED ? response.data.tradeStatus : undefined,
+      failureCode:
+        mapped === ProviderPaymentStatus.FAILED
+          ? response.data.tradeStatus
+          : undefined,
       rawResponse: response as unknown as Record<string, unknown>,
     };
   }
 
   verifyWebhookSignature(payload: Record<string, unknown>): boolean {
     const { sign, ...data } = payload;
-    if (!sign || typeof sign !== 'string') return false;
+    if (!sign || typeof sign !== "string") return false;
 
     const expectedSign = this.signRequest(data);
-    return crypto.timingSafeEqual(
-      Buffer.from(sign),
-      Buffer.from(expectedSign),
-    );
+    return crypto.timingSafeEqual(Buffer.from(sign), Buffer.from(expectedSign));
   }
 
   mapWebhookStatus(tradeStatus: string): ProviderPaymentStatus {
@@ -151,17 +154,17 @@ export class EBirrProvider implements PaymentProvider {
 
   private mapStatus(tradeStatus: string): ProviderPaymentStatus {
     switch (tradeStatus?.toUpperCase()) {
-      case 'TRADE_SUCCESS':
-      case 'SUCCESS':
+      case "TRADE_SUCCESS":
+      case "SUCCESS":
         return ProviderPaymentStatus.SUCCEEDED;
-      case 'TRADE_CLOSED':
-      case 'TRADE_FAILED':
-      case 'FAILED':
+      case "TRADE_CLOSED":
+      case "TRADE_FAILED":
+      case "FAILED":
         return ProviderPaymentStatus.FAILED;
-      case 'WAIT_BUYER_PAY':
-      case 'PENDING':
+      case "WAIT_BUYER_PAY":
+      case "PENDING":
         return ProviderPaymentStatus.REQUIRES_ACTION;
-      case 'PROCESSING':
+      case "PROCESSING":
         return ProviderPaymentStatus.PROCESSING;
       default:
         return ProviderPaymentStatus.PROCESSING;
@@ -170,21 +173,21 @@ export class EBirrProvider implements PaymentProvider {
 
   private signRequest(data: Record<string, unknown>): string {
     const sortedKeys = Object.keys(data).sort();
-    const signString = sortedKeys
-      .map((key) => `${key}=${data[key]}`)
-      .join('&') + `&key=${this.secretKey}`;
+    const signString =
+      sortedKeys.map((key) => `${key}=${data[key]}`).join("&") +
+      `&key=${this.secretKey}`;
 
     return crypto
-      .createHash('md5')
+      .createHash("md5")
       .update(signString)
-      .digest('hex')
+      .digest("hex")
       .toUpperCase();
   }
 
   private async postJson<T>(url: string, body: unknown): Promise<T> {
     const config: AxiosRequestConfig = {
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       timeout: 10_000,
     };
@@ -192,7 +195,9 @@ export class EBirrProvider implements PaymentProvider {
     const started = Date.now();
     try {
       const res = await firstValueFrom(this.http.post<T>(url, body, config));
-      this.logger.debug(`eBirr POST ${url} status=${res.status} latency=${Date.now() - started}ms`);
+      this.logger.debug(
+        `eBirr POST ${url} status=${res.status} latency=${Date.now() - started}ms`,
+      );
       return res.data;
     } catch (err) {
       if (err instanceof AxiosError) {
@@ -200,7 +205,9 @@ export class EBirrProvider implements PaymentProvider {
           `eBirr POST ${url} failed: status=${err.response?.status} body=${JSON.stringify(err.response?.data)}`,
         );
       } else {
-        this.logger.error(`eBirr POST ${url} threw: ${err instanceof Error ? err.message : err}`);
+        this.logger.error(
+          `eBirr POST ${url} threw: ${err instanceof Error ? err.message : err}`,
+        );
       }
       throw err;
     }
@@ -212,18 +219,18 @@ export class EBirrProvider implements PaymentProvider {
   }
 
   private get baseUrl(): string {
-    return this.config.get<string>('ebirr.baseUrl') ?? '';
+    return this.config.get<string>("ebirr.baseUrl") ?? "";
   }
   private get merchantCode(): string {
-    return this.config.get<string>('ebirr.merchantCode') ?? '';
+    return this.config.get<string>("ebirr.merchantCode") ?? "";
   }
   private get secretKey(): string {
-    return this.config.get<string>('ebirr.secretKey') ?? '';
+    return this.config.get<string>("ebirr.secretKey") ?? "";
   }
   private get notifyUrl(): string {
-    return this.config.get<string>('ebirr.notifyUrl') ?? '';
+    return this.config.get<string>("ebirr.notifyUrl") ?? "";
   }
   private get returnUrl(): string {
-    return this.config.get<string>('ebirr.returnUrl') ?? '';
+    return this.config.get<string>("ebirr.returnUrl") ?? "";
   }
 }
diff --git a/packages/payment-providers/src/providers/telebirr/telebirr.provider.ts b/packages/payment-providers/src/providers/telebirr/telebirr.provider.ts
index f2fad00fe..39a0e8e90 100644
--- a/packages/payment-providers/src/providers/telebirr/telebirr.provider.ts
+++ b/packages/payment-providers/src/providers/telebirr/telebirr.provider.ts
@@ -1,6 +1,6 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { HttpService } from '@nestjs/axios';
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { HttpService } from "@nestjs/axios";
 import {
   PaymentProvider,
   ProviderInitiationInput,
@@ -8,22 +8,22 @@ import {
   ProviderStatus,
   ProviderPaymentStatus,
   ProviderMethod,
-} from '@edr/types';
-import { AxiosError, AxiosRequestConfig } from 'axios';
-import { firstValueFrom } from 'rxjs';
-import * as https from 'node:https';
+} from "@edr/types";
+import { AxiosError, AxiosRequestConfig } from "axios";
+import { firstValueFrom } from "rxjs";
+import * as https from "node:https";
 import {
   createNonceStr,
   createTimestamp,
   signRequestObject,
   verifyRequestObject,
-} from './telebirr.crypto';
+} from "./telebirr.crypto";
 import {
   CreateOrderRequest,
   CreateOrderResponse,
   FabricTokenResponse,
   QueryOrderResponse,
-} from './telebirr.types';
+} from "./telebirr.types";
 
 const TELEBIRR_HTTP_TIMEOUT_MS = 10_000;
 
@@ -37,17 +37,21 @@ export class TelebirrProvider implements PaymentProvider {
     private readonly config: ConfigService,
     private readonly http: HttpService,
   ) {
-    const insecure = this.config.get<boolean>('telebirr.insecureTls');
+    const insecure = this.config.get<boolean>("telebirr.insecureTls");
     if (insecure) {
-      this.logger.warn('TELEBIRR_INSECURE_TLS=true — TLS verification disabled for Telebirr calls. DEV ONLY.');
+      this.logger.warn(
+        "TELEBIRR_INSECURE_TLS=true — TLS verification disabled for Telebirr calls. DEV ONLY.",
+      );
     }
     this.httpsAgent = new https.Agent({
       rejectUnauthorized: !insecure,
-      secureProtocol: 'TLSv1_2_method',
+      secureProtocol: "TLSv1_2_method",
     });
   }
 
-  async initiate(input: ProviderInitiationInput): Promise<ProviderInitiationResult> {
+  async initiate(
+    input: ProviderInitiationInput,
+  ): Promise<ProviderInitiationResult> {
     const fabricToken = await this.applyFabricToken();
     const requestBody = this.buildCreateOrderRequest(input);
     const response = await this.requestCreateOrder(fabricToken, requestBody);
@@ -59,17 +63,19 @@ export class TelebirrProvider implements PaymentProvider {
       );
     }
 
-    const expiresAt = this.computeExpiresAt(requestBody.biz_content.timeout_express);
-    const platform = input.platform ?? 'web';
+    const expiresAt = this.computeExpiresAt(
+      requestBody.biz_content.timeout_express,
+    );
+    const platform = input.platform ?? "web";
     const clientAction =
-      platform === 'mobile'
+      platform === "mobile"
         ? {
-          type: 'LAUNCH_APP' as const,
-          appId: this.merchantAppId,
-          receiveCode: response.biz_content?.receiveCode,
-          shortCode: this.merchantCode,
-        }
-        : { type: 'REDIRECT' as const, url: this.buildCheckoutUrl(prepayId) };
+            type: "LAUNCH_APP" as const,
+            appId: this.merchantAppId,
+            receiveCode: response.biz_content?.receiveCode,
+            shortCode: this.merchantCode,
+          }
+        : { type: "REDIRECT" as const, url: this.buildCheckoutUrl(prepayId) };
 
     return {
       providerOrderId: prepayId,
@@ -89,8 +95,8 @@ export class TelebirrProvider implements PaymentProvider {
       `${this.baseUrl}/payment/v1/merchant/queryOrder`,
       requestBody,
       {
-        'Content-Type': 'application/json',
-        'X-APP-Key': this.fabricAppId,
+        "Content-Type": "application/json",
+        "X-APP-Key": this.fabricAppId,
         Authorization: fabricToken,
       },
     );
@@ -104,36 +110,40 @@ export class TelebirrProvider implements PaymentProvider {
       status: mapped,
       providerTxnId,
       failureCode:
-        mapped === ProviderPaymentStatus.FAILED && tradeStatus ? tradeStatus : undefined,
+        mapped === ProviderPaymentStatus.FAILED && tradeStatus
+          ? tradeStatus
+          : undefined,
       rawResponse: response as Record<string, unknown>,
     };
   }
 
   mapTradeStatus(tradeStatus: string | undefined): ProviderPaymentStatus {
     switch (tradeStatus) {
-      case 'PAY_SUCCESS':
+      case "PAY_SUCCESS":
         return ProviderPaymentStatus.SUCCEEDED;
-      case 'PAY_FAILED':
-      case 'ORDER_CLOSED':
+      case "PAY_FAILED":
+      case "ORDER_CLOSED":
         return ProviderPaymentStatus.FAILED;
-      case 'WAIT_PAY':
+      case "WAIT_PAY":
         return ProviderPaymentStatus.REQUIRES_ACTION;
-      case 'PAYING':
+      case "PAYING":
         return ProviderPaymentStatus.PROCESSING;
       default:
         return ProviderPaymentStatus.PROCESSING;
     }
   }
 
-  mapWebhookTradeStatus(tradeStatus: string | undefined): ProviderPaymentStatus {
+  mapWebhookTradeStatus(
+    tradeStatus: string | undefined,
+  ): ProviderPaymentStatus {
     switch (tradeStatus) {
-      case 'Completed':
+      case "Completed":
         return ProviderPaymentStatus.SUCCEEDED;
-      case 'Failure':
-      case 'Expired':
+      case "Failure":
+      case "Expired":
         return ProviderPaymentStatus.FAILED;
-      case 'Paying':
-      case 'Pending':
+      case "Paying":
+      case "Pending":
         return ProviderPaymentStatus.PROCESSING;
       default:
         return ProviderPaymentStatus.PROCESSING;
@@ -142,7 +152,9 @@ export class TelebirrProvider implements PaymentProvider {
 
   verifyWebhookSignature(payload: Record<string, unknown>): boolean {
     if (!this.publicKey) {
-      this.logger.error('TELEBIRR_PUBLIC_KEY not configured; rejecting all webhooks');
+      this.logger.error(
+        "TELEBIRR_PUBLIC_KEY not configured; rejecting all webhooks",
+      );
       return false;
     }
     return verifyRequestObject(payload, this.publicKey);
@@ -153,12 +165,14 @@ export class TelebirrProvider implements PaymentProvider {
       `${this.baseUrl}/payment/v1/token`,
       { appSecret: this.appSecret },
       {
-        'Content-Type': 'application/json',
-        'X-APP-Key': this.fabricAppId,
+        "Content-Type": "application/json",
+        "X-APP-Key": this.fabricAppId,
       },
     );
     if (!response?.token) {
-      throw new Error(`Telebirr token request failed: ${JSON.stringify(response)}`);
+      throw new Error(
+        `Telebirr token request failed: ${JSON.stringify(response)}`,
+      );
     }
     return response.token;
   }
@@ -171,51 +185,61 @@ export class TelebirrProvider implements PaymentProvider {
       `${this.baseUrl}/payment/v1/inapp/createOrder`,
       body,
       {
-        'Content-Type': 'application/json',
-        'X-APP-Key': this.fabricAppId,
+        "Content-Type": "application/json",
+        "X-APP-Key": this.fabricAppId,
         Authorization: fabricToken,
       },
     );
   }
 
-  private buildCreateOrderRequest(input: ProviderInitiationInput): CreateOrderRequest {
+  private buildCreateOrderRequest(
+    input: ProviderInitiationInput,
+  ): CreateOrderRequest {
     const totalAmount = String(input.amountMinor / 100);
     const req = {
       timestamp: createTimestamp(),
       nonce_str: createNonceStr(),
-      method: 'payment.preorder' as const,
-      version: '1.0' as const,
+      method: "payment.preorder" as const,
+      version: "1.0" as const,
       biz_content: {
         notify_url: this.notifyUrl,
         appid: this.merchantAppId,
         merch_code: this.merchantCode,
         merch_order_id: input.merchantOrderId,
-        trade_type: 'Checkout' as const,
+        trade_type: "Checkout" as const,
         title: `EDR ${input.orderRef}`,
         total_amount: totalAmount,
         trans_currency: input.currency,
         timeout_express: this.timeoutExpress,
-        redirect_url: input.redirectUrl
+        redirect_url: input.redirectUrl,
       },
     };
-    const sign = signRequestObject(req as unknown as Record<string, unknown>, this.privateKey);
-    return { ...req, sign, sign_type: 'SHA256WithRSA' };
+    const sign = signRequestObject(
+      req as unknown as Record<string, unknown>,
+      this.privateKey,
+    );
+    return { ...req, sign, sign_type: "SHA256WithRSA" };
   }
 
-  private buildQueryOrderRequest(merchantOrderId: string): Record<string, unknown> {
+  private buildQueryOrderRequest(
+    merchantOrderId: string,
+  ): Record<string, unknown> {
     const req = {
       timestamp: createTimestamp(),
       nonce_str: createNonceStr(),
-      method: 'payment.queryorder',
-      version: '1.0',
+      method: "payment.queryorder",
+      version: "1.0",
       biz_content: {
         appid: this.merchantAppId,
         merch_code: this.merchantCode,
         merch_order_id: merchantOrderId,
       },
     };
-    const sign = signRequestObject(req as Record<string, unknown>, this.privateKey);
-    return { ...req, sign, sign_type: 'SHA256WithRSA' };
+    const sign = signRequestObject(
+      req as Record<string, unknown>,
+      this.privateKey,
+    );
+    return { ...req, sign, sign_type: "SHA256WithRSA" };
   }
 
   private buildCheckoutUrl(prepayId: string): string {
@@ -233,27 +257,34 @@ export class TelebirrProvider implements PaymentProvider {
       `nonce_str=${map.nonce_str}`,
       `prepay_id=${map.prepay_id}`,
       `timestamp=${map.timestamp}`,
-      'sign_type=SHA256WithRSA',
+      "sign_type=SHA256WithRSA",
       `sign=${sign}`,
-      'version=1.0',
-      'trade_type=Checkout',
-    ].join('&');
+      "version=1.0",
+      "trade_type=Checkout",
+    ].join("&");
     return `${this.webBaseUrl}${rawRequest}`;
   }
 
   private computeExpiresAt(timeoutExpress: string): Date {
     const match = /^(\d+)([smhd])$/.exec(timeoutExpress);
-    const minutes = match ? this.toMinutes(parseInt(match[1], 10), match[2]) : 15;
+    const minutes = match
+      ? this.toMinutes(parseInt(match[1], 10), match[2])
+      : 15;
     return new Date(Date.now() + minutes * 60_000);
   }
 
   private toMinutes(n: number, unit: string): number {
     switch (unit) {
-      case 's': return Math.max(1, Math.round(n / 60));
-      case 'm': return n;
-      case 'h': return n * 60;
-      case 'd': return n * 60 * 24;
-      default: return 15;
+      case "s":
+        return Math.max(1, Math.round(n / 60));
+      case "m":
+        return n;
+      case "h":
+        return n * 60;
+      case "d":
+        return n * 60 * 24;
+      default:
+        return 15;
     }
   }
 
@@ -270,7 +301,9 @@ export class TelebirrProvider implements PaymentProvider {
     const started = Date.now();
     try {
       const res = await firstValueFrom(this.http.post<T>(url, body, config));
-      this.logger.debug(`Telebirr POST ${url} status=${res.status} latency=${Date.now() - started}ms`);
+      this.logger.debug(
+        `Telebirr POST ${url} status=${res.status} latency=${Date.now() - started}ms`,
+      );
       return res.data;
     } catch (err) {
       if (err instanceof AxiosError) {
@@ -278,7 +311,9 @@ export class TelebirrProvider implements PaymentProvider {
           `Telebirr POST ${url} failed: status=${err.response?.status} body=${JSON.stringify(err.response?.data)} code=${err.code} message=${err.message}`,
         );
       } else {
-        this.logger.error(`Telebirr POST ${url} threw: ${err instanceof Error ? err.message : err}`);
+        this.logger.error(
+          `Telebirr POST ${url} threw: ${err instanceof Error ? err.message : err}`,
+        );
       }
       throw err;
     }
@@ -289,14 +324,34 @@ export class TelebirrProvider implements PaymentProvider {
     return rest;
   }
 
-  private get baseUrl(): string { return this.config.get<string>('telebirr.baseUrl') ?? ''; }
-  private get webBaseUrl(): string { return this.config.get<string>('telebirr.webBaseUrl') ?? ''; }
-  private get fabricAppId(): string { return this.config.get<string>('telebirr.fabricAppId') ?? ''; }
-  private get appSecret(): string { return this.config.get<string>('telebirr.appSecret') ?? ''; }
-  private get merchantAppId(): string { return this.config.get<string>('telebirr.merchantAppId') ?? ''; }
-  private get merchantCode(): string { return this.config.get<string>('telebirr.merchantCode') ?? ''; }
-  private get notifyUrl(): string { return this.config.get<string>('telebirr.notifyUrl') ?? ''; }
-  private get timeoutExpress(): string { return this.config.get<string>('telebirr.timeoutExpress') ?? '15m'; }
-  private get privateKey(): string { return this.config.get<string>('telebirr.privateKey') ?? ''; }
-  private get publicKey(): string { return this.config.get<string>('telebirr.publicKey') ?? ''; }
+  private get baseUrl(): string {
+    return this.config.get<string>("telebirr.baseUrl") ?? "";
+  }
+  private get webBaseUrl(): string {
+    return this.config.get<string>("telebirr.webBaseUrl") ?? "";
+  }
+  private get fabricAppId(): string {
+    return this.config.get<string>("telebirr.fabricAppId") ?? "";
+  }
+  private get appSecret(): string {
+    return this.config.get<string>("telebirr.appSecret") ?? "";
+  }
+  private get merchantAppId(): string {
+    return this.config.get<string>("telebirr.merchantAppId") ?? "";
+  }
+  private get merchantCode(): string {
+    return this.config.get<string>("telebirr.merchantCode") ?? "";
+  }
+  private get notifyUrl(): string {
+    return this.config.get<string>("telebirr.notifyUrl") ?? "";
+  }
+  private get timeoutExpress(): string {
+    return this.config.get<string>("telebirr.timeoutExpress") ?? "15m";
+  }
+  private get privateKey(): string {
+    return this.config.get<string>("telebirr.privateKey") ?? "";
+  }
+  private get publicKey(): string {
+    return this.config.get<string>("telebirr.publicKey") ?? "";
+  }
 }
diff --git a/packages/payment-providers/src/providers/waafi/waafi.provider.ts b/packages/payment-providers/src/providers/waafi/waafi.provider.ts
index ea16eccb5..276ff2de2 100644
--- a/packages/payment-providers/src/providers/waafi/waafi.provider.ts
+++ b/packages/payment-providers/src/providers/waafi/waafi.provider.ts
@@ -1,6 +1,6 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { HttpService } from '@nestjs/axios';
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { HttpService } from "@nestjs/axios";
 import {
   PaymentProvider,
   ProviderInitiationInput,
@@ -8,111 +8,70 @@ import {
   ProviderStatus,
   ProviderPaymentStatus,
   ProviderMethod,
-} from '@edr/types';
-import { AxiosError, AxiosRequestConfig } from 'axios';
-import { firstValueFrom } from 'rxjs';
+} from "@edr/types";
+import { AxiosError, AxiosRequestConfig } from "axios";
+import { firstValueFrom } from "rxjs";
+import * as crypto from "node:crypto";
+import * as https from "node:https";
+import {
+  WaafiGetTranInfoRequest,
+  WaafiGetTranInfoResponse,
+  WaafiHppPurchaseRequest,
+  WaafiHppPurchaseResponse,
+} from "./waafi.types";
 
 const WAAFI_HTTP_TIMEOUT_MS = 10_000;
-
-interface WaafiInitiateRequest {
-  schemaVersion: string;
-  requestId: string;
-  timestamp: string;
-  channelName: string;
-  serviceName: string;
-  serviceParams: {
-    merchantUid: string;
-    apiUserId: string;
-    apiKey: string;
-    paymentMethod: string;
-    payerInfo: {
-      accountNo: string;
-    };
-    transactionInfo: {
-      referenceId: string;
-      invoiceId: string;
-      amount: number;
-      currency: string;
-      description: string;
-    };
-  };
-}
-
-interface WaafiInitiateResponse {
-  responseCode: string;
-  responseMsg: string;
-  params?: {
-    state: string;
-    referenceId: string;
-    transactionId: string;
-    checkoutUrl?: string;
-  };
-}
-
-interface WaafiQueryRequest {
-  schemaVersion: string;
-  requestId: string;
-  timestamp: string;
-  channelName: string;
-  serviceName: string;
-  serviceParams: {
-    merchantUid: string;
-    apiUserId: string;
-    apiKey: string;
-    transactionId?: string;
-    referenceId?: string;
-  };
-}
-
-interface WaafiQueryResponse {
-  responseCode: string;
-  responseMsg: string;
-  params?: {
-    state: string;
-    referenceId: string;
-    transactionId: string;
-    amount: number;
-    currency: string;
-    paidAmount?: number;
-  };
-}
+const WAAFI_SUCCESS_CODE = "2001";
+/** Waafi cancels an unprocessed HPP session after ~5 minutes (RCS_HPP_USERACTION_TIMEOUT). */
+const WAAFI_HPP_SESSION_MS = 5 * 60_000;
 
 @Injectable()
 export class WaafiProvider implements PaymentProvider {
   readonly method = ProviderMethod.WAAFI;
   private readonly logger = new Logger(WaafiProvider.name);
+  private readonly httpsAgent: https.Agent;
 
   constructor(
     private readonly config: ConfigService,
     private readonly http: HttpService,
-  ) {}
+  ) {
+    const insecure = this.config.get<boolean>("waafi.insecureTls");
+    if (insecure) {
+      this.logger.warn(
+        "WAAFI_INSECURE_TLS=true — TLS verification disabled for Waafi calls. DEV ONLY.",
+      );
+    }
+    this.httpsAgent = new https.Agent({ rejectUnauthorized: !insecure });
+  }
 
-  async initiate(input: ProviderInitiationInput): Promise<ProviderInitiationResult> {
-    const requestBody = this.buildInitiateRequest(input);
-    const response = await this.postJson<WaafiInitiateResponse>(
+  async initiate(
+    input: ProviderInitiationInput,
+  ): Promise<ProviderInitiationResult> {
+    const requestBody = this.buildPurchaseRequest(input);
+    const response = await this.postJson<WaafiHppPurchaseResponse>(
       `${this.baseUrl}/asm`,
       requestBody,
     );
 
-    if (response.responseCode !== '2001') {
+    if (response.responseCode !== WAAFI_SUCCESS_CODE) {
       throw new Error(
-        `Waafi initiate failed: ${response.responseCode} - ${response.responseMsg}`,
+        `Waafi HPP_PURCHASE failed: responseCode=${response.responseCode} errorCode=${response.errorCode} msg=${response.responseMsg}`,
       );
     }
 
-    const transactionId = response.params?.transactionId;
-    const checkoutUrl = response.params?.checkoutUrl || `${this.baseUrl}/checkout?ref=${transactionId}`;
-
-    if (!transactionId) {
-      throw new Error(`Waafi returned no transactionId: ${JSON.stringify(response)}`);
+    const checkoutUrl =
+      response.params?.hppUrl ?? response.params?.directPaymentLink;
+    const orderId = response.params?.orderId;
+    if (!checkoutUrl || !orderId) {
+      throw new Error(
+        `Waafi HPP_PURCHASE succeeded but returned no hppUrl/orderId: ${JSON.stringify(response)}`,
+      );
     }
 
-    const expiresAt = new Date(Date.now() + 15 * 60_000); // 15 minutes
-
     return {
-      providerOrderId: transactionId,
-      clientAction: { type: 'REDIRECT', url: checkoutUrl },
-      expiresAt,
+      providerOrderId: orderId,
+      clientAction: { type: "REDIRECT", url: checkoutUrl },
+      expiresAt: new Date(Date.now() + WAAFI_HPP_SESSION_MS),
       rawInitiation: {
         request: this.sanitize(requestBody),
         response,
@@ -121,114 +80,159 @@ export class WaafiProvider implements PaymentProvider {
   }
 
   async queryStatus(merchantOrderId: string): Promise<ProviderStatus> {
-    const requestBody = this.buildQueryRequest(merchantOrderId);
-    const response = await this.postJson<WaafiQueryResponse>(
+    const requestBody = this.buildGetTranInfoRequest(merchantOrderId);
+    const response = await this.postJson<WaafiGetTranInfoResponse>(
       `${this.baseUrl}/asm`,
       requestBody,
     );
 
-    const state = response.params?.state;
+    const rawState = response.params?.status ?? response.params?.tranStatusDesc;
     const transactionId = response.params?.transactionId;
-    const mapped = this.mapState(state);
+    const mapped = this.mapStatus(rawState);
 
     return {
       status: mapped,
       providerTxnId: transactionId,
-      failureCode: mapped === ProviderPaymentStatus.FAILED && state ? state : undefined,
+      failureCode:
+        mapped === ProviderPaymentStatus.FAILED && rawState
+          ? rawState
+          : undefined,
       rawResponse: response as unknown as Record<string, unknown>,
     };
   }
 
-  mapState(state: string | undefined): ProviderPaymentStatus {
-    switch (state) {
-      case 'APPROVED':
-      case 'SUCCESS':
+  /** Map a webhook `payment.status` to the shared status enum. */
+  mapWebhookStatus(status: string | undefined): ProviderPaymentStatus {
+    return this.mapStatus(status);
+  }
+
+  /**
+   * Verify an HMAC-SHA256 webhook signature.
+   *
+   * Signing string is `{timestamp}.{eventId}.{rawBody}` over the *raw* request body bytes — the
+   * caller must pass the unparsed body string. Returns false (never throws) on any mismatch so
+   * callers can treat verification as a boolean gate.
+   */
+  verifyWebhookSignature(
+    rawBody: string,
+    signature: string | undefined,
+    timestamp: string | undefined,
+    eventId: string | undefined,
+  ): boolean {
+    if (!this.webhookSecret) {
+      this.logger.error(
+        "WAAFI_WEBHOOK_SECRET not configured; rejecting all webhooks",
+      );
+      return false;
+    }
+    if (!signature || !timestamp || !eventId) {
+      this.logger.warn(
+        "Waafi webhook missing signature/timestamp/event-id headers",
+      );
+      return false;
+    }
+
+    const signingString = `${timestamp}.${eventId}.${rawBody}`;
+    const expected = crypto
+      .createHmac("sha256", this.webhookSecret)
+      .update(signingString)
+      .digest("hex");
+
+    const provided = Buffer.from(signature, "utf8");
+    const computed = Buffer.from(expected, "utf8");
+    if (provided.length !== computed.length) return false;
+    return crypto.timingSafeEqual(provided, computed);
+  }
+
+  private mapStatus(raw: string | undefined): ProviderPaymentStatus {
+    switch (raw?.toUpperCase()) {
+      case "APPROVED":
+      case "SUCCESS":
         return ProviderPaymentStatus.SUCCEEDED;
-      case 'FAILED':
-      case 'DECLINED':
-      case 'CANCELLED':
-      case 'EXPIRED':
+      case "CANCELED":
+      case "CANCELLED":
+        return ProviderPaymentStatus.CANCELLED;
+      case "DECLINED":
+      case "FAILED":
+      case "EXPIRED":
+      case "TIMEOUT":
         return ProviderPaymentStatus.FAILED;
-      case 'PENDING':
-      case 'INITIATED':
+      case "PENDING":
+      case "INITIATED":
         return ProviderPaymentStatus.REQUIRES_ACTION;
-      case 'PROCESSING':
-        return ProviderPaymentStatus.PROCESSING;
       default:
         return ProviderPaymentStatus.PROCESSING;
     }
   }
 
-  verifyWebhookSignature(payload: Record<string, unknown>): boolean {
-    // Waafi webhook signature verification
-    // Implementation depends on Waafi's webhook signature mechanism
-    const signature = payload.signature as string;
-    const apiKey = this.apiKey;
-
-    if (!signature || !apiKey) {
-      this.logger.error('Waafi webhook missing signature or API key not configured');
-      return false;
-    }
-
-    // TODO: Implement actual signature verification based on Waafi documentation
-    // For now, basic validation
-    return signature.length > 0;
-  }
-
-  private buildInitiateRequest(input: ProviderInitiationInput): WaafiInitiateRequest {
-    const amount = input.amountMinor / 100; // Convert minor units to major
-
+  private buildPurchaseRequest(
+    input: ProviderInitiationInput,
+  ): WaafiHppPurchaseRequest {
     return {
-      schemaVersion: '1.0',
-      requestId: this.generateRequestId(),
-      timestamp: new Date().toISOString(),
-      channelName: 'WEB',
-      serviceName: 'API_PURCHASE',
+      schemaVersion: "1.0",
+      requestId: crypto.randomUUID(),
+      timestamp: this.timestamp(),
+      channelName: "WEB",
+      serviceName: "HPP_PURCHASE",
       serviceParams: {
         merchantUid: this.merchantUid,
-        apiUserId: this.apiUserId,
-        apiKey: this.apiKey,
-        paymentMethod: 'MWALLET_ACCOUNT',
-        payerInfo: {
-          accountNo: 'CUSTOMER', // Customer enters their number on Waafi page
-        },
+        storeId: this.storeId,
+        hppKey: this.hppKey,
+        paymentMethod: this.paymentMethod,
+        // Browser bounce-back is per-transaction (each calling app has its own UI), so the
+        // caller-supplied URLs win; the static config is only a fallback. UX-only — the
+        // webhook remains the single source of truth for payment state.
+        hppSuccessCallbackUrl: input.returnUrl ?? this.successUrl,
+        hppFailureCallbackUrl: input.failureUrl ?? this.failureUrl,
+        hppRespDataFormat: this.respDataFormat,
+        // MWALLET_ACCOUNT requires the payer phone up front; omit if the caller did not supply it
+        // and let the hosted page collect it. See docs/waffi open question on payer-phone sourcing.
+        ...(input.payerAccount
+          ? { payerInfo: { subscriptionId: input.payerAccount } }
+          : {}),
         transactionInfo: {
           referenceId: input.merchantOrderId,
-          invoiceId: input.orderRef,
-          amount,
-          currency: input.currency === 'ETB' ? 'DJF' : input.currency, // Convert ETB to DJF
+          amount: this.toAmount(input.amountMinor),
+          // Waafi has no ETB; `waafi.currency` overrides the booking currency when set.
+          currency: this.currency || input.currency,
           description: `EDR ${input.orderRef}`,
         },
       },
     };
   }
 
-  private buildQueryRequest(merchantOrderId: string): WaafiQueryRequest {
+  private buildGetTranInfoRequest(
+    merchantOrderId: string,
+  ): WaafiGetTranInfoRequest {
     return {
-      schemaVersion: '1.0',
-      requestId: this.generateRequestId(),
-      timestamp: new Date().toISOString(),
-      channelName: 'WEB',
-      serviceName: 'API_QUERY',
+      schemaVersion: "1.0",
+      requestId: crypto.randomUUID(),
+      timestamp: this.timestamp(),
+      channelName: "WEB",
+      serviceName: "HPP_GETTRANINFO",
       serviceParams: {
         merchantUid: this.merchantUid,
-        apiUserId: this.apiUserId,
-        apiKey: this.apiKey,
+        storeId: this.storeId,
+        hppKey: this.hppKey,
         referenceId: merchantOrderId,
       },
     };
   }
 
-  private generateRequestId(): string {
-    return `EDR-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
+  /** Convert integer minor units to a 2-decimal major amount (truncated, never rounded up). */
+  private toAmount(amountMinor: number): number {
+    return Math.trunc(amountMinor) / 100;
+  }
+
+  private timestamp(): string {
+    return Math.round(Date.now() / 1000).toString();
   }
 
   private async postJson<T>(url: string, body: unknown): Promise<T> {
     const config: AxiosRequestConfig = {
-      headers: {
-        'Content-Type': 'application/json',
-      },
+      headers: { "Content-Type": "application/json" },
       timeout: WAAFI_HTTP_TIMEOUT_MS,
+      httpsAgent: this.httpsAgent,
     };
 
     const started = Date.now();
@@ -252,24 +256,43 @@ export class WaafiProvider implements PaymentProvider {
     }
   }
 
-  private sanitize(body: WaafiInitiateRequest): Record<string, unknown> {
-    const sanitized = { ...body };
-    if (sanitized.serviceParams?.apiKey) {
-      sanitized.serviceParams.apiKey = '***REDACTED***';
-    }
-    return sanitized as unknown as Record<string, unknown>;
+  private sanitize(body: WaafiHppPurchaseRequest): Record<string, unknown> {
+    return {
+      ...body,
+      serviceParams: { ...body.serviceParams, hppKey: "***REDACTED***" },
+    };
   }
 
   private get baseUrl(): string {
-    return this.config.get<string>('waafi.baseUrl') ?? 'https://api.waafipay.net';
+    return (
+      this.config.get<string>("waafi.baseUrl") ?? "https://sandbox.waafipay.net"
+    );
   }
   private get merchantUid(): string {
-    return this.config.get<string>('waafi.merchantUid') ?? '';
+    return this.config.get<string>("waafi.merchantUid") ?? "";
   }
-  private get apiUserId(): string {
-    return this.config.get<string>('waafi.apiUserId') ?? '';
+  private get storeId(): string {
+    return this.config.get<string>("waafi.storeId") ?? "";
   }
-  private get apiKey(): string {
-    return this.config.get<string>('waafi.apiKey') ?? '';
+  private get hppKey(): string {
+    return this.config.get<string>("waafi.hppKey") ?? "";
+  }
+  private get webhookSecret(): string {
+    return this.config.get<string>("waafi.webhookSecret") ?? "";
+  }
+  private get paymentMethod(): string {
+    return this.config.get<string>("waafi.paymentMethod") ?? "MWALLET_ACCOUNT";
+  }
+  private get currency(): string {
+    return this.config.get<string>("waafi.currency") ?? "";
+  }
+  private get successUrl(): string {
+    return this.config.get<string>("waafi.successUrl") ?? "";
+  }
+  private get failureUrl(): string {
+    return this.config.get<string>("waafi.failureUrl") ?? "";
+  }
+  private get respDataFormat(): number {
+    return this.config.get<number>("waafi.respDataFormat") ?? 1;
   }
 }
diff --git a/packages/payment-providers/src/providers/waafi/waafi.types.ts b/packages/payment-providers/src/providers/waafi/waafi.types.ts
new file mode 100644
index 000000000..3f3c6f3cf
--- /dev/null
+++ b/packages/payment-providers/src/providers/waafi/waafi.types.ts
@@ -0,0 +1,103 @@
+/**
+ * WaafiPay (Hosted Payment Page) request/response types.
+ *
+ * WaafiPay multiplexes every operation through a single `POST /asm` endpoint, discriminated by
+ * `serviceName`. We use the HPP family (`HPP_PURCHASE`, `HPP_GETTRANINFO`) which returns a hosted
+ * redirect URL and supports webhooks — see docs/waffi/intro.md.
+ */
+
+/** Terminal/intermediate transaction states reported by Waafi (sync `state` / `HPP_GETTRANINFO`). */
+export type WaafiState =
+  | 'APPROVED'
+  | 'DECLINED'
+  | 'FAILED'
+  | 'CANCELED'
+  | 'EXPIRED'
+  | 'TIMEOUT'
+  | string;
+
+/** Common request envelope shared by every `/asm` call. */
+export interface WaafiRequestEnvelope<TServiceParams> {
+  schemaVersion: '1.0';
+  requestId: string;
+  timestamp: string;
+  channelName: 'WEB';
+  serviceName: string;
+  serviceParams: TServiceParams;
+}
+
+/** Common response envelope. `responseCode === '2001'` means the request was processed (not paid). */
+export interface WaafiResponseEnvelope<TParams> {
+  schemaVersion: string;
+  timestamp: string;
+  responseId: string;
+  responseCode: string;
+  errorCode: string;
+  responseMsg: string;
+  params?: TParams;
+}
+
+// --- HPP_PURCHASE -----------------------------------------------------------------------------
+
+export interface WaafiHppPurchaseServiceParams {
+  merchantUid: string;
+  storeId: string;
+  hppKey: string;
+  paymentMethod: string;
+  hppSuccessCallbackUrl: string;
+  hppFailureCallbackUrl: string;
+  /** Callback data format: 1 = POST, 2 = GET, 4 = Result Token. */
+  hppRespDataFormat: number;
+  /** Required for MWALLET_ACCOUNT — pre-fills (and locks) the payer's phone on the hosted page. */
+  payerInfo?: {
+    subscriptionId: string;
+  };
+  transactionInfo: {
+    referenceId: string;
+    amount: number;
+    currency: string;
+    description?: string;
+  };
+}
+
+export type WaafiHppPurchaseRequest = WaafiRequestEnvelope<WaafiHppPurchaseServiceParams>;
+
+export interface WaafiHppPurchaseParams {
+  hppUrl: string;
+  directPaymentLink?: string;
+  orderId: string;
+  referenceId: string;
+}
+
+export type WaafiHppPurchaseResponse = WaafiResponseEnvelope<WaafiHppPurchaseParams>;
+
+// --- HPP_GETTRANINFO --------------------------------------------------------------------------
+
+export interface WaafiGetTranInfoServiceParams {
+  merchantUid: string;
+  storeId: string;
+  hppKey: string;
+  /** Either the merchant referenceId or the Waafi transactionId may be supplied. */
+  referenceId?: string;
+  transactionId?: string;
+}
+
+export type WaafiGetTranInfoRequest = WaafiRequestEnvelope<WaafiGetTranInfoServiceParams>;
+
+export interface WaafiGetTranInfoParams {
+  tranStatusDesc?: string;
+  amount?: string;
+  payerId?: string;
+  paymentMethod?: string;
+  description?: string;
+  tranDate?: string;
+  currency?: string;
+  invoiceId?: string;
+  referenceId?: string;
+  tranAmount?: string;
+  transactionId?: string;
+  tranStatusId?: string;
+  status?: WaafiState;
+}
+
+export type WaafiGetTranInfoResponse = WaafiResponseEnvelope<WaafiGetTranInfoParams>;
diff --git a/packages/payment-providers/src/webhooks/waafi-webhook.types.ts b/packages/payment-providers/src/webhooks/waafi-webhook.types.ts
index 247c46d40..658b293cd 100644
--- a/packages/payment-providers/src/webhooks/waafi-webhook.types.ts
+++ b/packages/payment-providers/src/webhooks/waafi-webhook.types.ts
@@ -1,15 +1,66 @@
-export interface WaafiWebhookPayload {
-  schemaVersion: string;
-  requestId: string;
-  timestamp: string;
-  eventType: string;
-  params: {
-    state: string;
-    referenceId: string;
-    transactionId: string;
-    amount: number;
-    currency: string;
-    description?: string;
-  };
-  signature?: string;
+/**
+ * WaafiPay webhook payloads (HPP authorization / refund / test).
+ *
+ * Webhooks are HMAC-SHA256 signed over `{timestamp}.{event_id}.{raw_body}` except `webhook.test`,
+ * which is unsigned and only sent to validate endpoint reachability. See docs/waffi/intro.md.
+ */
+
+export type WaafiWebhookEvent = 'authorization' | 'refund' | 'webhook.test';
+
+export type WaafiWebhookStatus =
+  | 'APPROVED'
+  | 'FAILED'
+  | 'DECLINED'
+  | 'CANCELED'
+  | 'EXPIRED'
+  | 'TIMEOUT'
+  | string;
+
+/** Headers Waafi sends alongside signed webhooks (lowercased, as exposed by NestJS). */
+export interface WaafiWebhookHeaders {
+  'x-webhook-timestamp'?: string;
+  'x-webhook-event-id'?: string;
+  'x-webhook-signature'?: string;
+  'x-webhook-signature-alg'?: string;
 }
+
+/** Nested payment object present on `authorization` and `refund` events. */
+export interface WaafiWebhookPayment {
+  transaction_id: string;
+  /** Present on authorization events (optional). */
+  order_id?: string;
+  transfer_code: string;
+  amount: number;
+  currency: string;
+  /** Present on authorization events. */
+  payment_method?: string;
+  status: WaafiWebhookStatus;
+  /** Our merchantOrderId. */
+  reference_id: string;
+  /** Present on authorization events. */
+  channel?: string;
+  description?: string;
+  date: string;
+}
+
+/** Unsigned validation ping sent on webhook registration/update. */
+export interface WaafiWebhookTestPayload {
+  event: 'webhook.test';
+  message?: string;
+  merchant_uid: string;
+}
+
+/** Real transaction notification (authorization or refund). */
+export interface WaafiWebhookTransactionPayload {
+  event: 'authorization' | 'refund';
+  merchant_id: number;
+  merchant_uid: string;
+  user_id: string;
+  /** Authorization only. */
+  customer_identity?: string;
+  /** Authorization only (optional). */
+  cardholder_name?: string;
+  payment: WaafiWebhookPayment;
+}
+
+export type WaafiWebhookPayload = WaafiWebhookTestPayload | WaafiWebhookTransactionPayload;
diff --git a/packages/types/src/common/index.ts b/packages/types/src/common/index.ts
index 4ccd3dca3..317898d80 100644
--- a/packages/types/src/common/index.ts
+++ b/packages/types/src/common/index.ts
@@ -1,4 +1,5 @@
 export * from "./payments";
+export * from "./payment-messaging";
 
 export interface BaseEntity {
   id: string;
diff --git a/packages/types/src/common/payment-messaging.ts b/packages/types/src/common/payment-messaging.ts
new file mode 100644
index 000000000..ea9794e2b
--- /dev/null
+++ b/packages/types/src/common/payment-messaging.ts
@@ -0,0 +1,55 @@
+/* ------------------------------------------------------------------------------------------------
+ * Payment event messaging contract (RabbitMQ)
+ *
+ * The single source of truth for the broker topology shared between the payment microservice
+ * (publisher) and the domain apps (consumers). Both sides import these constants/helpers so the
+ * exchange name, routing keys, and queue names can never drift apart.
+ *
+ * Topology (see docs/payment-service/rabbitmq/):
+ *   exchange  payment.events       (topic, durable)   ← every payment event is published here
+ *   exchange  payment.events.dlx   (topic, durable)   ← dead-letter for events a consumer rejects
+ *   routing   payment.<service>.<outcome>             e.g. payment.passenger.succeeded
+ *   queue     <service>.payment-events                bound to payment.<service>.*
+ *   queue     <service>.payment-events.dlq            dead-letter queue (bound on the dlx)
+ * ---------------------------------------------------------------------------------------------- */
+
+import { PaymentEventType, PaymentService } from "./payments";
+
+/** Topic exchange every payment event is published to. */
+export const PAYMENT_EVENTS_EXCHANGE = "payment.events";
+
+/** Dead-letter exchange for payment events a consumer could not process (poison messages). */
+export const PAYMENT_EVENTS_DLX = "payment.events.dlx";
+
+/**
+ * Routing key for a payment event: `payment.<service>.<outcome>`.
+ * e.g. `payment.passenger.succeeded`, `payment.freight.failed`.
+ */
+export function paymentRoutingKey(
+  service: PaymentService,
+  eventType: PaymentEventType,
+): string {
+  // "payment.succeeded" -> "succeeded", "payment.failed" -> "failed"
+  const outcome = eventType.split(".")[1];
+  return `payment.${service.toLowerCase()}.${outcome}`;
+}
+
+/** Binding pattern a service's queue uses so it receives only its own events. */
+export function paymentServiceBindingPattern(service: PaymentService): string {
+  return `payment.${service.toLowerCase()}.*`;
+}
+
+/** Durable queue names per owning service: the main work queue and its dead-letter queue. */
+export const PAYMENT_QUEUES: Record<
+  PaymentService,
+  { main: string; dlq: string }
+> = {
+  [PaymentService.PASSENGER]: {
+    main: "passenger.payment-events",
+    dlq: "passenger.payment-events.dlq",
+  },
+  [PaymentService.FREIGHT]: {
+    main: "freight.payment-events",
+    dlq: "freight.payment-events.dlq",
+  },
+};
diff --git a/packages/types/src/common/payments.ts b/packages/types/src/common/payments.ts
index 66a6dead3..02930d151 100644
--- a/packages/types/src/common/payments.ts
+++ b/packages/types/src/common/payments.ts
@@ -43,8 +43,17 @@ export interface ProviderInitiationInput {
   amountMinor: number;
   currency: string;
   platform?: PaymentPlatform;
-  returnUrl?: string
-  redirectUrl?: string
+  /**
+   * Payer account identifier (e.g. mobile-wallet MSISDN in full international format).
+   * Optional and provider-specific: some wallet providers (e.g. Waafi HPP with
+   * MWALLET_ACCOUNT) require the payer's phone number up front to pre-fill the hosted page.
+   */
+  payerAccount?: string;
+  /** Optional caller-supplied redirect targets for redirect/HPP-style providers. */
+  returnUrl?: string;
+  redirectUrl?: string;
+  /** Where the browser lands when the hosted page fails/cancels (UX only — never trusted). */
+  failureUrl?: string;
 }
 
 export interface ProviderInitiationResult {
@@ -67,3 +76,103 @@ export interface PaymentProvider {
   initiate(input: ProviderInitiationInput): Promise<ProviderInitiationResult>;
   queryStatus(merchantOrderId: string): Promise<ProviderStatus>;
 }
+
+/* ------------------------------------------------------------------------------------------------
+ * Payment microservice contracts (docs/payment-service)
+ *
+ * Shared shapes exchanged between the payment microservice (apps/edr-payment-api) and the
+ * domain apps (passenger/freight). Both sides import these so the wire format cannot drift.
+ * ---------------------------------------------------------------------------------------------- */
+
+/** Which domain app owns the order being paid for. Routing discriminator on every intent. */
+export enum PaymentService {
+  PASSENGER = "PASSENGER",
+  FREIGHT = "FREIGHT",
+}
+
+/** What kind of domain order the intent references (soft reference — never a cross-schema FK). */
+export enum PaymentReferenceType {
+  BOOKING = "BOOKING",
+  SHIPMENT = "SHIPMENT",
+}
+
+
+/** Body of `POST /payments/initiate` on the payment service (internal, service-authenticated). */
+export interface InitiatePaymentRequest {
+  service: PaymentService;
+  referenceType: PaymentReferenceType;
+  /** Domain order id (booking/shipment id). Soft reference; the app has already validated it. */
+  referenceId: string;
+  /** Human-readable order ref (e.g. booking ref) shown on provider pages. Defaults to referenceId. */
+  orderRef?: string;
+  /** App-asserted authoritative amount in minor units (computed server-side by the domain app). */
+  amountMinor: number;
+  currency: string;
+  provider: ProviderMethod;
+  platform?: PaymentPlatform;
+  payerAccount?: string;
+  /**
+   * Where the provider's hosted page sends the BROWSER back after success — each calling app
+   * passes its own UI URL (passenger portal vs freight portal). Per-transaction and UX-only:
+   * the redirect never confirms payment (only the webhook / status query does), so per-app
+   * values are safe even though the server-to-server webhook URL is one per merchant.
+   * Falls back to the payment service's provider config when omitted.
+   */
+  returnUrl?: string;
+  /** Failure/cancel counterpart of returnUrl. */
+  failureUrl?: string;
+  /** Optional caller key to dedupe retried initiations beyond the per-reference upsert. */
+  idempotencyKey?: string;
+}
+
+/** Response of `POST /payments/initiate` and shape of intent lookups. */
+export interface PaymentIntentSnapshot {
+  intentId: string;
+  service: PaymentService;
+  referenceType: PaymentReferenceType;
+  referenceId: string;
+  merchantOrderId: string;
+  provider: ProviderMethod;
+  status: ProviderPaymentStatus;
+  amountMinor: number;
+  currency: string;
+  clientAction?: ClientAction;
+  providerTxnId?: string;
+  paidAt?: string;
+  failureCode?: string;
+  failureMessage?: string;
+  expiresAt?: string;
+}
+
+export type PaymentEventType = "payment.succeeded" | "payment.failed";
+
+/** Versioned envelope delivered (at-least-once) to the owning app's mark-paid consumer. */
+interface PaymentEventBase {
+  version: 1;
+  /** Outbox row id — stable across redeliveries; consumers may use it as a dedupe key. */
+  eventId: string;
+  eventType: PaymentEventType;
+  occurredAt: string;
+  service: PaymentService;
+  intentId: string;
+  referenceType: PaymentReferenceType;
+  referenceId: string;
+  merchantOrderId: string;
+  provider: ProviderMethod;
+  amountMinor: number;
+  currency: string;
+}
+
+export interface PaymentSucceededEvent extends PaymentEventBase {
+  eventType: "payment.succeeded";
+  providerTxnId?: string;
+  paidAt: string;
+}
+
+export interface PaymentFailedEvent extends PaymentEventBase {
+  eventType: "payment.failed";
+  failureCode?: string;
+  failureMessage?: string;
+}
+
+export type PaymentEvent = PaymentSucceededEvent | PaymentFailedEvent;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f918ecee4..2a575609c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -780,12 +780,12 @@ importers:
 
   apps/edr-passenger-api:
     dependencies:
-      '@edr/payment-providers':
-        specifier: workspace:*
-        version: link:../../packages/payment-providers
       '@edr/types':
         specifier: workspace:*
         version: link:../../packages/types
+      '@golevelup/nestjs-rabbitmq':
+        specifier: ^5.5.0
+        version: 5.7.0(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       '@nestjs/axios':
         specifier: ^4.0.1
         version: 4.0.1(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(axios@1.17.0)(rxjs@7.8.2)
@@ -1060,6 +1060,115 @@ importers:
         specifier: ^5.5.4
         version: 5.9.3
 
+  apps/edr-payment-api:
+    dependencies:
+      '@edr/api-common':
+        specifier: workspace:*
+        version: link:../../packages/api-common
+      '@edr/payment-providers':
+        specifier: workspace:*
+        version: link:../../packages/payment-providers
+      '@edr/types':
+        specifier: workspace:*
+        version: link:../../packages/types
+      '@golevelup/nestjs-rabbitmq':
+        specifier: ^5.5.0
+        version: 5.7.0(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/axios':
+        specifier: ^4.0.1
+        version: 4.0.1(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(axios@1.17.0)(rxjs@7.8.2)
+      '@nestjs/common':
+        specifier: ^11.0.0
+        version: 11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/config':
+        specifier: ^4.0.0
+        version: 4.0.4(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(rxjs@7.8.2)
+      '@nestjs/core':
+        specifier: ^11.0.0
+        version: 11.1.24(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/microservices@11.1.24)(@nestjs/platform-express@11.1.24)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/platform-express':
+        specifier: ^11.0.0
+        version: 11.1.24(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)
+      '@nestjs/schedule':
+        specifier: ^6.0.0
+        version: 6.1.3(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)
+      '@nestjs/swagger':
+        specifier: ^11.4.2
+        version: 11.4.4(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)
+      '@nestjs/typeorm':
+        specifier: ^11.0.1
+        version: 11.0.1(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)(reflect-metadata@0.2.2)(rxjs@7.8.2)(typeorm@0.3.30(babel-plugin-macros@3.1.0)(pg@8.21.0)(ts-node@10.9.2(@types/node@20.19.42)(typescript@5.9.3)))
+      axios:
+        specifier: ^1.16.1
+        version: 1.17.0
+      class-transformer:
+        specifier: ^0.5.1
+        version: 0.5.1
+      class-validator:
+        specifier: ^0.14.1
+        version: 0.14.4
+      dotenv:
+        specifier: ^17.4.2
+        version: 17.4.2
+      pg:
+        specifier: ^8.13.0
+        version: 8.21.0
+      reflect-metadata:
+        specifier: ^0.2.2
+        version: 0.2.2
+      rxjs:
+        specifier: ^7.8.1
+        version: 7.8.2
+      typeorm:
+        specifier: 0.3.30
+        version: 0.3.30(babel-plugin-macros@3.1.0)(pg@8.21.0)(ts-node@10.9.2(@types/node@20.19.42)(typescript@5.9.3))
+    devDependencies:
+      '@edr/eslint-config':
+        specifier: workspace:*
+        version: link:../../packages/config/eslint-config
+      '@edr/tsconfig':
+        specifier: workspace:*
+        version: link:../../packages/config/tsconfig
+      '@nestjs/cli':
+        specifier: ^11.0.0
+        version: 11.0.21(@types/node@20.19.42)(prettier@3.8.3)
+      '@nestjs/schematics':
+        specifier: ^11.0.0
+        version: 11.1.0(chokidar@4.0.3)(prettier@3.8.3)(typescript@5.9.3)
+      '@nestjs/testing':
+        specifier: ^11.0.0
+        version: 11.1.24(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)(@nestjs/microservices@11.1.24)(@nestjs/platform-express@11.1.24)
+      '@types/express':
+        specifier: ^5.0.0
+        version: 5.0.6
+      '@types/jest':
+        specifier: ^29.5.13
+        version: 29.5.14
+      '@types/node':
+        specifier: ^20.14.0
+        version: 20.19.42
+      '@types/pg':
+        specifier: ^8.6.7
+        version: 8.20.0
+      jest:
+        specifier: ^29.7.0
+        version: 29.7.0(@types/node@20.19.42)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.42)(typescript@5.9.3))
+      ts-jest:
+        specifier: ^29.2.5
+        version: 29.4.11(@babel/core@7.29.7)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.29.7))(jest-util@29.7.0)(jest@29.7.0(@types/node@20.19.42)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.42)(typescript@5.9.3)))(typescript@5.9.3)
+      ts-loader:
+        specifier: ^9.5.1
+        version: 9.6.0(loader-utils@1.4.2)(typescript@5.9.3)(webpack@5.106.0)
+      ts-node:
+        specifier: ^10.9.2
+        version: 10.9.2(@types/node@20.19.42)(typescript@5.9.3)
+      tsconfig-paths:
+        specifier: ^4.2.0
+        version: 4.2.0
+      typescript:
+        specifier: ^5.5.4
+        version: 5.9.3
+
   packages/api-common:
     dependencies:
       '@edr/types':
@@ -2078,6 +2187,20 @@ packages:
   '@gilbarbara/deep-equal@0.3.1':
     resolution: {integrity: sha512-I7xWjLs2YSVMc5gGx1Z3ZG1lgFpITPndpi8Ku55GeEIKpACCPQNS/OTqQbxgTCfq0Ncvcc+CrFov96itVh6Qvw==}
 
+  '@golevelup/nestjs-discovery@4.0.3':
+    resolution: {integrity: sha512-8w3CsXHN7+7Sn2i419Eal1Iw/kOjAd6Kb55M/ZqKBBwACCMn4WiEuzssC71LpBMI1090CiDxuelfPRwwIrQK+A==}
+    peerDependencies:
+      '@nestjs/common': ^10.x || ^11.0.0
+      '@nestjs/core': ^10.x || ^11.0.0
+
+  '@golevelup/nestjs-rabbitmq@5.7.0':
+    resolution: {integrity: sha512-0j+r+Fg515UCJUds8irkTpQwps0LVGnEP1aLGr4VDflGdr1jmvVkFukfUtpa/cMuKC9vFe2v1LBe/D584Vpobg==}
+    peerDependencies:
+      '@nestjs/common': ^10.x || ^11.0.0
+      '@nestjs/core': ^10.x || ^11.0.0
+      reflect-metadata: ^0.2.2
+      rxjs: ^7.x
+
   '@hello-pangea/dnd@18.0.1':
     resolution: {integrity: sha512-xojVWG8s/TGrKT1fC8K2tIWeejJYTAeJuj36zM//yEm/ZrnZUSFGS15BpO+jGZT1ybWvyXmeDJwPYb4dhWlbZQ==}
     peerDependencies:
@@ -5698,12 +5821,22 @@ packages:
     resolution: {integrity: sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==}
     engines: {node: '>=0.10.0'}
 
+  amqp-connection-manager@4.1.15:
+    resolution: {integrity: sha512-YGi8MuO2K4u0qC4b1qAKVIK8CdBJF+PpEZpHKxmrL3x61pU1sAb2SHzQl7ypoqr6oECIfVqtG9DGdOZxaUq1Wg==}
+    engines: {node: '>=10.0.0', npm: '>5.0.0'}
+    peerDependencies:
+      amqplib: '*'
+
   amqp-connection-manager@5.0.0:
     resolution: {integrity: sha512-88yQzqa5RSBgnLl504XjvCQJ7d+osskdwvg35Lwm1LRbfLjNU9p7SQUMSP82BB7mseiq9tIUPJ3HE3eXQbpjEw==}
     engines: {node: '>=10.0.0', npm: '>5.0.0'}
     peerDependencies:
       amqplib: '*'
 
+  amqplib@0.10.9:
+    resolution: {integrity: sha512-jwSftI4QjS3mizvnSnOrPGYiUnm1vI2OP1iXeOUz5pb74Ua0nbf6nPyyTzuiCLEE3fMpaJORXh2K/TQ08H5xGA==}
+    engines: {node: '>=10'}
+
   amqplib@2.0.1:
     resolution: {integrity: sha512-a3P2MgfCf9nzVis12VxWEn0dS6hcqve7dlEAhXDtIWR27BlhtMkILOc+H9aeHjDi6i6r94dYKc2Kx2OFe3avvg==}
     engines: {node: '>=18'}
@@ -6363,6 +6496,9 @@ packages:
   buffer-indexof@1.1.1:
     resolution: {integrity: sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==}
 
+  buffer-more-ints@1.0.0:
+    resolution: {integrity: sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==}
+
   buffer-xor@1.0.3:
     resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==}
 
@@ -14677,6 +14813,23 @@ snapshots:
 
   '@gilbarbara/deep-equal@0.3.1': {}
 
+  '@golevelup/nestjs-discovery@4.0.3(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)':
+    dependencies:
+      '@nestjs/common': 11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.24(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/microservices@11.1.24)(@nestjs/platform-express@11.1.24)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      lodash: 4.18.1
+
+  '@golevelup/nestjs-rabbitmq@5.7.0(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
+    dependencies:
+      '@golevelup/nestjs-discovery': 4.0.3(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.24)
+      '@nestjs/common': 11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.24(@nestjs/common@11.1.24(class-transformer@0.5.1)(class-validator@0.14.4)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/microservices@11.1.24)(@nestjs/platform-express@11.1.24)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      amqp-connection-manager: 4.1.15(amqplib@0.10.9)
+      amqplib: 0.10.9
+      lodash: 4.18.1
+      reflect-metadata: 0.2.2
+      rxjs: 7.8.2
+
   '@hello-pangea/dnd@18.0.1(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@babel/runtime': 7.29.7
@@ -20326,11 +20479,21 @@ snapshots:
       longest: 1.0.1
       repeat-string: 1.6.1
 
+  amqp-connection-manager@4.1.15(amqplib@0.10.9):
+    dependencies:
+      amqplib: 0.10.9
+      promise-breaker: 6.0.0
+
   amqp-connection-manager@5.0.0(amqplib@2.0.1):
     dependencies:
       amqplib: 2.0.1
       promise-breaker: 6.0.0
 
+  amqplib@0.10.9:
+    dependencies:
+      buffer-more-ints: 1.0.0
+      url-parse: 1.5.10
+
   amqplib@2.0.1: {}
 
   ansi-bgblack@0.1.1:
@@ -21140,6 +21303,8 @@ snapshots:
 
   buffer-indexof@1.1.1: {}
 
+  buffer-more-ints@1.0.0: {}
+
   buffer-xor@1.0.3: {}
 
   buffer@4.9.2:
diff --git a/scripts/deploy/sync-env-from-server.sh b/scripts/deploy/sync-env-from-server.sh
index a0618982c..802793b6e 100644
--- a/scripts/deploy/sync-env-from-server.sh
+++ b/scripts/deploy/sync-env-from-server.sh
@@ -30,6 +30,7 @@ declare -A SERVICE_ENV_TARGET=(
   ["passenger-api"]="apps/edr-passenger-api/.env"
   ["passenger-portal"]="apps/edr-passenger-web/portal/.env"
   ["passenger-backoffice"]="apps/edr-passenger-web/backoffice/.env"
+  ["payment-api"]="apps/edr-payment-api/.env"
 )
 
 for service in "$@"; do
@@ -60,6 +61,10 @@ for service in "$@"; do
     service_var=$(echo "${service}" | tr '[:lower:]-' '[:upper:]_')
     echo "${service_var}_PORT=${port_value}" >> "${GITHUB_ENV}"
     echo "Exported ${service_var}_PORT from ${src}"
+
+    # Forward NEXT_PUBLIC_* vars so docker compose build can inject them as build args.
+    grep -E '^[[:space:]]*NEXT_PUBLIC_[A-Za-z0-9_]+=' "${src}" \
+      | sed -E 's/^[[:space:]]*//' >> "${GITHUB_ENV}" || true
   fi
 done