diff --git a/frontend/docker-entrypoint.sh b/frontend/docker-entrypoint.sh
index d9753f5..f1a9f9f 100644
--- a/frontend/docker-entrypoint.sh
+++ b/frontend/docker-entrypoint.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-cat <<EOF > /usr/share/nginx/html/env.js
-window.ENV = {
-  API_BASE: "${API_BASE:-http://localhost:8000}"
-};
-EOF
+# מחליף את הטמפלייט במשתנה האמיתי שהוזן כ־ENV
+envsubst < /usr/share/nginx/html/env.js.template > /usr/share/nginx/html/env.js
 
+# מריץ את nginx
 exec nginx -g "daemon off;"
diff --git a/frontend/public/env.js.template b/frontend/public/env.js.template
index 7fa1ae5..7026a95 100644
--- a/frontend/public/env.js.template
+++ b/frontend/public/env.js.template
@@ -1,3 +1,3 @@
 window.ENV = {
-  API_BASE: "${API_BASE}"
+  API_BASE: "__API_BASE__"
 };
diff --git a/labmap-chart/templates/frontend-deployment.yaml b/labmap-chart/templates/frontend-deployment.yaml
index 85a30a7..22f60ed 100644
--- a/labmap-chart/templates/frontend-deployment.yaml
+++ b/labmap-chart/templates/frontend-deployment.yaml
@@ -19,4 +19,4 @@ spec:
             - containerPort: {{ .Values.frontend.port }}
           env:
             - name: API_BASE
-              value: "https://{{ .Values.backend.ingress.host }}"
+              value: {{ .Values.frontend.env.API_BASE | quote }}
\ No newline at end of file