diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index d252e49..5db7b68 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -15,6 +15,9 @@ ENV NEXT_PUBLIC_BACKEND_BASE_URL=https://build-placeholder.invalid
 ENV NEXT_PUBLIC_HCAPTCHA_SITE_KEY=__NEXT_PUBLIC_HCAPTCHA_SITE_KEY__
 ENV HCAPTCHA_SECRET_KEY=__HCAPTCHA_SECRET_KEY__
 
+ARG VERSION=""
+ARG BUILD_DATE=""
+
 WORKDIR /app
 
 COPY package.json pnpm-lock.yaml ./
@@ -24,6 +27,10 @@ RUN pnpm install --frozen-lockfile
 
 COPY . .
 
+RUN if [ -n "$VERSION" ] || [ -n "$BUILD_DATE" ]; then \
+  VERSION="$VERSION" BUILD_DATE="$BUILD_DATE" node -e "const fs = require('fs'); const pkg = require('./package.json'); const version = process.env.VERSION; const buildDate = process.env.BUILD_DATE; if (version) pkg.version = version; if (buildDate) pkg.buildDate = buildDate; fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2) + '\\n')"; \
+fi
+
 RUN pnpm build
 
 RUN grep -rl \
@@ -36,17 +43,10 @@ RUN grep -rl \
 # ---- runner stage ----
 FROM base AS runner
 
-ARG VERSION=""
-ARG BUILD_DATE=""
-
 WORKDIR /app
 
 COPY --from=builder /app .
 
-RUN if [ -n "$VERSION" ] || [ -n "$BUILD_DATE" ]; then \
-  VERSION="$VERSION" BUILD_DATE="$BUILD_DATE" node -e "const fs = require('fs'); const pkg = require('./package.json'); const version = process.env.VERSION; const buildDate = process.env.BUILD_DATE; if (version) pkg.version = version; if (buildDate) pkg.buildDate = buildDate; fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2) + '\\n')"; \
-fi
-
 EXPOSE 3000
 
 ENTRYPOINT ["./entrypoint.sh"]