diff --git a/infrastructure/charts/agent/templates/postgresql.yaml b/infrastructure/charts/agent/templates/postgresql.yaml
index b28f5a4e35..d34e98fc9e 100644
--- a/infrastructure/charts/agent/templates/postgresql.yaml
+++ b/infrastructure/charts/agent/templates/postgresql.yaml
@@ -38,6 +38,9 @@ spec:
     agent: agent-admin
   postgresql:
     version: "14"
+    parameters: # Expert section
+      shared_buffers: {{ .Values.database.postgres.sharedBuffers }}
+      max_connections: {{ .Values.database.postgres.maxConnections }}
 
 {{- if .Values.keycloak.enabled }}
 ---
diff --git a/infrastructure/charts/agent/values.yaml b/infrastructure/charts/agent/values.yaml
index a2937a8adb..9b892b851a 100644
--- a/infrastructure/charts/agent/values.yaml
+++ b/infrastructure/charts/agent/values.yaml
@@ -68,6 +68,8 @@ database:
     managingTeam: atala
     databaseSize: 4Gi
     numberOfInstances: 2
+    sharedBuffers: 125MB
+    maxConnections: 40
     resources:
       requests:
         cpu: 100m