diff --git a/config/docker/caddy/web-app/config.json b/config/docker/caddy/web-app/config.json
index 913edbc6..a3f64a94 100644
--- a/config/docker/caddy/web-app/config.json
+++ b/config/docker/caddy/web-app/config.json
@@ -1,4 +1,4 @@
 {
-  "apiBaseUrl": "{{env `API_BASE_URL`}}",
-  "keycloakUrl": "{{env `KEYCLOAK_URL`}}"
+  "apiBaseUrl": "{{.Env.API_BASE_URL}}",
+  "keycloakUrl": "{{.Env.KEYCLOAK_URL}}"
 }
diff --git a/docs/ScreenShots/cloudflare-bestaetigung_2026-03-13_11-51.png b/docs/ScreenShots/archive/cloudflare-bestaetigung_2026-03-13_11-51.png
similarity index 100%
rename from docs/ScreenShots/cloudflare-bestaetigung_2026-03-13_11-51.png
rename to docs/ScreenShots/archive/cloudflare-bestaetigung_2026-03-13_11-51.png
diff --git a/docs/ScreenShots/pangolin-web-app-einstellungen-allg_2026-03-13_10-31.png b/docs/ScreenShots/archive/pangolin-web-app-einstellungen-allg_2026-03-13_10-31.png
similarity index 100%
rename from docs/ScreenShots/pangolin-web-app-einstellungen-allg_2026-03-13_10-31.png
rename to docs/ScreenShots/archive/pangolin-web-app-einstellungen-allg_2026-03-13_10-31.png
diff --git a/docs/ScreenShots/pangolin-web-app-einstellungen-allg_2026-03-13_10-54.png b/docs/ScreenShots/archive/pangolin-web-app-einstellungen-allg_2026-03-13_10-54.png
similarity index 100%
rename from docs/ScreenShots/pangolin-web-app-einstellungen-allg_2026-03-13_10-54.png
rename to docs/ScreenShots/archive/pangolin-web-app-einstellungen-allg_2026-03-13_10-54.png
diff --git a/docs/ScreenShots/pangolin-web-app-einstellungen-proxy_01_2026-03-13_12-09.png b/docs/ScreenShots/archive/pangolin-web-app-einstellungen-proxy_01_2026-03-13_12-09.png
similarity index 100%
rename from docs/ScreenShots/pangolin-web-app-einstellungen-proxy_01_2026-03-13_12-09.png
rename to docs/ScreenShots/archive/pangolin-web-app-einstellungen-proxy_01_2026-03-13_12-09.png
diff --git a/docs/ScreenShots/pangolin-web-app-einstellungen-proxy_02_2026-03-13_12-09.png b/docs/ScreenShots/archive/pangolin-web-app-einstellungen-proxy_02_2026-03-13_12-09.png
similarity index 100%
rename from docs/ScreenShots/pangolin-web-app-einstellungen-proxy_02_2026-03-13_12-09.png
rename to docs/ScreenShots/archive/pangolin-web-app-einstellungen-proxy_02_2026-03-13_12-09.png
diff --git a/docs/ScreenShots/pangolin-web-app-einstellungen_2026-03-13_10-00.png b/docs/ScreenShots/archive/pangolin-web-app-einstellungen_2026-03-13_10-00.png
similarity index 100%
rename from docs/ScreenShots/pangolin-web-app-einstellungen_2026-03-13_10-00.png
rename to docs/ScreenShots/archive/pangolin-web-app-einstellungen_2026-03-13_10-00.png
diff --git a/docs/ScreenShots/pangolin-web-app-einstellungen_2026-03-13_10-01.png b/docs/ScreenShots/archive/pangolin-web-app-einstellungen_2026-03-13_10-01.png
similarity index 100%
rename from docs/ScreenShots/pangolin-web-app-einstellungen_2026-03-13_10-01.png
rename to docs/ScreenShots/archive/pangolin-web-app-einstellungen_2026-03-13_10-01.png
diff --git a/docs/ScreenShots/prod-docker-log-web-app_2026-03-13_12-20.png b/docs/ScreenShots/archive/prod-docker-log-web-app_2026-03-13_12-20.png
similarity index 100%
rename from docs/ScreenShots/prod-docker-log-web-app_2026-03-13_12-20.png
rename to docs/ScreenShots/archive/prod-docker-log-web-app_2026-03-13_12-20.png
diff --git a/docs/ScreenShots/prod-docker-log-web-app_2026-03-13_12-57.png b/docs/ScreenShots/archive/prod-docker-log-web-app_2026-03-13_12-57.png
similarity index 100%
rename from docs/ScreenShots/prod-docker-log-web-app_2026-03-13_12-57.png
rename to docs/ScreenShots/archive/prod-docker-log-web-app_2026-03-13_12-57.png
diff --git a/docs/ScreenShots/prod-docker-logs-web-app_2026-03-14_11-11.png b/docs/ScreenShots/prod-docker-logs-web-app_2026-03-14_11-11.png
new file mode 100644
index 00000000..7616bff2
Binary files /dev/null and b/docs/ScreenShots/prod-docker-logs-web-app_2026-03-14_11-11.png differ
diff --git a/docs/ScreenShots/prod-env_01_2026-03-14_09-54.png b/docs/ScreenShots/prod-env_01_2026-03-14_09-54.png
new file mode 100644
index 00000000..54cc4e1a
Binary files /dev/null and b/docs/ScreenShots/prod-env_01_2026-03-14_09-54.png differ
diff --git a/docs/ScreenShots/prod-env_02_2026-03-14_09-54.png b/docs/ScreenShots/prod-env_02_2026-03-14_09-54.png
new file mode 100644
index 00000000..754c58cb
Binary files /dev/null and b/docs/ScreenShots/prod-env_02_2026-03-14_09-54.png differ
diff --git a/docs/ScreenShots/prod-env_03_2026-03-14_09-54.png b/docs/ScreenShots/prod-env_03_2026-03-14_09-54.png
new file mode 100644
index 00000000..c5da1e5f
Binary files /dev/null and b/docs/ScreenShots/prod-env_03_2026-03-14_09-54.png differ
diff --git a/docs/ScreenShots/prod-env_04_2026-03-14_09-54.png b/docs/ScreenShots/prod-env_04_2026-03-14_09-54.png
new file mode 100644
index 00000000..61da2fac
Binary files /dev/null and b/docs/ScreenShots/prod-env_04_2026-03-14_09-54.png differ
diff --git a/docs/ScreenShots/prod-meld-host-deploy-script_2026-03-14_09-50.png b/docs/ScreenShots/prod-meld-host-deploy-script_2026-03-14_09-50.png
new file mode 100644
index 00000000..14d4822a
Binary files /dev/null and b/docs/ScreenShots/prod-meld-host-deploy-script_2026-03-14_09-50.png differ
diff --git a/frontend/shells/meldestelle-portal/src/jsMain/resources/index.html b/frontend/shells/meldestelle-portal/src/jsMain/resources/index.html
index 0641bc83..e938bc6d 100644
--- a/frontend/shells/meldestelle-portal/src/jsMain/resources/index.html
+++ b/frontend/shells/meldestelle-portal/src/jsMain/resources/index.html
@@ -13,24 +13,30 @@
   <div class="loading">Loading...</div>
 </div>
   <script>
