diff --git a/cognee-mcp/Dockerfile b/cognee-mcp/Dockerfile
index e229fb08a..4d7d455ee 100644
--- a/cognee-mcp/Dockerfile
+++ b/cognee-mcp/Dockerfile
@@ -1,13 +1,7 @@
 # Use a Python image with uv pre-installed
 FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim AS uv
 
-# Set build argument
-ARG DEBUG
-
-# Set environment variable based on the build argument
-ENV DEBUG=${DEBUG}
-ENV PIP_NO_CACHE_DIR=true
-
+# Install the project into `/app`
 WORKDIR /app
 
 # Enable bytecode compilation
@@ -16,20 +10,27 @@ ENV UV_COMPILE_BYTECODE=1
 # Copy from the cache instead of linking since it's a mounted volume
 ENV UV_LINK_MODE=copy
 
-RUN apt-get update && apt-get install -y \
-    gcc \
-    libpq-dev
+# Install the project's dependencies using the lockfile and settings
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    uv sync --frozen --no-install-project --no-dev --no-editable
 
-COPY . /app
+# Then, add the rest of the project source code and install it
+# Installing separately from its dependencies allows optimal layer caching
+ADD . /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --frozen --no-dev --no-editable
 
-RUN uv sync --reinstall
+FROM python:3.12-slim-bookworm
+
+WORKDIR /app
+ 
+COPY --from=uv /root/.local /root/.local
+COPY --from=uv --chown=app:app /app/.venv /app/.venv
+COPY --from=uv --chown=app:app /app/src /app/src
 
 # Place executables in the environment at the front of the path
-ENV PATH="/app:/app/.venv/bin:$PATH"
-
-# Set environment variables for MCP server
-ENV PYTHONUNBUFFERED=1
-ENV MCP_LOG_LEVEL=DEBUG
-ENV PYTHONPATH=/app
+ENV PATH="/app/.venv/bin:$PATH"
 
 ENTRYPOINT ["cognee"]