diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 09122e2..b0cbfac 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -6,8 +6,6 @@ services:
     build:
       context: ./server
       dockerfile: Dockerfile.dev
-      additional_contexts:
-        platform-server: ../cc-platform-core/server
     container_name: turtle-server-dev
     ports:
       - "3001:3001"
diff --git a/docker-compose.yml b/docker-compose.yml
index 71030ef..d740de8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,6 @@ services:
     build:
       context: ./server
       dockerfile: Dockerfile
-      additional_contexts:
-        platform-server: ../cc-platform-core/server
     container_name: turtle-server
     ports:
       - "4200:3001"  # HTTP API + WebSocket (unified)
diff --git a/server/Dockerfile b/server/Dockerfile
index aec8ec8..ea1ac57 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,11 +1,18 @@
-# Node.js backend
+# Stage 1: Fetch platform server package from git
+FROM alpine:3.20 AS platform
+RUN apk add --no-cache git
+ARG PLATFORM_REPO=https://git.spatulaa.com/MayaTheShy/cc-platform-core.git
+ARG PLATFORM_BRANCH=master
+RUN git clone --depth 1 --branch "$PLATFORM_BRANCH" "$PLATFORM_REPO" /src \
+    && rm -rf /src/server/node_modules /src/.git
+
+# Stage 2: Node.js backend
 FROM node:18-alpine
 
 WORKDIR /app
 
-# Copy platform server package from additional build context
-COPY --from=platform-server . /app/platform-server/
-RUN rm -rf /app/platform-server/node_modules
+# Copy platform server package from the git-clone stage
+COPY --from=platform /src/server /app/platform-server/
 
 # Copy package files
 COPY package*.json ./
diff --git a/server/Dockerfile.dev b/server/Dockerfile.dev
index d562070..4cfed6f 100644
--- a/server/Dockerfile.dev
+++ b/server/Dockerfile.dev
@@ -1,11 +1,18 @@
-# Development Dockerfile with hot reload
+# Stage 1: Fetch platform server package from git
+FROM alpine:3.20 AS platform
+RUN apk add --no-cache git
+ARG PLATFORM_REPO=https://git.spatulaa.com/MayaTheShy/cc-platform-core.git
+ARG PLATFORM_BRANCH=master
+RUN git clone --depth 1 --branch "$PLATFORM_BRANCH" "$PLATFORM_REPO" /src \
+    && rm -rf /src/server/node_modules /src/.git
+
+# Stage 2: Development with hot reload
 FROM node:18-alpine
 
 WORKDIR /app
 
-# Copy platform server package from additional build context
-COPY --from=platform-server . /app/platform-server/
-RUN rm -rf /app/platform-server/node_modules
+# Copy platform server package from the git-clone stage
+COPY --from=platform /src/server /app/platform-server/
 
 # Install nodemon for hot reload
 RUN npm install -g nodemon