diff --git a/docker-compose.yml b/docker-compose.yml
index bf88b1f..89b0fa9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,8 +46,10 @@ services:
       - PINPOINT_APPLICATION_NAME=dorumdorum
       - PINPOINT_AGENT_ID=${PINPOINT_AGENT_ID:-dorumdorum-backend-${HOSTNAME}}
       - PINPOINT_AGENT_NAME=${PINPOINT_AGENT_NAME:-dorumdorum-be}
+      - JAVA_OPTS=-Xms6g -Xmx6g -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -Xlog:gc\*:file=/var/log/gc.log:time,uptime,level,tags:filecount=5,filesize=20m
     volumes:
       - ./firebase-service-account.json:/app/firebase-service-account.json:ro
+      - gc_logs:/var/log
     depends_on:
       postgres:
         condition: service_healthy
@@ -55,11 +57,8 @@ services:
         condition: service_started
       pinpoint-collector:
         condition: service_started
-    deploy:
-      resources:
-        limits:
-          cpus: "4.0"
-          memory: 16G
+    mem_limit: 8G
+    cpus: 2.0
     restart: unless-stopped
     networks:
       - dorumdorum-net
@@ -185,6 +184,7 @@ volumes:
   grafana_data:
   hbase_data:
   zookeeper_data:
+  gc_logs:
 
 networks:
   dorumdorum-net:
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 94c2503..f204d39 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,13 +1,17 @@
 server:
   shutdown: graceful
+  tomcat:
+    threads:
+      max: 100
+      min-spare: 10
 
 spring:
   lifecycle:
     timeout-per-shutdown-phase: 30s
   datasource:
     hikari:
-      maximum-pool-size: 16
-      minimum-idle: 4
+      maximum-pool-size: 8
+      minimum-idle: 2
       connection-timeout: 5000
       validation-timeout: 1000
       idle-timeout: 600000