diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..3565f85c2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+frontend/.env.local
\ No newline at end of file
diff --git a/backend/Dockerfile b/backend/Dockerfile
new file mode 100644
index 000000000..05dff231b
--- /dev/null
+++ b/backend/Dockerfile
@@ -0,0 +1,13 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+COPY requirements.txt .
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY app/ app/
+
+EXPOSE 8000
+
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..4d585a3e2
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,16 @@
+version: "3.9"
+
+services:
+  backend:
+    build: ./backend
+    container_name: backend
+    ports:
+      - "8000:8000"
+
+  frontend:
+    build: ./frontend
+    container_name: frontend
+    ports:
+      - "3000:3000"
+    depends_on:
+      - backend
\ No newline at end of file
diff --git a/frontend/.env.local b/frontend/.env.local
deleted file mode 100644
index 600de8dfe..000000000
--- a/frontend/.env.local
+++ /dev/null
@@ -1 +0,0 @@
-NEXT_PUBLIC_API_URL=http://localhost:8000
diff --git a/frontend/dockerfile b/frontend/dockerfile
new file mode 100644
index 000000000..4d58da459
--- /dev/null
+++ b/frontend/dockerfile
@@ -0,0 +1,13 @@
+FROM node:18-alpine
+
+WORKDIR /app
+
+COPY package*.json ./
+
+RUN npm install
+
+COPY . .
+
+EXPOSE 3000
+
+CMD ["npm", "run", "dev"]
\ No newline at end of file