diff --git a/templates/geowebcache/geowebcache-deployment.yaml b/templates/geowebcache/geowebcache-deployment.yaml
index 0db0d00..f5d41a2 100644
--- a/templates/geowebcache/geowebcache-deployment.yaml
+++ b/templates/geowebcache/geowebcache-deployment.yaml
@@ -32,6 +32,23 @@ spec:
         fsGroup: 999
       initContainers:
       {{ include "georchestra.bootstrap_georchestra_datadir" . | nindent 6 }}
+      {{- if $webapp.envsubst.enabled }}
+      - name: envsubst
+        image: georchestra/k8s-initcontainer-envsubst
+        volumeMounts:
+        - mountPath: /etc/georchestra
+          name: georchestra-datadir
+        env:
+          - name: DEBUG
+            value: "yes"
+          - name: SUBST_FILES
+            value: "/etc/georchestra/geowebcache/datadir/*"
+          {{- include "georchestra.common-envs" . | nindent 10 }}
+          {{- if $webapp.extra_environment }}
+          {{- $webapp.extra_environment | toYaml | nindent 10 }}
+          {{- end }}
+      {{- end }}
+
       containers:
       - name: georchestra-geowebcache
         image: {{ $webapp.docker_image }}
diff --git a/values.yaml b/values.yaml
index 1be57c0..a3f2a64 100644
--- a/values.yaml
+++ b/values.yaml
@@ -135,6 +135,8 @@ georchestra:
     geowebcache:
       enabled: false
       replicaCount: "1"
+      envsubst:
+        enabled: true
       docker_image: georchestra/geowebcache:latest
       extra_environment: []
       service: