diff --git a/.dockerignore b/.dockerignore
index e442b1c..72e9aa4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,5 @@ Dockerfile
 node_modules
 npm-debug.log
 README.md
+.next
 .git
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 347c2c9..6364b91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,65 @@
-FROM node:18-alpine AS build
+FROM node:18-alpine 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
-
-RUN mkdir /app
-COPY ./* /app
 WORKDIR /app
 
-RUN yarn
+# 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 yarn global add pnpm && pnpm i --frozen-lockfile; \
+  else echo "Lockfile not found." && exit 1; \
+  fi
+
+
+# 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 build
 
+# If using npm comment out above and use below instead
+# RUN npm run build
+
+# 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
+
+# Set the correct permission for prerender cache
+RUN mkdir .next
+RUN chown nextjs:nodejs .next
+
+# 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
+
+USER nextjs
+
 EXPOSE 3000
 
-# Run the next build process and generate the artifacts
-CMD ["yarn", "start"]
\ No newline at end of file
+ENV PORT 3000
+# set hostname to localhost
+ENV HOSTNAME "0.0.0.0"
+
+CMD ["node", "server.js"]
\ No newline at end of file
diff --git a/app.json b/app.json
new file mode 100644
index 0000000..9108f32
--- /dev/null
+++ b/app.json
@@ -0,0 +1,10 @@
+{
+  "name": "encoach-landing-page",
+  "options": {
+    "allow-unauthenticated": true,
+    "memory": "256Mi",
+    "cpu": "1",
+    "port": 3000,
+    "http2": false
+  }
+}
\ No newline at end of file
diff --git a/next.config.js b/next.config.js
index 481272c..29d8372 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,7 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-	reactStrictMode: true,
+module.exports = {
 	output: "standalone",
 };
-
-module.exports = nextConfig;