diff --git a/chart/files/index.html b/chart/files/index.html
index 23b59e21fcf1e5cc9cdb4d93f109f11c4ea27ea9..e5c656475ffdeb94078af5d7d928b38e72c706c4 100644
--- a/chart/files/index.html
+++ b/chart/files/index.html
@@ -17,12 +17,12 @@
 <div id="app" style="width: 100%; top: 60px; bottom: 0; position: absolute; margin: 0; padding:0;"></div>
 <script src="prism.js"></script>
 <script>
-var baseUrl = '//vhr18-dev.vs.hub.eox.at/';
+var baseUrl = '//{{ index (index .Values.ingress.tls 0).hosts 0 }}/';
 var baseUrlsWMTS = [
-    '//vhr18-dev.vs.hub.eox.at/cache/ows/wmts',
+    '//{{ index (index .Values.ingress.tls 0).hosts 0 }}/cache/ows/wmts',
 ];
 var baseUrlsOws = [
-    '//vhr18-dev.vs.hub.eox.at/ows',
+    '//{{ index (index .Values.ingress.tls 0).hosts 0 }}/ows',
 ];
 var config = {
     "settings": {
@@ -274,7 +274,7 @@ var config = {
                 // "method": "GET",
                 "rewrite": {
                 // add __coverage to the coverageId
-                "from": "({{id}})",
+                "from": "({{ "{{" }}id}})",
                 "to": "$1__coverage"
                 }
             }
@@ -369,7 +369,7 @@ var config = {
                 // "method": "GET",
                 "rewrite": {
                 // add __coverage to the coverageId
-                "from": "({{id}})",
+                "from": "({{ "{{" }}id}})",
                 "to": "$1__coverage"
                 }
             }
diff --git a/chart/templates/client-configmap.yaml b/chart/templates/client-configmap.yaml
index 4b130f7e1a9768da45a04cf5e6eccec209d88f47..c3cc92b7b9b81947b3794facbf24651f3d9234a1 100644
--- a/chart/templates/client-configmap.yaml
+++ b/chart/templates/client-configmap.yaml
@@ -3,4 +3,4 @@ kind: ConfigMap
 metadata:
   name: {{ include "vs.fullname" . }}-client
 data:
-  {{ (.Files.Glob "files/index.html").AsConfig | nindent 2}}
+  {{ (tpl (.Files.Glob "files/index.html").AsConfig . ) | nindent 2}}