diff --git a/web/docker-compose.yml b/web/docker-compose.yml
index 05e4eb9..90d43f7 100644
--- a/web/docker-compose.yml
+++ b/web/docker-compose.yml
@@ -1,9 +1,6 @@
 services:
   server:
-    build:
-      context: ./server
-      additional_contexts:
-        platform-server: ../../cc-platform-core/server
+    build: ./server
     networks:
       - inventory-network
     volumes:
diff --git a/web/server/Dockerfile b/web/server/Dockerfile
index 1c3fb49..3837487 100644
--- a/web/server/Dockerfile
+++ b/web/server/Dockerfile
@@ -1,4 +1,12 @@
-# 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:20-alpine
 
 # Build tools needed for better-sqlite3 native compilation
@@ -8,9 +16,8 @@ RUN apk add --no-cache python3 make g++ su-exec libstdc++
 
 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*.json ./