-  // Laufzeit-Konfiguration — kein Rebuild nötig (SSoT: .env via Nginx/Caddy oder query params)
-  // API_BASE_URL: Prefer explicit query param, then same-origin (Nginx proxy)
-  // KEYCLOAK_URL: Prefer explicit query param, then derive from window.location.hostname + port 8180
+  // Laufzeit-Konfiguration — kein Rebuild nötig (SSoT: .env via Caddy-Templates oder query params)
+  // Caddy verarbeitet index.html als text/html-Template (Standard) und ersetzt .Env-Variablen.
+  // Lokal (webpack-dev-server): Template-Tags bleiben Literal-Strings → startsWith('{{') Prüfung greift.
   (function () {
     try {
       const params = new URLSearchParams(window.location.search);
 
-      // API Base URL
-      const apiOverride = params.get('apiBaseUrl');
+      // Caddy injiziert: {{.Env.API_BASE_URL}} → z.B. "https://app.mo-code.at"
+      const apiFromCaddy = '{{.Env.API_BASE_URL}}';
+      const apiOverride  = params.get('apiBaseUrl');
       globalThis.API_BASE_URL = apiOverride
         ? apiOverride.replace(/\/$/, '')
-        : window.location.origin.replace(/\/$/, '');
+        : (apiFromCaddy && !apiFromCaddy.startsWith('{{')
+            ? apiFromCaddy.replace(/\/$/, '')
+            : window.location.origin.replace(/\/$/, ''));
 
-      // Keycloak URL — gleiche IP wie die App, Port 8180
-      const kcOverride = params.get('keycloakUrl');
+      // Caddy injiziert: {{.Env.KEYCLOAK_URL}} → z.B. "https://auth.mo-code.at"
+      const kcFromCaddy = '{{.Env.KEYCLOAK_URL}}';
+      const kcOverride  = params.get('keycloakUrl');
       globalThis.KEYCLOAK_URL = kcOverride
         ? kcOverride.replace(/\/$/, '')
-        : 'http://' + window.location.hostname + ':8180';
+        : (kcFromCaddy && !kcFromCaddy.startsWith('{{')
+            ? kcFromCaddy.replace(/\/$/, '')
+            : 'http://' + window.location.hostname + ':8180');
 
     } catch (e) {
       globalThis.API_BASE_URL = 'http://localhost:8081';