diff --git a/Dockerfile b/Dockerfile
index 916b36a..db651a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm ci
 
-# Copy source and build frontend
+# Copy source and build (frontend and server)
 COPY . .
 RUN npm run build
 
@@ -27,12 +27,12 @@ RUN npm ci --omit=dev
 
 # Copy built assets and server
 COPY --from=build /app/dist ./dist
-COPY --from=build /app/server.ts ./
+COPY --from=build /app/dist-server/server.js ./server.js
 
 # Ensure archives directory exists
 RUN mkdir -p /archives
 
 EXPOSE 3000
 
-# Start server using tsx
-CMD ["npx", "tsx", "server.ts"]
+# Start server
+CMD ["node", "server.js"]
diff --git a/package.json b/package.json
index 24d0adc..f701a65 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "react-example",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "scripts": {
     "dev": "vite --port=3000 --host=0.0.0.0",
-    "build": "vite build",
+    "build": "vite build && npm run build:server",
+    "build:server": "tsc server.ts --esModuleInterop --module ESNext --target ES2022 --moduleResolution bundler --outDir dist-server",
     "preview": "vite preview",
     "server": "tsx server.ts",
     "clean": "rm -rf dist",
diff --git a/server.ts b/server.ts
index 48ed45a..5cfdd3c 100644
--- a/server.ts
+++ b/server.ts
@@ -11,12 +11,18 @@ const __dirname = path.dirname(__filename);
 
 const app = express();
 const PORT = process.env.PORT || 3001;
-const ARCHIVES_DIR = process.env.ARCHIVES_DIR || path.join(__dirname, '_sample-archives');
+const ARCHIVES_DIR = path.resolve(process.env.ARCHIVES_DIR || path.join(__dirname, '_sample-archives'));
+
+console.log(`[Server] Initializing...`);
+console.log(`[Server] Environment ARCHIVES_DIR: ${process.env.ARCHIVES_DIR}`);
+console.log(`[Server] Resolved ARCHIVES_DIR: ${ARCHIVES_DIR}`);
 
 // Ensure archives directory exists
 if (!fs.existsSync(ARCHIVES_DIR)) {
-  console.warn(`Warning: Archives directory not found at ${ARCHIVES_DIR}. Creating it...`);
+  console.warn(`[Server] Warning: Archives directory not found at ${ARCHIVES_DIR}. Creating it...`);
   fs.mkdirSync(ARCHIVES_DIR, { recursive: true });
+} else {
+  console.log(`[Server] Archives directory exists.`);
 }
 
 app.use(express.json());
@@ -24,13 +30,21 @@ app.use(express.json());
 // API: List archives (subdirectories in ARCHIVES_DIR)
 app.get('/api/archives', (req, res) => {
   try {
+    console.log(`[API] Listing archives from ${ARCHIVES_DIR}...`);
     const items = fs.readdirSync(ARCHIVES_DIR, { withFileTypes: true });
+    console.log(`[API] Found ${items.length} total items in archives directory.`);
+    
     const archives = items
-      .filter(item => item.isDirectory())
+      .filter(item => {
+        const isDir = item.isDirectory();
+        if (!isDir) console.log(`[API] Skipping non-directory: ${item.name}`);
+        return isDir;
+      })
       .map(item => {
         // Try to find a profile pic or first image for the thumbnail
         const archivePath = path.join(ARCHIVES_DIR, item.name);
         const files = fs.readdirSync(archivePath);
+        console.log(`[API] Found archive: ${item.name} (${files.length} files)`);
         
         let thumbnail = '';
         const profilePic = files.find(f => f.toLowerCase().includes('_profile_pic.jpg') || f.toLowerCase() === `${item.name.toLowerCase()}.jpg`);
@@ -48,9 +62,11 @@ app.get('/api/archives', (req, res) => {
           fileCount: files.length
         };
       });
+    
+    console.log(`[API] Returning ${archives.length} validated archives.`);
     res.json(archives);
   } catch (err) {
-    console.error('Error listing archives:', err);
+    console.error('[API] Error listing archives:', err);
     res.status(500).json({ error: 'Failed to list archives' });
   }
 });