diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 78bbdef..7982ced 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -13,12 +13,12 @@ RUN npm ci
 # Copy entire project
 COPY . .
 
-# Set it as an environment variable for the build process
-ARG HCAPTCHA_SITE_KEY
-ENV NEXT_PUBLIC_HCAPTCHA_SITE_KEY=${HCAPTCHA_SITE_KEY}
-
-# Create a .env file before build
-RUN echo "NEXT_PUBLIC_HCAPTCHA_SITE_KEY=${HCAPTCHA_SITE_KEY}"
+## Set it as an environment variable for the build process
+#ARG HCAPTCHA_SITE_KEY
+#ENV NEXT_PUBLIC_HCAPTCHA_SITE_KEY=$HCAPTCHA_SITE_KEY
+#
+## Create a .env file before build
+#RUN echo "NEXT_PUBLIC_HCAPTCHA_SITE_KEY=$HCAPTCHA_SITE_KEY"
 
 # Build the Next.js app
 RUN npm run build
@@ -35,4 +35,4 @@ COPY --from=builder /app ./
 EXPOSE 3000
 
 # Start Next.js in production mode
-CMD ["npm", "run", "start"]
+CMD ["/bin/sh", "-c", "set -a && [ -f .env ] && . .env && set +a && next start"]