diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index aa9e06ba..00000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 23edfb83..cf64b957 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ nltk_data/
 
 # Debug logs
 logs/
+
+.DS_Store
diff --git a/docker/api.Dockerfile b/docker/api.Dockerfile
index 80709091..70edfece 100644
--- a/docker/api.Dockerfile
+++ b/docker/api.Dockerfile
@@ -11,6 +11,7 @@ WORKDIR /app
 # Copy only dependency files first for better caching
 COPY memora/pyproject.toml memora/README.md /app/memora/
 COPY memora/memora /app/memora/memora
+COPY memora/alembic /app/memora/alembic
 
 # Install uv for faster dependency installation
 RUN pip install --no-cache-dir uv
diff --git a/docker/control-plane.Dockerfile b/docker/control-plane.Dockerfile
index 55f035f4..55309122 100644
--- a/docker/control-plane.Dockerfile
+++ b/docker/control-plane.Dockerfile
@@ -5,14 +5,14 @@ FROM base AS deps
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
-COPY memora-control-plane/package.json memora-control-plane/package-lock.json ./
+COPY package.json package-lock.json ./
 RUN npm ci
 
 # Rebuild the source code only when needed
 FROM base AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
-COPY memora-control-plane/ .
+COPY . .
 
 RUN npm run build
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6897277f..e9617eb3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -37,7 +37,7 @@ services:
       postgres:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/"]
+      test: ["CMD", "curl", "-f", "http://localhost:8080/api/v1/agents"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/memora-control-plane/src/lib/api.ts b/memora-control-plane/src/lib/api.ts
index 2e831332..66814513 100644
--- a/memora-control-plane/src/lib/api.ts
+++ b/memora-control-plane/src/lib/api.ts
@@ -48,6 +48,7 @@ export class DataplaneClient {
     query: string;
     agent_id: string;
     thinking_budget?: number;
+    context?: string;
   }) {
     return this.fetchApi(`/api/think`, {
       method: 'POST',
diff --git a/memora/pyproject.toml b/memora/pyproject.toml
index eb3b12f7..94508215 100644
--- a/memora/pyproject.toml
+++ b/memora/pyproject.toml
@@ -27,6 +27,7 @@ dependencies = [
     "torch>=2.0.0",
     "tiktoken>=0.12.0",
     "httpx>=0.27.0",
+    "fastmcp>=2.0.0",
 ]
 
 [project.optional-dependencies]
@@ -35,9 +36,6 @@ test = [
     "pytest-asyncio>=0.21.0",
     "pytest-timeout>=2.4.0",
 ]
-mcp = [
-    "fastmcp>=2.0.0",
-]
 
 [tool.hatch.build.targets.wheel]
 packages = ["memora"]