diff --git a/Dockerfile b/Dockerfile
index ad93a4e2d..255b45f88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,28 +6,27 @@ LABEL org.opencontainers.image.documentation='https://github.com/benphelps/homep
 LABEL org.opencontainers.image.source='https://github.com/benphelps/homepage'
 LABEL org.opencontainers.image.licenses='Apache-2.0'
 
-ENV NODE_ENV production
-ENV NEXT_TELEMETRY_DISABLED 1
-
-WORKDIR /app
-
 # Install dependencies only when needed
-FROM base AS deps
+FROM node:16-alpine AS deps
 RUN apk add --no-cache libc6-compat
 RUN apk add --no-cache --virtual .gyp python3 make g++
+WORKDIR /app
 COPY package.json pnpm-lock.yaml* ./
 RUN yarn global add pnpm
 RUN pnpm install
 RUN apk del .gyp
 
 # Rebuild the source code only when needed
-FROM base AS builder
+FROM node:16-alpine AS builder
+WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 RUN npm run build
 
 # Production image, copy all the files and run next
-FROM base AS runner
+FROM node:16-alpine AS runner
+WORKDIR /app
+ENV NODE_ENV production
 COPY --from=builder /app/next.config.js ./
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/package.json ./package.json