diff --git a/.docker/Dockerfile b/.docker/Dockerfile
new file mode 100644
index 0000000..51cad16
--- /dev/null
+++ b/.docker/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.11
+ENV PYTHONUNBUFFERED=1
+WORKDIR /app
+
+COPY requirements.txt /app
+RUN pip install -r requirements.txt
+
+COPY . .
+EXPOSE 8000
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
\ No newline at end of file
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
new file mode 100644
index 0000000..36a6b47
--- /dev/null
+++ b/.docker/docker-compose.yml
@@ -0,0 +1,27 @@
+name: food_helper
+services:
+  app:
+    build:
+      context: ../
+      dockerfile: .docker/Dockerfile
+    container_name: web-app
+    ports:
+      - "8000:8000"
+    depends_on:
+      db:
+        condition:
+          service_healthy
+    volumes:
+      - .:/usr/app
+  db:
+    image: postgres
+    container_name: postgres_db
+    environment:
+      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    healthcheck:
+      test: ['CMD', "pg_isready", "-U", "postgres"]
+      interval: 5s
+      timeout: 30s
+      retries: 6
diff --git a/food_helper/settings.py b/food_helper/settings.py
index 5eb4922..bf6682f 100644
--- a/food_helper/settings.py
+++ b/food_helper/settings.py
@@ -105,7 +105,8 @@
             "NAME": env("DB_NAME"),
             "USER": env("DB_USER"),
             "PASSWORD": env("DB_PASSWORD"),
-            "HOST": env("DB_HOST"),
+            "HOST": env("DB_HOST"), # localhost db
+            # "HOST": "db", docker db
             "PORT": env("DB_PORT"),
         }
     }