diff --git a/infra-backoffice/src/main/resources/application-datasource.yaml b/infra-backoffice/src/main/resources/application-datasource.yaml
index 5c7ef62f..ec7a24d4 100644
--- a/infra-backoffice/src/main/resources/application-datasource.yaml
+++ b/infra-backoffice/src/main/resources/application-datasource.yaml
@@ -46,11 +46,13 @@ spring:
     password: ${POSTGRESQL_PW}
     driver-class-name: org.postgresql.Driver
     hikari:
+      maximum-pool-size: 100
       minimum-idle: 10
-      maximum-pool-size: 30
-      idle-timeout: 30000 # 5분
-      connection-timeout: 20000 # 30초
-      max-lifetime: 1800000 # 30분
+      idle-timeout: 300000 # 5분
+      max-lifetime: 900000 # 15분
+      connection-timeout: 20000 # 20초
+      validation-timeout: 5000 # 5초
+      leak-detection-threshold: 20000 # 20초
   jpa:
     hibernate:
       ddl-auto: none
diff --git a/infra/src/main/resources/application-infra.yaml b/infra/src/main/resources/application-infra.yaml
index e6679693..d4d025df 100644
--- a/infra/src/main/resources/application-infra.yaml
+++ b/infra/src/main/resources/application-infra.yaml
@@ -52,11 +52,13 @@ spring:
     password: ${POSTGRESQL_PW}
     driver-class-name: org.postgresql.Driver
     hikari:
+      maximum-pool-size: 100
       minimum-idle: 10
-      maximum-pool-size: 30
-      idle-timeout: 30000 # 5분
-      connection-timeout: 20000 # 30초
-      max-lifetime: 1800000 # 30분
+      idle-timeout: 300000 # 5분
+      max-lifetime: 900000 # 15분
+      connection-timeout: 20000 # 20초
+      validation-timeout: 5000 # 5초
+      leak-detection-threshold: 20000 # 20초
   jpa:
     hibernate:
       ddl-auto: none