diff --git a/TODO.md b/TODO.md
index 046e792..fa04e9d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -29,8 +29,8 @@
 - [x] Basic error handling + loading states
 
 ### DevOps
-- [ ] Create Dockerfile for backend
-- [ ] Create Dockerfile for frontend (nginx)
+- [x] Create Dockerfile for backend
+- [x] Create Dockerfile for frontend (nginx)
 - [ ] Write docker-compose.yml
 - [ ] Test local deployment
 
@@ -45,6 +45,30 @@
 ## ✅ Completed Tasks
 
 ### 2026-03-24
+- **Frontend Dockerfile implementation** (Iteration 15)
+  - Created multi-stage Dockerfile for frontend build and deployment
+  - Builder stage: Node.js 22 Alpine with npm ci, TypeScript compilation, Vite production build
+  - Production stage: nginx Alpine serving static assets from /usr/share/nginx/html
+  - Added nginx.conf with SPA routing (try_files fallback to index.html for React Router)
+  - Configured gzip compression for text files (HTML, CSS, JS, JSON)
+  - Added security headers (X-Frame-Options, X-Content-Type-Options, X-XSS-Protection)
+  - Implemented aggressive caching for static assets (1 year expiry with immutable flag)
+  - Created health check endpoint at /health for container orchestration
+  - Created frontend/.dockerignore to optimize build context (exclude node_modules, dist, tests, etc.)
+  - Added comprehensive documentation in docs/docker-frontend.md (build strategy, nginx config, optimization, deployment)
+  - Verified: npm run build succeeds (Docker build pending Docker availability in environment)
+  - Expected image size: ~50MB (nginx:alpine ~25MB + static assets ~25MB)
+
+- **Backend Dockerfile implementation** (Iteration 14)
+  - Created multi-stage Dockerfile using Node.js 22 Alpine for optimized image size
+  - Builder stage: npm ci, TypeScript compilation
+  - Production stage: production dependencies only, built JavaScript
+  - Included database schema file (schema.sql) required by migration script
+  - Created .dockerignore to exclude unnecessary files (node_modules, tests, frontend, docs)
+  - Added startup command that runs migrations then starts Express server
+  - Created documentation in docs/docker-backend.md with build/run instructions
+  - Verified: npm build succeeds, all 34 tests pass
+
 - **Error handling and toast notifications** (Iteration 13)
   - Created Toast component with slide-in animation for success/error/info/warning messages
   - Created useToast hook for managing toast notifications globally