diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 9b6f41e..56515df 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -45,13 +45,12 @@
         username: ${DB_USERNAME}
         password: ${DB_PASSWORD}
         driverClassName: org.postgresql.Driver
-        initialization-mode: always
         hikari:
             minimumIdle: 5
             maximumPoolSize: 80
-            idleTimeout: 120000
-            connectionTimeout: 300000
-            leakDetectionThreshold: 300000
+            idleTimeout: 60000
+            connectionTimeout: 120000
+            leakDetectionThreshold: 2000
             pool-name: CpsDatabasePool
 
     cache:
@@ -91,6 +90,9 @@
       default-property-inclusion: NON_NULL
       serialization:
         FAIL_ON_EMPTY_BEANS: false
+    sql:
+      init:
+        mode: ALWAYS
 app:
     ncmp:
         async-m2m: