diff --git a/geoserver/latest/README.md b/geoserver/latest/README.md
index b452b06..baceeab 100644
--- a/geoserver/latest/README.md
+++ b/geoserver/latest/README.md
@@ -106,9 +106,13 @@ geoserver:
     EXAMPLE_DB_HOST=localhost
     EXAMPLE_DB_USER=geoserver
     EXAMPLE_DB_PASS=geoserver
+
+  context_xml: |
+
 ```
 
 #### Description:
+- `context_xml`: pupulate the secret for the Tomcat `context.xml` file.
 - `chown_datadir`: toggle running `chown` to the `tomcat` UID/GID on the GeoServer data\_dir.  
   Disabling this might be desired when particular storage drivers requires to not change the ownership.
 - `geoserver_extra_opts`: JVM options that will be appended to the default ones.
diff --git a/geoserver/latest/context.xml b/geoserver/latest/context.xml
deleted file mode 100644
index 6b2047a..0000000
--- a/geoserver/latest/context.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Context>
-
-    <!-- Default set of monitored resources -->
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>
-
-    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
-    <!--
-    <Manager pathname="" />
-    -->
-
-    <!-- Uncomment this to enable Comet connection tacking (provides events
-         on session expiration as well as webapp lifecycle) -->
-    <!--
-    <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
-    -->
-
-    <Resource
-     name="jdbc/postgres" auth="Container" type="javax.sql.DataSource"
-     driverClassName="org.postgresql.Driver"
-     url="jdbc:postgresql://127.0.0.1:5432/geoserver"
-     username="geoserver" password="geoserver"
-     initialSize="0" maxTotal="20" maxIdle="5" maxWaitMillis="2000" minIdle="0"
-     timeBetweenEvictionRunsMillis="30000"
-     minEvictableIdleTimeMillis="60000"
-     validationQuery="SELECT 1"
-     maxAge="600000"
-     rollbackOnReturn="true"
-     />
-</Context>
-
diff --git a/geoserver/latest/templates/secrets.yaml b/geoserver/latest/templates/secrets.yaml
index b8760d7..9ec1f9f 100644
--- a/geoserver/latest/templates/secrets.yaml
+++ b/geoserver/latest/templates/secrets.yaml
@@ -14,4 +14,4 @@ metadata:
   name: {{ include "geoserver.fullname" . }}-context
 data:
   context.xml: |-
-              {{ .Files.Get "context.xml" | b64enc }}
+              {{ .Values.geoserver.context_xml | b64enc }}
diff --git a/geoserver/latest/values.yaml b/geoserver/latest/values.yaml
index de7a665..9406509 100644
--- a/geoserver/latest/values.yaml
+++ b/geoserver/latest/values.yaml
@@ -165,3 +165,33 @@ geoserver:
     EXAMPLE_DB_HOST=localhost
     EXAMPLE_DB_USER=geoserver
     EXAMPLE_DB_PASS=geoserver
+
+  context_xml: |
+    <Context>
+        <!-- Default set of monitored resources -->
+        <WatchedResource>WEB-INF/web.xml</WatchedResource>
+
+        <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+        <!--
+        <Manager pathname="" />
+        -->
+
+        <!-- Uncomment this to enable Comet connection tacking (provides events
+             on session expiration as well as webapp lifecycle) -->
+        <!--
+        <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
+        -->
+
+        <Resource
+         name="jdbc/postgres" auth="Container" type="javax.sql.DataSource"
+         driverClassName="org.postgresql.Driver"
+         url="jdbc:postgresql://127.0.0.1:5432/geoserver"
+         username="geoserver" password="geoserver"
+         initialSize="0" maxTotal="20" maxIdle="5" maxWaitMillis="2000" minIdle="0"
+         timeBetweenEvictionRunsMillis="30000"
+         minEvictableIdleTimeMillis="60000"
+         validationQuery="SELECT 1"
+         maxAge="600000"
+         rollbackOnReturn="true"
+         />
+    </Context>