diff --git a/crush.json b/crush.json
index 4a9c4d6..173f0eb 100644
--- a/crush.json
+++ b/crush.json
@@ -5,6 +5,10 @@
       "command": "docker",
       "args": ["run", "-i", "--rm", "kneldevstack-aimiddleware-bash-language-server", "start"]
     },
+    "context7": {
+      "command": "docker",
+      "args": ["run", "-i", "--rm", "kneldevstack-aimiddleware-context7-mcp"]
+    },
     "docker": {
       "command": "docker",
       "args": ["run", "-i", "--rm", "kneldevstack-aimiddleware-docker-language-server", "start", "--stdio"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 42fde73..a117b9d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -88,7 +88,7 @@ services:
     image: kneldevstack-aimiddleware-proxmox-mcp
     build:
       context: ./vendor/ProxmoxMCP
-      dockerfile: Dockerfile
+      dockerfile: ../../dockerfiles/proxmox-mcp/Dockerfile
     container_name: kneldevstack-aimiddleware-proxmox-mcp
     restart: unless-stopped
     environment:
@@ -97,7 +97,6 @@ services:
       - PROXMOX_USER=${PROXMOX_USER}
       - PROXMOX_TOKEN=${PROXMOX_TOKEN}
       - PROXMOX_NODE=${PROXMOX_NODE}
-    command: ["uvx", "proxmox-mcp"]
     profiles:
       - ops
 
@@ -149,13 +148,14 @@ services:
       - dev
 
   # Context7 MCP - Documentation framework
+  # NOTE: This is a stdio-based MCP server, run on-demand by Crush via docker run
   context7-mcp:
     image: kneldevstack-aimiddleware-context7-mcp
     build:
       context: ./vendor/context7
       dockerfile: ../../dockerfiles/context7/Dockerfile
     container_name: kneldevstack-aimiddleware-context7-mcp
-    restart: unless-stopped
+    restart: "no"
     environment:
       - UPSTASH_REDIS_REST_URL=${UPSTASH_REDIS_REST_URL}
       - UPSTASH_REDIS_REST_TOKEN=${UPSTASH_REDIS_REST_TOKEN}
diff --git a/dockerfiles/proxmox-mcp/Dockerfile b/dockerfiles/proxmox-mcp/Dockerfile
index 4278e1b..4e5a354 100644
--- a/dockerfiles/proxmox-mcp/Dockerfile
+++ b/dockerfiles/proxmox-mcp/Dockerfile
@@ -1,5 +1,8 @@
 FROM python:3.12-slim
 
+# Install git for git+ dependencies
+RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
+
 # Install uv for faster package management
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
@@ -9,16 +12,16 @@ WORKDIR /app
 COPY pyproject.toml ./
 
 # Install dependencies
-RUN uv sync --frozen --no-dev --no-install-project --no-cache
+RUN uv sync --no-dev --no-install-project --no-cache
 
 # Copy source code
 COPY . .
 
 # Install the project
-RUN uv sync --frozen --no-dev --no-editable --no-cache
+RUN uv sync --no-dev --no-editable --no-cache
 
 # Set up environment
 ENV PYTHONUNBUFFERED=1
 ENV PATH=/app/.venv/bin:$PATH
 
-ENTRYPOINT ["uvx", "proxmox-mcp"]
+ENTRYPOINT ["python", "-m", "proxmox_mcp.server"]