diff --git a/Dockerfile b/Dockerfile
index 6198663..d2690cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,14 @@
 FROM node:14 as deps
 
-WORKDIR /app
-COPY calendso/apps/web/package.json calendso/yarn.lock ./
+WORKDIR /calcom
+COPY calendso/apps/web/package.json calendso/apps/web/yarn.lock ./
 COPY calendso/apps/web/prisma prisma
-RUN yarn install --frozen-lockfile
+# RUN yarn install --frozen-lockfile
+RUN yarn install
 
 FROM node:14 as builder
 
-WORKDIR /app
+WORKDIR /calcom
 ARG BASE_URL
 ARG NEXT_PUBLIC_APP_URL
 ARG NEXT_PUBLIC_LICENSE_CONSENT
@@ -17,24 +18,25 @@ ENV BASE_URL=$BASE_URL \
     NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
     NEXT_PUBLIC_TELEMETRY_KEY=$NEXT_PUBLIC_TELEMETRY_KEY
     
-COPY calendso/apps/web .
-
-COPY --from=deps /app/node_modules ./node_modules
+COPY calendso/apps/web ./apps/web
+COPY calendso/packages ./packages
+COPY --from=deps /calcom/node_modules ./apps/web/node_modules
+WORKDIR /calcom/apps/web
 RUN yarn build && yarn install --production --ignore-scripts --prefer-offline
 
 FROM node:14 as runner
-WORKDIR /app
+WORKDIR /calcom
 ENV NODE_ENV production
 
-COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/prisma ./prisma
-COPY --from=builder /app/scripts ./scripts
-COPY --from=builder /app/next.config.js ./
-COPY --from=builder /app/next-i18next.config.js ./
-COPY --from=builder /app/public ./public
-COPY --from=builder /app/.next ./.next
-COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /calcom/apps/web/node_modules ./node_modules
+COPY --from=builder /calcom/apps/web/prisma ./prisma
+COPY --from=builder /calcom/apps/web/scripts ./scripts
+COPY --from=builder /calcom/apps/web/next.config.js ./
+COPY --from=builder /calcom/apps/web/next-i18next.config.js ./
+COPY --from=builder /calcom/apps/web/public ./public
+COPY --from=builder /calcom/apps/web/.next ./.next
+COPY --from=builder /calcom/apps/web/package.json ./package.json
 COPY  scripts scripts
 
 EXPOSE 3000
-CMD ["/app/scripts/start.sh"]
+CMD ["/calcom/scripts/start.sh"]