diff --git a/clusters/yc-infra-prod/infrastructure/patches/postgresql.yaml b/clusters/yc-infra-prod/infrastructure/patches/postgresql.yaml
index a043efe..c178820 100644
--- a/clusters/yc-infra-prod/infrastructure/patches/postgresql.yaml
+++ b/clusters/yc-infra-prod/infrastructure/patches/postgresql.yaml
@@ -17,6 +17,9 @@ spec:
       tag: "13.0.9"
       pullPolicy: IfNotPresent
     postgresqlSharedPreloadLibraries: "timescaledb,pg_stat_statements"
+    shmVolume:
+      enabled: true
+      sizeLimit: 1Gi
     primary:
       containerSecurityContext:
         readOnlyRootFilesystem: false
@@ -25,18 +28,61 @@ spec:
         fsync = off
         full_page_writes = off
         synchronous_commit = off
-        shared_buffers = 8GB
+        shared_buffers = 6GB
         effective_cache_size = 18GB
-        work_mem = 256MB
-        maintenance_work_mem = 2GB
-        temp_buffers = 256MB
-        max_wal_size = 32GB
+        work_mem = 64MB
+        maintenance_work_mem = 1536MB
+        temp_buffers = 64MB
+        max_connections = 60
+        autovacuum = off
+        jit = off
+        max_parallel_workers = 4
+        max_parallel_maintenance_workers = 2
+        max_wal_size = 16GB
         checkpoint_timeout = 1h
         checkpoint_completion_target = 0.9
         wal_level = minimal
         max_wal_senders = 0
         archive_mode = off
         random_page_cost = 1.1
+      terminationGracePeriodSeconds: 3600
+      customStartupProbe:
+        exec:
+          command:
+            - /bin/sh
+            - -ec
+            - |
+              pid_file="${PGDATA:-/bitnami/postgresql/data}/postmaster.pid"
+              test -s "$pid_file" && kill -0 "$(head -n 1 "$pid_file")"
+        initialDelaySeconds: 30
+        periodSeconds: 10
+        timeoutSeconds: 5
+        successThreshold: 1
+        failureThreshold: 720
+      customLivenessProbe:
+        exec:
+          command:
+            - /bin/sh
+            - -ec
+            - |
+              pid_file="${PGDATA:-/bitnami/postgresql/data}/postmaster.pid"
+              test -s "$pid_file" && kill -0 "$(head -n 1 "$pid_file")"
+        initialDelaySeconds: 120
+        periodSeconds: 30
+        timeoutSeconds: 5
+        successThreshold: 1
+        failureThreshold: 20
+      customReadinessProbe:
+        exec:
+          command:
+            - /bin/sh
+            - -ec
+            - exec pg_isready -U "postgres" -h 127.0.0.1 -p 5432
+        initialDelaySeconds: 5
+        periodSeconds: 10
+        timeoutSeconds: 5
+        successThreshold: 1
+        failureThreshold: 6
       resources:
         requests:
           cpu: "6"