diff --git a/__Dockerfile b/Dockerfile
similarity index 59%
rename from __Dockerfile
rename to Dockerfile
index ced41c8..3a4aa46 100644
--- a/__Dockerfile
+++ b/Dockerfile
@@ -1,78 +1,67 @@
 # syntax=docker/dockerfile:1.7
-# Ultra-optimized Dockerfile - minimal runtime dependencies (no n8n packages)
+# Ultra-optimized Dockerfile for Railway - production, minimal dependencies
 
-# Stage 1: Builder (TypeScript compilation only)
+# Stage 1: Builder
 FROM node:20-alpine AS builder
 WORKDIR /app
 
-# Copy tsconfig for TypeScript compilation
 COPY tsconfig.json ./
 
-# Create minimal package.json and install ONLY build dependencies
 RUN --mount=type=cache,target=/root/.npm \
     echo '{}' > package.json && \
     npm install --no-save typescript@^5.8.3 @types/node@^22.15.30 @types/express@^5.0.3 \
         @modelcontextprotocol/sdk@^1.12.1 dotenv@^16.5.0 express@^5.1.0 axios@^1.10.0 \
         n8n-workflow@^1.96.0 uuid@^11.0.5 @types/uuid@^10.0.0
 
-# Copy source and build
 COPY src ./src
-# Note: src/n8n contains TypeScript types needed for compilation
-# These will be compiled but not included in runtime
 RUN npx tsc
 
-# Stage 2: Runtime (minimal dependencies)
+# Stage 2: Runtime
 FROM node:20-alpine AS runtime
 WORKDIR /app
 
-# Install only essential runtime tools
 RUN apk add --no-cache curl && \
     rm -rf /var/cache/apk/*
 
-# Copy runtime-only package.json
 COPY package.runtime.json package.json
 
-# Install runtime dependencies with cache mount
 RUN --mount=type=cache,target=/root/.npm \
     npm install --production --no-audit --no-fund
 
-# Copy built application
 COPY --from=builder /app/dist ./dist
 
-# Copy pre-built database and required files
-# Cache bust: 2025-07-06-trigger-fix-v3 - includes is_trigger=true for webhook,cron,interval,emailReadImap
 COPY data/nodes.db ./data/
 COPY src/database/schema-optimized.sql ./src/database/
 COPY .env.example ./
 
-# Copy entrypoint script
 COPY docker/docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
-# Add container labels
 LABEL org.opencontainers.image.source="https://github.com/czlonkowski/n8n-mcp"
 LABEL org.opencontainers.image.description="n8n MCP Server - Runtime Only"
 LABEL org.opencontainers.image.licenses="MIT"
 LABEL org.opencontainers.image.title="n8n-mcp"
 
-# Create non-root user
 RUN addgroup -g 1001 -S nodejs && \
     adduser -S nodejs -u 1001 && \
     chown -R nodejs:nodejs /app
 
-# Switch to non-root user
 USER nodejs
 
-# Set Docker environment flag
 ENV IS_DOCKER=true
 
-# Expose HTTP port
+# --- KEY Railway detail: EXPOSE 3000, but server MUST respect $PORT env var!
 EXPOSE 3000
 
-# Health check
+# Healthcheck (still port 3000 as default, but Railway sets $PORT!)
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD curl -f http://127.0.0.1:3000/health || exit 1
+  CMD curl -f http://127.0.0.1:${PORT:-3000}/health || exit 1
 
-# Optimized entrypoint
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD ["node", "dist/mcp/index.js"]
+# --- CMD: always run HTTP server (Railway expects an HTTP app)
+CMD ["node", "dist/mcp/index.js", "--http"]
+
+# Optionally, if your app doesn't already do this, make sure that dist/mcp/index.js
+# uses process.env.PORT for the HTTP server:
+#   const port = process.env.PORT || 3000;
+#   app.listen(port, ...)