diff --git a/.dockerignore b/.dockerignore
index 72e9aa42..8a679c9c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+# Based on https://github.com/vercel/next.js/blob/canary/examples/with-docker/.dockerignore
 Dockerfile
 .dockerignore
 node_modules
diff --git a/Dockerfile b/Dockerfile
index e90cfd9c..7acd4891 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,67 +1,49 @@
-FROM node:18-alpine AS base
+# This file is based on https://github.com/vercel/next.js/blob/canary/examples/with-docker/Dockerfile
+FROM node:18-bullseye AS base
 
 # Install dependencies only when needed
 FROM base 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
 
-# Install dependencies based on the preferred package manager
-COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
-RUN \
-  if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
-  elif [ -f package-lock.json ]; then npm ci; \
-  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
-  else echo "Lockfile not found." && exit 1; \
-  fi
+RUN yarn set version berry
+
+COPY package.json yarn.lock* ./
+COPY .yarn/ ./.yarn
 
+ENV YARN_ENABLE_IMMUTABLE_INSTALLS false
+RUN yarn install
 
 # Rebuild the source code only when needed
 FROM base AS builder
 WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
-# 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 during the build.
-# ENV NEXT_TELEMETRY_DISABLED 1
+RUN yarn set version berry
+RUN yarn install
+RUN yarn build
 
-RUN \
-  if [ -f yarn.lock ]; then yarn run build; \
-  elif [ -f package-lock.json ]; then npm run build; \
-  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm run build; \
-  else echo "Lockfile not found." && exit 1; \
-  fi
+# CMD "/bin/sh"
+CMD ["yarn", "run", "dev"]
 
 # Production image, copy all the files and run next
-FROM base AS runner
-WORKDIR /app
-
-ENV NODE_ENV production
-# Uncomment the following line in case you want to disable telemetry during runtime.
-# ENV NEXT_TELEMETRY_DISABLED 1
-
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-COPY --from=builder /app/public ./public
+# FROM base AS runner
+# WORKDIR /app
 
-# Set the correct permission for prerender cache
-RUN mkdir .next
-RUN chown nextjs:nodejs .next
+# ENV NODE_ENV production
 
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+# RUN addgroup --system --gid 1001 nodejs
+# RUN adduser --system --uid 1001 nextjs
 
-USER nextjs
+# COPY --from=builder /app/public ./public
 
-EXPOSE 3000
+# # Automatically leverage output traces to reduce image size
+# # https://nextjs.org/docs/advanced-features/output-file-tracing
+# COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+# COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
-ENV PORT 3000
+# USER nextjs
+# EXPOSE 3000
+# ENV PORT 3000
 
-# server.js is created by next build from the standalone output
-# https://nextjs.org/docs/pages/api-reference/next-config-js/output
-CMD HOSTNAME="0.0.0.0" node server.js
\ No newline at end of file
+# CMD ["yarn", "node", "server.js"]
\ No newline at end of file