diff --git a/adminfront/Dockerfile b/adminfront/Dockerfile
index 5f650a84..04717142 100644
--- a/adminfront/Dockerfile
+++ b/adminfront/Dockerfile
@@ -1,16 +1,22 @@
 FROM node:lts
 
-WORKDIR /app
+WORKDIR /workspace
 
-# 패키지 정보 복사 및 의존성 설치
-COPY package*.json ./
-RUN npm ci
+# Install pnpm
+RUN npm install -g pnpm
+
+# Copy workspace configs and common package
+COPY package.json ./
+COPY common ./common
+COPY adminfront ./adminfront
+
+# Install dependencies for the workspace
+RUN cd common && pnpm install
 
 # 프로덕션 서빙을 위한 serve 패키지 글로벌 설치
 RUN npm install -g serve
 
-# 소스 코드 복사
-COPY . .
+WORKDIR /workspace/adminfront
 
 # Vite 기본 포트
 EXPOSE 5173
diff --git a/devfront/Dockerfile b/devfront/Dockerfile
index 5f650a84..770adaaa 100644
--- a/devfront/Dockerfile
+++ b/devfront/Dockerfile
@@ -1,16 +1,22 @@
 FROM node:lts
 
-WORKDIR /app
+WORKDIR /workspace
 
-# 패키지 정보 복사 및 의존성 설치
-COPY package*.json ./
-RUN npm ci
+# Install pnpm
+RUN npm install -g pnpm
+
+# Copy workspace configs and common package
+COPY package.json ./
+COPY common ./common
+COPY devfront ./devfront
+
+# Install dependencies for the workspace
+RUN cd common && pnpm install
 
 # 프로덕션 서빙을 위한 serve 패키지 글로벌 설치
 RUN npm install -g serve
 
-# 소스 코드 복사
-COPY . .
+WORKDIR /workspace/devfront
 
 # Vite 기본 포트
 EXPOSE 5173
diff --git a/docker-compose.yaml b/docker-compose.yaml
index fee5954c..3f264d09 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -49,8 +49,8 @@ services:
 
     adminfront:
         build:
-            context: ./adminfront
-            dockerfile: Dockerfile
+            context: .
+            dockerfile: ./adminfront/Dockerfile
         container_name: baron_adminfront
         env_file:
             - .env
@@ -70,8 +70,8 @@ services:
 
     devfront:
         build:
-            context: ./devfront
-            dockerfile: Dockerfile
+            context: .
+            dockerfile: ./devfront/Dockerfile
         container_name: baron_devfront
         env_file:
             - .env
@@ -91,8 +91,8 @@ services:
 
     orgfront:
         build:
-            context: ./orgfront
-            dockerfile: Dockerfile
+            context: .
+            dockerfile: ./orgfront/Dockerfile
         container_name: baron_orgfront
         env_file:
             - .env
diff --git a/orgfront/Dockerfile b/orgfront/Dockerfile
index 426db35e..ffc9e6cd 100644
--- a/orgfront/Dockerfile
+++ b/orgfront/Dockerfile
@@ -1,16 +1,22 @@
 FROM node:lts
 
-WORKDIR /app
+WORKDIR /workspace
 
-# 패키지 정보 복사 및 의존성 설치
-COPY package*.json ./
-RUN npm ci
+# Install pnpm
+RUN npm install -g pnpm
+
+# Copy workspace configs and common package
+COPY package.json ./
+COPY common ./common
+COPY orgfront ./orgfront
+
+# Install dependencies for the workspace
+RUN cd common && pnpm install
 
 # 프로덕션 서빙을 위한 serve 패키지 글로벌 설치
 RUN npm install -g serve
 
-# 소스 코드 복사
-COPY . .
+WORKDIR /workspace/orgfront
 
 # Vite 기본 포트
 EXPOSE 5175