diff --git a/charts/pega/config/deploy/context.xml.tmpl b/charts/pega/config/deploy/context.xml.tmpl
index de0a551d8..4b353ffd8 100644
--- a/charts/pega/config/deploy/context.xml.tmpl
+++ b/charts/pega/config/deploy/context.xml.tmpl
@@ -17,8 +17,8 @@
     maxWaitMillis="{{ .Env.JDBC_MAX_WAIT }}"
     initialSize="{{ .Env.JDBC_INITIAL_SIZE }}"
     connectionProperties="{{ .Env.JDBC_CONNECTION_PROPERTIES }}"
-    timeBetweenEvictionRunsMillis="{{ .Env.JDBC_TIME_BETWEEN_EVICTIONS }}"
-    minEvictableIdleTimeMillis="{{ .Env.JDBC_MIN_EVICTABLE_IDLE_TIME }}"
+    timeBetweenEvictionRunsMillis="{{ default .Env.JDBC_TIME_BETWEEN_EVICTIONS "30000" }}"
+    minEvictableIdleTimeMillis="{{ default .Env.JDBC_MIN_EVICTABLE_IDLE_TIME "60000" }}"
     />
 
   {{ if and .Env.DB_RW_USERNAME .Env.JDBC_RW_URL }}
@@ -35,8 +35,8 @@
     maxWaitMillis="{{ .Env.JDBC_MAX_WAIT }}"
     initialSize="{{ default .Env.JDBC_RO_INITIAL_SIZE .Env.JDBC_INITIAL_SIZE }}"
     connectionProperties="socketTimeout=1200;"
-    timeBetweenEvictionRunsMillis="{{ .Env.JDBC_TIME_BETWEEN_EVICTIONS }}"
-    minEvictableIdleTimeMillis="{{ .Env.JDBC_MIN_EVICTABLE_IDLE_TIME }}"
+    timeBetweenEvictionRunsMillis="{{ default .Env.JDBC_TIME_BETWEEN_EVICTIONS "30000" }}"
+    minEvictableIdleTimeMillis="{{ default .Env.JDBC_MIN_EVICTABLE_IDLE_TIME "60000" }}"
     />
   {{ end }}
 
@@ -54,8 +54,8 @@
     maxWaitMillis="{{ .Env.JDBC_MAX_WAIT }}"
     initialSize="{{ default .Env.JDBC_RO_INITIAL_SIZE .Env.JDBC_INITIAL_SIZE }}"
     connectionProperties="{{ .Env.JDBC_CONNECTION_PROPERTIES }}"
-    timeBetweenEvictionRunsMillis="{{ .Env.JDBC_TIME_BETWEEN_EVICTIONS }}"
-    minEvictableIdleTimeMillis="{{ .Env.JDBC_MIN_EVICTABLE_IDLE_TIME }}"
+    timeBetweenEvictionRunsMillis="{{ default .Env.JDBC_TIME_BETWEEN_EVICTIONS "30000" }}"
+    minEvictableIdleTimeMillis="{{ default .Env.JDBC_MIN_EVICTABLE_IDLE_TIME "60000" }}"
     />
 
 
diff --git a/terratest/src/test/pega/data/expectedInstallDeployContext.xml.tmpl b/terratest/src/test/pega/data/expectedInstallDeployContext.xml.tmpl
index de0a551d8..4b353ffd8 100644
--- a/terratest/src/test/pega/data/expectedInstallDeployContext.xml.tmpl
+++ b/terratest/src/test/pega/data/expectedInstallDeployContext.xml.tmpl
@@ -17,8 +17,8 @@
     maxWaitMillis="{{ .Env.JDBC_MAX_WAIT }}"
     initialSize="{{ .Env.JDBC_INITIAL_SIZE }}"
     connectionProperties="{{ .Env.JDBC_CONNECTION_PROPERTIES }}"
-    timeBetweenEvictionRunsMillis="{{ .Env.JDBC_TIME_BETWEEN_EVICTIONS }}"
-    minEvictableIdleTimeMillis="{{ .Env.JDBC_MIN_EVICTABLE_IDLE_TIME }}"
+    timeBetweenEvictionRunsMillis="{{ default .Env.JDBC_TIME_BETWEEN_EVICTIONS "30000" }}"
+    minEvictableIdleTimeMillis="{{ default .Env.JDBC_MIN_EVICTABLE_IDLE_TIME "60000" }}"
     />
 
   {{ if and .Env.DB_RW_USERNAME .Env.JDBC_RW_URL }}
@@ -35,8 +35,8 @@
     maxWaitMillis="{{ .Env.JDBC_MAX_WAIT }}"
     initialSize="{{ default .Env.JDBC_RO_INITIAL_SIZE .Env.JDBC_INITIAL_SIZE }}"
     connectionProperties="socketTimeout=1200;"
-    timeBetweenEvictionRunsMillis="{{ .Env.JDBC_TIME_BETWEEN_EVICTIONS }}"
-    minEvictableIdleTimeMillis="{{ .Env.JDBC_MIN_EVICTABLE_IDLE_TIME }}"
+    timeBetweenEvictionRunsMillis="{{ default .Env.JDBC_TIME_BETWEEN_EVICTIONS "30000" }}"
+    minEvictableIdleTimeMillis="{{ default .Env.JDBC_MIN_EVICTABLE_IDLE_TIME "60000" }}"
     />
   {{ end }}
 
@@ -54,8 +54,8 @@
     maxWaitMillis="{{ .Env.JDBC_MAX_WAIT }}"
     initialSize="{{ default .Env.JDBC_RO_INITIAL_SIZE .Env.JDBC_INITIAL_SIZE }}"
     connectionProperties="{{ .Env.JDBC_CONNECTION_PROPERTIES }}"
-    timeBetweenEvictionRunsMillis="{{ .Env.JDBC_TIME_BETWEEN_EVICTIONS }}"
-    minEvictableIdleTimeMillis="{{ .Env.JDBC_MIN_EVICTABLE_IDLE_TIME }}"
+    timeBetweenEvictionRunsMillis="{{ default .Env.JDBC_TIME_BETWEEN_EVICTIONS "30000" }}"
+    minEvictableIdleTimeMillis="{{ default .Env.JDBC_MIN_EVICTABLE_IDLE_TIME "60000" }}"
     />