diff --git a/Dockerfile b/Dockerfile
index c96f1aa..dc5b457 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
 FROM node:14-alpine as deps
-
+# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 COPY calendso/package.json calendso/yarn.lock ./
-COPY calendso/prisma prisma
+COPY calendso/prisma ./prisma/
 RUN yarn install --frozen-lockfile
+RUN npx prisma generate
 
 FROM node:14-alpine as builder
 WORKDIR /app
@@ -14,15 +15,23 @@ RUN yarn build && yarn install --production --ignore-scripts --prefer-offline
 
 FROM node:14-alpine as runner
 WORKDIR /app
+
 ENV NODE_ENV production
 
-COPY --from=builder /app/next.config.js ./
-COPY --from=builder /app/next-i18next.config.js ./
+RUN addgroup -g 1001 -S nodejs
+RUN adduser -S nextjs -u 1001
+
+COPY --from=builder /app/next*.config.js ./
 COPY --from=builder /app/public ./public
-COPY --from=builder /app/.next ./.next
+COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
 COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/package.json ./package.json
-COPY --from=builder /app/prisma ./prisma
-COPY  scripts scripts
+
+USER nextjs
+
 EXPOSE 3000
-CMD ["/app/scripts/start.sh"]
+# Next.js collects completely anonymous telemetry data about general usage.
+# Learn more here: https://nextjs.org/telemetry
+# Uncomment the following line in case you want to disable telemetry.
+# ENV NEXT_TELEMETRY_DISABLED 1
+CMD ["yarn", "start"]