diff --git a/Dockerfile b/Dockerfile
index 8c446e1..7d57d88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,34 @@
+FROM node:20-alpine AS base
+
 # Install dependencies only when needed
-FROM node:20-alpine AS deps
+FROM base AS deps
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
-COPY package.json yarn.lock ./
-RUN yarn install 
+
+# 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
 
 # Rebuild the source code only when needed
-FROM node:20-alpine AS builder
-
+FROM base AS builder
 WORKDIR /app
-
 COPY --from=deps /app/node_modules ./node_modules
-
 COPY . .
 
-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
 
 # Production image, copy all the files and run next
-FROM node:20-alpine AS runner
+FROM base AS runner
 WORKDIR /app
 
 ENV NODE_ENV production
@@ -26,11 +37,15 @@ RUN addgroup --system --gid 1001 kx3dex_radio
 RUN adduser --system --uid 1001 kx3dex_radio
 
 COPY --from=builder /app/public ./public
-COPY --from=builder /app/package.json ./package.json
+# COPY --from=builder /app/package.json ./package.json
+
+# Set the correct permission for prerender cache
+RUN mkdir .next
+RUN chown kx3dex_radio:kx3dex_radio .next
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-# COPY --from=builder --chown=kx3dex_radio:kx3dex_radio /app/.next/standalone ./
+COPY --from=builder --chown=kx3dex_radio:kx3dex_radio /app/.next/standalone ./
 COPY --from=builder --chown=kx3dex_radio:kx3dex_radio /app/.next/static ./.next/static
 
 USER kx3dex_radio
@@ -39,9 +54,6 @@ EXPOSE 3000
 
 ENV PORT 3000
 ENV HOSTNAME "0.0.0.0"
-ENV NEXT_PUBLIC_SENDGRID_API_KEY=$NEXT_PUBLIC_SENDGRID_API_KEY
-ENV NEXT_PUBLIC_RECAPTCHA_SITE_KEY=$NEXT_PUBLIC_RECAPTCHA_SITE_KEY
-ENV NEXT_PUBLIC_RECAPTCHA_SECRET_KEY=$NEXT_PUBLIC_RECAPTCHA_SECRET_KEY
 
-
-CMD ["node", "server.js"]
+#CMD ["node", "server.js"]
+CMD HOSTNAME="0.0.0.0" node server.js
\ No newline at end of file