diff --git a/frontend/docker-entrypoint.sh b/docker-entrypoint.sh
similarity index 100%
rename from frontend/docker-entrypoint.sh
rename to docker-entrypoint.sh
diff --git a/frontend/10-generate-env.sh b/frontend/10-generate-env.sh
new file mode 100644
index 0000000..173aa69
--- /dev/null
+++ b/frontend/10-generate-env.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Generate env.js from the template
+envsubst < /etc/env/env.js.template > /usr/share/nginx/html/env.js
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 016d5b1..9e56926 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -15,16 +15,15 @@ RUN apk add --no-cache dos2unix
 # Copy built app
 COPY --from=builder /app/dist /usr/share/nginx/html
 
-# ✅ Move the env.js.template to separate folder
+# ✅ Copy env.js.template
 COPY public/env.js.template /etc/env/env.js.template
 
-# Copy nginx config
+# ✅ Copy nginx config
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 
-# Copy entrypoint
-COPY docker-entrypoint.sh /entrypoint.sh
-RUN dos2unix /entrypoint.sh && chmod +x /entrypoint.sh
+# ✅ Add env generator script to nginx entrypoint hook
+COPY 10-generate-env.sh /docker-entrypoint.d/10-generate-env.sh
+RUN dos2unix 10-generate-env.sh && chmod +x /docker-entrypoint.d/10-generate-env.sh
 
 EXPOSE 80
-ENTRYPOINT ["/entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]