diff --git a/.env.docker b/.env.docker
new file mode 100644
index 0000000..bf24195
--- /dev/null
+++ b/.env.docker
@@ -0,0 +1,26 @@
+# ============================================
+# Docker / Production Environment
+# ============================================
+# Update NEXTAUTH_URL with your server IP or domain
+NEXTAUTH_URL="http://192.168.1.190:3000"
+
+# ============================================
+# AI Provider Configuration
+# ============================================
+AI_PROVIDER=ollama
+OLLAMA_API_URL="http://ollama:11434"
+
+# ============================================
+# Email Configuration (Optional)
+# ============================================
+# Uncomment and configure for email features
+# SMTP_HOST="smtp.gmail.com"
+# SMTP_PORT="587"
+# SMTP_USER="your-email@gmail.com"
+# SMTP_PASS="your-app-password"
+# SMTP_FROM="noreply@memento.app"
+
+# ============================================
+# OpenAI (Optional)
+# ============================================
+# OPENAI_API_KEY="sk-..."
diff --git a/.env.docker.example b/.env.docker.example
new file mode 100644
index 0000000..658d282
--- /dev/null
+++ b/.env.docker.example
@@ -0,0 +1,33 @@
+# ============================================
+# Docker / Production Environment Template
+# ============================================
+# Copy this file to .env.docker and update with your server IP/domain
+
+# IMPORTANT: Update NEXTAUTH_URL with your server IP or domain name
+# Examples:
+# - IP: NEXTAUTH_URL="http://192.168.1.190:3000"
+# - Domain: NEXTAUTH_URL="http://your-domain.com"
+# - HTTPS: NEXTAUTH_URL="https://your-domain.com"
+
+NEXTAUTH_URL="http://YOUR_SERVER_IP:3000"
+
+# ============================================
+# AI Provider Configuration
+# ============================================
+AI_PROVIDER=ollama
+OLLAMA_API_URL="http://ollama:11434"
+
+# ============================================
+# Email Configuration (Optional)
+# ============================================
+# Uncomment and configure for email features (password reset, reminders)
+# SMTP_HOST="smtp.gmail.com"
+# SMTP_PORT="587"
+# SMTP_USER="your-email@gmail.com"
+# SMTP_PASS="your-app-password"
+# SMTP_FROM="noreply@memento.app"
+
+# ============================================
+# OpenAI (Optional - for GPT models)
+# ============================================
+# OPENAI_API_KEY="sk-..."
diff --git a/.env.example b/.env.example
index 83bceb6..7fc91ba 100644
--- a/.env.example
+++ b/.env.example
@@ -8,6 +8,8 @@ DATABASE_URL="file:/app/prisma/dev.db"
 # ============================================
 # Generate with: openssl rand -base64 32
 NEXTAUTH_SECRET="change-this-to-a-random-string-at-least-32-characters-long"
+# For local development: NEXTAUTH_URL="http://localhost:3000"
+# For Docker/Production: NEXTAUTH_URL="http://YOUR_SERVER_IP:3000"
 NEXTAUTH_URL="http://localhost:3000"
 
 # ============================================
diff --git a/docker-compose.yml b/docker-compose.yml
index 9745a4b..5d7788a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
       context: ./keep-notes
       dockerfile: Dockerfile
     container_name: memento-web
+    env_file:
+      - .env.docker
     ports:
       - "3000:3000"
     environment: