diff --git a/container/config-generator/templates/sagittarius.sagittarius.yml.erb b/container/config-generator/templates/sagittarius.sagittarius.yml.erb
index 090b46c8..60ad794a 100644
--- a/container/config-generator/templates/sagittarius.sagittarius.yml.erb
+++ b/container/config-generator/templates/sagittarius.sagittarius.yml.erb
@@ -1,12 +1,14 @@
 rails:
   web:
     force_ssl: false
+    threads: <%= env('SAGITTARIUS_RAILS_WEB_THREADS', '3') %>
+  grpc:
+    threads: <%= env('SAGITTARIUS_RAILS_GRPC_THREADS', '6') %>
   log_level: <%= env('SAGITTARIUS_LOG_LEVEL', 'info') %>
-  threads: <%= env('SAGITTARIUS_RAILS_THREADS', '3') %>
   db:
     host: <%= env!('POSTGRES_HOST') %>
     port: <%= env!('POSTGRES_PORT') %>
-    pool_size: <%= env('SAGITTARIUS_DB_POOL_SIZE', '5') %>
+    pool_size: <%= env('SAGITTARIUS_DB_POOL_SIZE', '8') %>
     encryption:
       primary_key: <%= env!('SAGITTARIUS_DB_ENCRYPTION_PRIMARY_KEY') %>
       deterministic_key: <%= env!('SAGITTARIUS_DB_ENCRYPTION_DETERMINISTIC_KEY') %>
diff --git a/docker-compose/.env b/docker-compose/.env
index 624dd326..a7f4b1f0 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -68,8 +68,10 @@ SAGITTARIUS_CABLE_PORT=3000
 SAGITTARIUS_GRPC_HOST=sagittarius-grpc
 SAGITTARIUS_GRPC_PORT=50051
 SAGITTARIUS_LOG_LEVEL=info
-SAGITTARIUS_RAILS_THREADS=3
-SAGITTARIUS_DB_POOL_SIZE=5
+# web threads and grpc threads must be lower than db pool size
+SAGITTARIUS_RAILS_WEB_THREADS=3
+SAGITTARIUS_RAILS_GRPC_THREADS=6
+SAGITTARIUS_DB_POOL_SIZE=8
 SCULPTOR_HOST=sculptor
 SCULPTOR_PORT=3000
 POSTGRES_HOST=postgres