diff --git a/app/Dockerfile b/app/Dockerfile
index 9941af1..55e63a3 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -9,8 +9,11 @@ ENV VITE_IS_DOCKER=${VITE_IS_DOCKER}
 ENV VITE_ENV=${VITE_ENV}
 ENV VITE_SERVER_URL=${VITE_SERVER_URL}
 
+COPY package.json pnpm-lock.yaml ./
+RUN npm install -g pnpm && pnpm i 
+
 COPY . .
-RUN npm install -g pnpm && pnpm i && pnpm build
+RUN pnpm build
 
 FROM nginx:stable-alpine
 COPY --from=builder /app/dist /usr/share/nginx/html
diff --git a/server/Dockerfile b/server/Dockerfile
index e1ed84e..a310dbb 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -41,12 +41,16 @@ ENV BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET}
 
 WORKDIR /app
 
+COPY package.json pnpm-lock.yaml ./
+
+RUN corepack enable pnpm && pnpm i 
+
 COPY . .
-RUN corepack enable pnpm && pnpm i && pnpm run build
+RUN pnpm run build
 
 ENV NODE_ENV=production
 ENV PORT=3001
 ENV HOSTNAME="0.0.0.0"
 
-CMD ["node", "./.next/standalone/server.js"]
 EXPOSE 3001
+CMD ["node", "./.next/standalone/server.js"]
diff --git a/server/Dockerfile.bun b/server/Dockerfile.bun
index d7d9fb3..7a33162 100644
--- a/server/Dockerfile.bun
+++ b/server/Dockerfile.bun
@@ -6,8 +6,10 @@ RUN apt-get update && apt-get install -y libc6-dev nodejs npm
 
 WORKDIR /app
 
+COPY bun.lockb package.json* ./
+RUN bun install
 COPY . .
-RUN bun install; bun run build
+RUN bun run build
 
 ENV NODE_ENV=production
 ENV PORT=3001