diff --git a/hoot-services/src/main/webapp/META-INF/context.xml.in b/hoot-services/src/main/webapp/META-INF/context.xml.in
index 7296021..05b8708 100644
--- a/hoot-services/src/main/webapp/META-INF/context.xml.in
+++ b/hoot-services/src/main/webapp/META-INF/context.xml.in
@@ -23,11 +23,11 @@
driverClassName="org.postgresql.Driver"
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
username="${DB_USER}" password="${DB_PASSWORD}"
- maxActive="90"
+ maxTotal="90"
initialSize="25"
minIdle="0"
- maxIdle="30"
- maxWait="10000"
+ maxIdle="25"
+ maxWaitMillis="10000"
timeBetweenEvictionRunsMillis="30000"
minEvictableIdleTimeMillis="60000"
testWhileIdle="true"