diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 6bbe80b..ea1b93b 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -46,6 +46,13 @@
         password: ${DB_PASSWORD}
         driverClassName: org.postgresql.Driver
         initialization-mode: always
+        hikari:
+            minimumIdle: 5
+            maximumPoolSize: 80
+            idleTimeout: 120000
+            connectionTimeout: 300000
+            leakDetectionThreshold: 300000
+            pool-name: CpsDatabasePool
 
     cache:
         type: caffeine
@@ -164,4 +171,4 @@
     locked-modules-sync:
         sleep-time-ms: 300000
     cm-handle-data-sync:
-        sleep-time-ms: 30000
\ No newline at end of file
+        sleep-time-ms: 30000
diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties
index 47bb43b..449aa93 100644
--- a/csit/plans/cps/test.properties
+++ b/csit/plans/cps/test.properties
@@ -23,4 +23,7 @@
 DOCKER_REPO=nexus3.onap.org:10003
 
 CPS_VERSION=latest
-DMI_VERSION=1.2.0-SNAPSHOT-latest
\ No newline at end of file
+DMI_VERSION=1.2.0-SNAPSHOT-latest
+
+ADVISED_MODULES_SYNC_SLEEP_TIME_MS=2000
+CMHANDLE_DATA_SYNC_SLEEP_TIME_MS=2000
\ No newline at end of file
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 8d3a0a3..ca7795f 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -49,8 +49,8 @@
       notification.enabled: 'true'
       notification.async.executor.time-out-value-in-ms: 2000
       NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
-      TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: 2000
-      TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: 2000
+      TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: ${ADVISED_MODULES_SYNC_SLEEP_TIME_MS:-30000}
+      TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: ${CMHANDLE_DATA_SYNC_SLEEP_TIME_MS:-30000}
     restart: unless-stopped
     depends_on:
       - dbpostgresql