diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..276a170
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,49 @@
+version: '3.8'
+
+services:
+  backend:
+    build:
+      context: ./backend
+      dockerfile: Dockerfile
+    container_name: family-hub-backend
+    ports:
+      - "8000:8000"
+    environment:
+      - DATABASE_URL=sqlite:///./family_hub.db
+      - SECRET_KEY=${SECRET_KEY:-your-secret-key-change-in-production}
+      - ALLOWED_ORIGINS=http://localhost:5173,http://localhost:3000
+      - DEBUG=True
+    volumes:
+      - ./backend:/app
+      - family-hub-data:/app/data
+    restart: unless-stopped
+    command: uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload
+    networks:
+      - family-hub-network
+
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    container_name: family-hub-frontend
+    ports:
+      - "5173:5173"
+    volumes:
+      - ./frontend:/app
+      - /app/node_modules
+    environment:
+      - VITE_API_URL=http://localhost:8000
+    depends_on:
+      - backend
+    restart: unless-stopped
+    command: npm run dev -- --host 0.0.0.0
+    networks:
+      - family-hub-network
+
+volumes:
+  family-hub-data:
+    driver: local
+
+networks:
+  family-hub-network:
+    driver: bridge