diff --git a/server/src/app.ts b/server/src/app.ts
index 589495c..2b4e000 100644
--- a/server/src/app.ts
+++ b/server/src/app.ts
@@ -1,6 +1,9 @@
 import express from 'express';
 import cors from 'cors';
+import path from 'path';
+import { fileURLToPath } from 'url';
 import { errorHandler } from './middleware/errorHandler.js';
+import { env } from './config/env.js';
 
 // Routes
 import authRoutes from './modules/auth/auth.routes.js';
@@ -13,11 +16,14 @@ import reservationRoutes from './modules/reservation/reservation.routes.js';
 import billboardRoutes from './modules/billboard/billboard.routes.js';
 import paymentRoutes from './modules/payment/payment.routes.js';
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const app = express();
 
 // Middleware
 app.use(cors({
-  origin: ['http://localhost:5173', 'http://localhost:3000'],
+  origin: env.NODE_ENV === 'production'
+    ? true  // same-origin in production
+    : ['http://localhost:5173', 'http://localhost:3000'],
   credentials: true,
 }));
 app.use(express.json());
@@ -38,6 +44,20 @@ app.get('/api/health', (_req, res) => {
   res.json({ status: 'ok', timestamp: new Date().toISOString() });
 });
 
+// ─── Static files (production) ───────────────────────
+// In Docker, client dist is at /app/public
+// Locally after build, resolve relative to compiled output
+const publicDir = path.resolve(__dirname, '../public');
+app.use(express.static(publicDir));
+
+// SPA fallback — serve index.html for all non-API routes
+app.get('*', (_req, res, next) => {
+  const indexPath = path.join(publicDir, 'index.html');
+  res.sendFile(indexPath, (err) => {
+    if (err) next(err);
+  });
+});
+
 // Error handler
 app.use(errorHandler);
 
diff --git a/version.json b/version.json
index 691ab8b..f145b3c 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
     "version":  "1.0.0",
-    "build":  "20260608-1548",
-    "buildDate":  "2026-06-08T15:48:03.9541198+07:00"
+    "build":  "20260608-1607",
+    "buildDate":  "2026-06-08T16:07:41.1459281+07:00"
 }
\ No newline at end of file