diff --git a/addons/postgresql-cluster/15/chart/postgresql-cluster/templates/statefulset.yaml b/addons/postgresql-cluster/15/chart/postgresql-cluster/templates/statefulset.yaml
index d826952c..3f1efb1b 100644
--- a/addons/postgresql-cluster/15/chart/postgresql-cluster/templates/statefulset.yaml
+++ b/addons/postgresql-cluster/15/chart/postgresql-cluster/templates/statefulset.yaml
@@ -251,7 +251,7 @@ spec:
         name: storage-volume
         annotations:
         {{- if .Values.persistentVolume.annotations }}
-{{ toYaml .Values.persistentVolume.annotations | indent 8 }}
+{{ toYaml .Values.persistentVolume.annotations | indent 10 }}
         {{- end }}
         labels:
           application: {{ template "patroni.fullname" . }}
diff --git a/addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml b/addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml
index 7d103fd1..8ed9f165 100644
--- a/addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml
+++ b/addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml
@@ -1,9 +1,9 @@
 replicaCount: 3
-diagnosticMode: 
+diagnosticMode:
   enable: false
 
 service:
- type: ClusterIP
+  type: ClusterIP
 
 image:
   # Image was built from registry.drycc.cc/drycc-addons/patroni:3.2
@@ -11,13 +11,13 @@ image:
   repository: registry.drycc.cc/drycc-addons/postgresql-patroni
   tag: 15
   # IfNotPresent , Always
-  pullPolicy: 'IfNotPresent'
+  pullPolicy: "IfNotPresent"
 
-logicalbackupImages: 
+logicalbackupImages:
   repository: registry.drycc.cc/drycc-addons/postgresql-logicalbackup
   tag: 15
   # IfNotPresent , Always
-  pullPolicy: 'IfNotPresent'
+  pullPolicy: "IfNotPresent"
 
 # Credentials used by Patroni , passwd
 # https://github.com/zalando/patroni/blob/master/docs/SETTINGS.rst#postgresql
@@ -188,8 +188,7 @@ logicalbackupScript: |
 
   echo "Backup process completed!"
 
-
-postgresql: 
+postgresql:
   config: |-
     log_min_duration_statement = 1000
     max_wal_size = 4GB
@@ -204,8 +203,7 @@ patroni:
     max_worker_processes: 64
     max_parallel_workers: 32
     max_connections: 2000
-    max_slot_wal_keep_size: '2 GB'
-
+    max_slot_wal_keep_size: "2 GB"
 
   ## @param patroni.podAnnotations Additional pod annotations for Postgresql patroni pods
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
@@ -251,12 +249,12 @@ patroni:
 ## Postgresql Prometheus exporter parameters
 ##
 metrics:
-  enabled: true 
+  enabled: true
   image:
     repository: registry.drycc.cc/drycc-addons/postgres-exporter
     tag: "0"
     # IfNotPresent , Always
-    pullPolicy: 'IfNotPresent'
+    pullPolicy: "IfNotPresent"
   ## @param metrics.customMetrics Define additional custom metrics
   ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file
   ## customMetrics:
@@ -278,14 +276,14 @@ metrics:
     ## Values: ClientIP or None
     ## ref: https://kubernetes.io/docs/user-guide/services/
     ##
-    sessionAffinity: None                                                                                                                                                                                                                                                 
+    sessionAffinity: None
     ## @param metrics.service.annotations [object] Annotations for Prometheus to auto-discover the metrics endpoint
     ##
     annotations:
       prometheus.io/scrape: "true"
       prometheus.io/port: "{{ .Values.metrics.service.ports.metrics }}"
 
-  customMetrics: {} 
+  customMetrics: {}
   containerPort: 9187
   containerSecurityContext:
     enabled: false
@@ -293,8 +291,8 @@ metrics:
     runAsNonRoot: true
   customLivenessProbe: {}
   customReadinessProbe:
-    enabled: true 
-  resources: 
+    enabled: true
+  resources:
     limits:
       cpu: 100m
       memory: 512Mi
@@ -303,7 +301,7 @@ metrics:
       cpu: 100m
       memory: 512Mi
 
-logicalbackup: 
+logicalbackup:
   enabled: false
   scheduleCronJob: "22 0 * * 0"
   minio:
@@ -368,13 +366,13 @@ persistentVolume:
   accessModes:
     - ReadWriteOnce
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 100m
     memory: 512Mi
-    # hugepages-2Mi: 4Mi
+    hugepages-2Mi: 4Mi
   requests:
     cpu: 100m
     memory: 512Mi
@@ -408,7 +406,6 @@ affinityTemplate: |
             application:  {{ template "patroni.name" . }}
             release: {{ .Release.Name | quote }}
 affinity: {}
-
 ## Use an alternate scheduler, e.g. "stork".
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
 ##
@@ -429,7 +426,7 @@ serviceAccount:
 networkPolicy:
   ## @param networkPolicy.enabled Enable creation of NetworkPolicy resources
   ##
-  enabled: true 
+  enabled: true
   ## @param networkPolicy.allowExternal The Policy model to apply.
   ## When set to false, only pods with the correct
   ## client label will have network access to the port Postgresql is listening
@@ -437,5 +434,5 @@ networkPolicy:
   ## (with the correct destination port).
   ##
   allowCurrentNamespace: true
-  allowNamespaces: 
-clusterDomain: cluster.local
\ No newline at end of file
+  allowNamespaces:
+clusterDomain: cluster.local
diff --git a/addons/postgresql-cluster/15/plans/standard-16c64g400/values.yaml b/addons/postgresql-cluster/15/plans/standard-16c64g400/values.yaml
index f4cd8ae8..047deadd 100644
--- a/addons/postgresql-cluster/15/plans/standard-16c64g400/values.yaml
+++ b/addons/postgresql-cluster/15/plans/standard-16c64g400/values.yaml
@@ -6,7 +6,7 @@ patroni:
     max_worker_processes: 32
     max_parallel_workers: 16
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -57,12 +57,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 40GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -78,4 +78,4 @@ persistentVolume:
   size: 400Gi
 
 shmVolume:
-  sizeLimit: "32Gi"
\ No newline at end of file
+  sizeLimit: "32Gi"
diff --git a/addons/postgresql-cluster/15/plans/standard-2c4g20/values.yaml b/addons/postgresql-cluster/15/plans/standard-2c4g20/values.yaml
index bedec78d..8795c9b4 100644
--- a/addons/postgresql-cluster/15/plans/standard-2c4g20/values.yaml
+++ b/addons/postgresql-cluster/15/plans/standard-2c4g20/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 4
     max_parallel_workers: 2
     max_connections: 1000
-    max_slot_wal_keep_size: '2 GB'
+    max_slot_wal_keep_size: "2 GB"
 
 postgresql:
   config: |-
@@ -58,11 +58,11 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -78,4 +78,4 @@ persistentVolume:
   size: 20Gi
 
 shmVolume:
-  sizeLimit: "2Gi"
\ No newline at end of file
+  sizeLimit: "2Gi"
diff --git a/addons/postgresql-cluster/15/plans/standard-2c8g50/values.yaml b/addons/postgresql-cluster/15/plans/standard-2c8g50/values.yaml
index 564731a7..4263ffa2 100644
--- a/addons/postgresql-cluster/15/plans/standard-2c8g50/values.yaml
+++ b/addons/postgresql-cluster/15/plans/standard-2c8g50/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 4
     max_parallel_workers: 2
     max_connections: 2000
-    max_slot_wal_keep_size: '5 GB'
+    max_slot_wal_keep_size: "5 GB"
 
 postgresql:
   config: |-
@@ -59,12 +59,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 5GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -80,4 +80,4 @@ persistentVolume:
   size: 50Gi
 
 shmVolume:
-  sizeLimit: "4Gi"
\ No newline at end of file
+  sizeLimit: "4Gi"
diff --git a/addons/postgresql-cluster/15/plans/standard-32c128g800/values.yaml b/addons/postgresql-cluster/15/plans/standard-32c128g800/values.yaml
index 3af68467..c2ca0477 100644
--- a/addons/postgresql-cluster/15/plans/standard-32c128g800/values.yaml
+++ b/addons/postgresql-cluster/15/plans/standard-32c128g800/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 64
     max_parallel_workers: 32
     max_connections: 2000
-    max_slot_wal_keep_size: '100 GB'
+    max_slot_wal_keep_size: "100 GB"
 
 postgresql:
   config: |-
@@ -58,12 +58,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 80GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -79,4 +79,4 @@ persistentVolume:
   size: 800Gi
 
 shmVolume:
-  sizeLimit: "64Gi"
\ No newline at end of file
+  sizeLimit: "64Gi"
diff --git a/addons/postgresql-cluster/15/plans/standard-32c64g4000/values.yaml b/addons/postgresql-cluster/15/plans/standard-32c64g4000/values.yaml
index da70e1c9..56fc31f5 100644
--- a/addons/postgresql-cluster/15/plans/standard-32c64g4000/values.yaml
+++ b/addons/postgresql-cluster/15/plans/standard-32c64g4000/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 64
     max_parallel_workers: 32
     max_connections: 2000
-    max_slot_wal_keep_size: '200 GB'
+    max_slot_wal_keep_size: "200 GB"
 
 postgresql:
   config: |-
@@ -58,12 +58,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 100GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -79,4 +79,4 @@ persistentVolume:
   size: 4Ti
 
 shmVolume:
-  sizeLimit: "32Gi"
\ No newline at end of file
+  sizeLimit: "32Gi"
diff --git a/addons/postgresql-cluster/15/plans/standard-4c16g100/values.yaml b/addons/postgresql-cluster/15/plans/standard-4c16g100/values.yaml
index 6c91f192..effda2a8 100644
--- a/addons/postgresql-cluster/15/plans/standard-4c16g100/values.yaml
+++ b/addons/postgresql-cluster/15/plans/standard-4c16g100/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 8
     max_parallel_workers: 4
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -59,12 +59,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
-     max_slot_wal_keep_size = 10GB
+    jit = off
+    max_slot_wal_keep_size = 10GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -80,4 +80,4 @@ persistentVolume:
   size: 100Gi
 
 shmVolume:
-  sizeLimit: "8Gi"
\ No newline at end of file
+  sizeLimit: "8Gi"
diff --git a/addons/postgresql-cluster/15/plans/standard-8c32g200/values.yaml b/addons/postgresql-cluster/15/plans/standard-8c32g200/values.yaml
index dee10714..03671b6c 100644
--- a/addons/postgresql-cluster/15/plans/standard-8c32g200/values.yaml
+++ b/addons/postgresql-cluster/15/plans/standard-8c32g200/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 16
     max_parallel_workers: 8
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -58,12 +58,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 20GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -79,4 +79,4 @@ persistentVolume:
   size: 200Gi
 
 shmVolume:
-  sizeLimit: "16Gi"
\ No newline at end of file
+  sizeLimit: "16Gi"
diff --git a/addons/postgresql-cluster/16/chart/postgresql-cluster-16/templates/statefulset.yaml b/addons/postgresql-cluster/16/chart/postgresql-cluster-16/templates/statefulset.yaml
index d826952c..3f1efb1b 100644
--- a/addons/postgresql-cluster/16/chart/postgresql-cluster-16/templates/statefulset.yaml
+++ b/addons/postgresql-cluster/16/chart/postgresql-cluster-16/templates/statefulset.yaml
@@ -251,7 +251,7 @@ spec:
         name: storage-volume
         annotations:
         {{- if .Values.persistentVolume.annotations }}
-{{ toYaml .Values.persistentVolume.annotations | indent 8 }}
+{{ toYaml .Values.persistentVolume.annotations | indent 10 }}
         {{- end }}
         labels:
           application: {{ template "patroni.fullname" . }}
diff --git a/addons/postgresql-cluster/16/chart/postgresql-cluster-16/values.yaml b/addons/postgresql-cluster/16/chart/postgresql-cluster-16/values.yaml
index fcf73961..00947615 100644
--- a/addons/postgresql-cluster/16/chart/postgresql-cluster-16/values.yaml
+++ b/addons/postgresql-cluster/16/chart/postgresql-cluster-16/values.yaml
@@ -1,9 +1,9 @@
 replicaCount: 3
-diagnosticMode: 
+diagnosticMode:
   enable: false
 
 service:
- type: ClusterIP
+  type: ClusterIP
 
 image:
   # Image was built from registry.drycc.cc/drycc-addons/patroni:3.2
@@ -11,13 +11,13 @@ image:
   repository: registry.drycc.cc/drycc-addons/postgresql-patroni
   tag: 16
   # IfNotPresent , Always
-  pullPolicy: 'IfNotPresent'
+  pullPolicy: "IfNotPresent"
 
-logicalbackupImages: 
+logicalbackupImages:
   repository: registry.drycc.cc/drycc-addons/postgresql-logicalbackup
   tag: 16
   # IfNotPresent , Always
-  pullPolicy: 'IfNotPresent'
+  pullPolicy: "IfNotPresent"
 
 # Credentials used by Patroni , passwd
 # https://github.com/zalando/patroni/blob/master/docs/SETTINGS.rst#postgresql
@@ -188,8 +188,7 @@ logicalbackupScript: |
 
   echo "Backup process completed!"
 
-
-postgresql: 
+postgresql:
   config: |-
     log_min_duration_statement = 1000
     max_wal_size = 4GB
@@ -204,8 +203,7 @@ patroni:
     max_worker_processes: 64
     max_parallel_workers: 32
     max_connections: 2000
-    max_slot_wal_keep_size: '2 GB'
-
+    max_slot_wal_keep_size: "2 GB"
 
   ## @param patroni.podAnnotations Additional pod annotations for Postgresql patroni pods
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
@@ -251,12 +249,12 @@ patroni:
 ## Postgresql Prometheus exporter parameters
 ##
 metrics:
-  enabled: true 
+  enabled: true
   image:
     repository: registry.drycc.cc/drycc-addons/postgres-exporter
     tag: "0"
     # IfNotPresent , Always
-    pullPolicy: 'IfNotPresent'
+    pullPolicy: "IfNotPresent"
   ## @param metrics.customMetrics Define additional custom metrics
   ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file
   ## customMetrics:
@@ -278,14 +276,14 @@ metrics:
     ## Values: ClientIP or None
     ## ref: https://kubernetes.io/docs/user-guide/services/
     ##
-    sessionAffinity: None                                                                                                                                                                                                                                                 
+    sessionAffinity: None
     ## @param metrics.service.annotations [object] Annotations for Prometheus to auto-discover the metrics endpoint
     ##
     annotations:
       prometheus.io/scrape: "true"
       prometheus.io/port: "{{ .Values.metrics.service.ports.metrics }}"
 
-  customMetrics: {} 
+  customMetrics: {}
   containerPort: 9187
   containerSecurityContext:
     enabled: false
@@ -293,8 +291,8 @@ metrics:
     runAsNonRoot: true
   customLivenessProbe: {}
   customReadinessProbe:
-    enabled: true 
-  resources: 
+    enabled: true
+  resources:
     limits:
       cpu: 100m
       memory: 512Mi
@@ -303,7 +301,7 @@ metrics:
       cpu: 100m
       memory: 512Mi
 
-logicalbackup: 
+logicalbackup:
   enabled: false
   scheduleCronJob: "22 0 * * 0"
   minio:
@@ -368,13 +366,13 @@ persistentVolume:
   accessModes:
     - ReadWriteOnce
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 100m
     memory: 512Mi
-    # hugepages-2Mi: 4Mi
+    hugepages-2Mi: 4Mi
   requests:
     cpu: 100m
     memory: 512Mi
@@ -408,7 +406,6 @@ affinityTemplate: |
             application:  {{ template "patroni.name" . }}
             release: {{ .Release.Name | quote }}
 affinity: {}
-
 ## Use an alternate scheduler, e.g. "stork".
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
 ##
@@ -429,7 +426,7 @@ serviceAccount:
 networkPolicy:
   ## @param networkPolicy.enabled Enable creation of NetworkPolicy resources
   ##
-  enabled: true 
+  enabled: true
   ## @param networkPolicy.allowExternal The Policy model to apply.
   ## When set to false, only pods with the correct
   ## client label will have network access to the port Postgresql is listening
@@ -437,5 +434,5 @@ networkPolicy:
   ## (with the correct destination port).
   ##
   allowCurrentNamespace: true
-  allowNamespaces: 
-clusterDomain: cluster.local
\ No newline at end of file
+  allowNamespaces:
+clusterDomain: cluster.local
diff --git a/addons/postgresql-cluster/16/plans/standard-16c64g400/values.yaml b/addons/postgresql-cluster/16/plans/standard-16c64g400/values.yaml
index f4cd8ae8..047deadd 100644
--- a/addons/postgresql-cluster/16/plans/standard-16c64g400/values.yaml
+++ b/addons/postgresql-cluster/16/plans/standard-16c64g400/values.yaml
@@ -6,7 +6,7 @@ patroni:
     max_worker_processes: 32
     max_parallel_workers: 16
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -57,12 +57,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 40GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -78,4 +78,4 @@ persistentVolume:
   size: 400Gi
 
 shmVolume:
-  sizeLimit: "32Gi"
\ No newline at end of file
+  sizeLimit: "32Gi"
diff --git a/addons/postgresql-cluster/16/plans/standard-2c4g20/values.yaml b/addons/postgresql-cluster/16/plans/standard-2c4g20/values.yaml
index bedec78d..8795c9b4 100644
--- a/addons/postgresql-cluster/16/plans/standard-2c4g20/values.yaml
+++ b/addons/postgresql-cluster/16/plans/standard-2c4g20/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 4
     max_parallel_workers: 2
     max_connections: 1000
-    max_slot_wal_keep_size: '2 GB'
+    max_slot_wal_keep_size: "2 GB"
 
 postgresql:
   config: |-
@@ -58,11 +58,11 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -78,4 +78,4 @@ persistentVolume:
   size: 20Gi
 
 shmVolume:
-  sizeLimit: "2Gi"
\ No newline at end of file
+  sizeLimit: "2Gi"
diff --git a/addons/postgresql-cluster/16/plans/standard-2c8g50/values.yaml b/addons/postgresql-cluster/16/plans/standard-2c8g50/values.yaml
index 564731a7..4263ffa2 100644
--- a/addons/postgresql-cluster/16/plans/standard-2c8g50/values.yaml
+++ b/addons/postgresql-cluster/16/plans/standard-2c8g50/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 4
     max_parallel_workers: 2
     max_connections: 2000
-    max_slot_wal_keep_size: '5 GB'
+    max_slot_wal_keep_size: "5 GB"
 
 postgresql:
   config: |-
@@ -59,12 +59,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 5GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -80,4 +80,4 @@ persistentVolume:
   size: 50Gi
 
 shmVolume:
-  sizeLimit: "4Gi"
\ No newline at end of file
+  sizeLimit: "4Gi"
diff --git a/addons/postgresql-cluster/16/plans/standard-32c128g800/values.yaml b/addons/postgresql-cluster/16/plans/standard-32c128g800/values.yaml
index 3af68467..c2ca0477 100644
--- a/addons/postgresql-cluster/16/plans/standard-32c128g800/values.yaml
+++ b/addons/postgresql-cluster/16/plans/standard-32c128g800/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 64
     max_parallel_workers: 32
     max_connections: 2000
-    max_slot_wal_keep_size: '100 GB'
+    max_slot_wal_keep_size: "100 GB"
 
 postgresql:
   config: |-
@@ -58,12 +58,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 80GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -79,4 +79,4 @@ persistentVolume:
   size: 800Gi
 
 shmVolume:
-  sizeLimit: "64Gi"
\ No newline at end of file
+  sizeLimit: "64Gi"
diff --git a/addons/postgresql-cluster/16/plans/standard-32c64g4000/values.yaml b/addons/postgresql-cluster/16/plans/standard-32c64g4000/values.yaml
index da70e1c9..56fc31f5 100644
--- a/addons/postgresql-cluster/16/plans/standard-32c64g4000/values.yaml
+++ b/addons/postgresql-cluster/16/plans/standard-32c64g4000/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 64
     max_parallel_workers: 32
     max_connections: 2000
-    max_slot_wal_keep_size: '200 GB'
+    max_slot_wal_keep_size: "200 GB"
 
 postgresql:
   config: |-
@@ -58,12 +58,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 100GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -79,4 +79,4 @@ persistentVolume:
   size: 4Ti
 
 shmVolume:
-  sizeLimit: "32Gi"
\ No newline at end of file
+  sizeLimit: "32Gi"
diff --git a/addons/postgresql-cluster/16/plans/standard-4c16g100/values.yaml b/addons/postgresql-cluster/16/plans/standard-4c16g100/values.yaml
index 6c91f192..ea889707 100644
--- a/addons/postgresql-cluster/16/plans/standard-4c16g100/values.yaml
+++ b/addons/postgresql-cluster/16/plans/standard-4c16g100/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 8
     max_parallel_workers: 4
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -59,12 +59,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
      max_slot_wal_keep_size = 10GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -80,4 +80,4 @@ persistentVolume:
   size: 100Gi
 
 shmVolume:
-  sizeLimit: "8Gi"
\ No newline at end of file
+  sizeLimit: "8Gi"
diff --git a/addons/postgresql-cluster/16/plans/standard-8c32g200/values.yaml b/addons/postgresql-cluster/16/plans/standard-8c32g200/values.yaml
index dee10714..03671b6c 100644
--- a/addons/postgresql-cluster/16/plans/standard-8c32g200/values.yaml
+++ b/addons/postgresql-cluster/16/plans/standard-8c32g200/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 16
     max_parallel_workers: 8
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -58,12 +58,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 20GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -79,4 +79,4 @@ persistentVolume:
   size: 200Gi
 
 shmVolume:
-  sizeLimit: "16Gi"
\ No newline at end of file
+  sizeLimit: "16Gi"
diff --git a/addons/postgresql-cluster/17/chart/postgresql-cluster-17/templates/statefulset.yaml b/addons/postgresql-cluster/17/chart/postgresql-cluster-17/templates/statefulset.yaml
index d826952c..3f1efb1b 100644
--- a/addons/postgresql-cluster/17/chart/postgresql-cluster-17/templates/statefulset.yaml
+++ b/addons/postgresql-cluster/17/chart/postgresql-cluster-17/templates/statefulset.yaml
@@ -251,7 +251,7 @@ spec:
         name: storage-volume
         annotations:
         {{- if .Values.persistentVolume.annotations }}
-{{ toYaml .Values.persistentVolume.annotations | indent 8 }}
+{{ toYaml .Values.persistentVolume.annotations | indent 10 }}
         {{- end }}
         labels:
           application: {{ template "patroni.fullname" . }}
diff --git a/addons/postgresql-cluster/17/chart/postgresql-cluster-17/values.yaml b/addons/postgresql-cluster/17/chart/postgresql-cluster-17/values.yaml
index 0e1de2f5..fcb3407e 100644
--- a/addons/postgresql-cluster/17/chart/postgresql-cluster-17/values.yaml
+++ b/addons/postgresql-cluster/17/chart/postgresql-cluster-17/values.yaml
@@ -297,8 +297,8 @@ metrics:
   resources:
     limits:
       cpu: 100m
-      memory: 512Mi
       hugepages-2Mi: 20Mi
+      memory: 512Mi
     requests:
       cpu: 100m
       memory: 512Mi
@@ -373,8 +373,8 @@ resources:
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 100m
+    hugepages-2Mi: 4Mi
     memory: 512Mi
-    # hugepages-2Mi: 4Mi
   requests:
     cpu: 100m
     memory: 512Mi
diff --git a/addons/postgresql-cluster/17/plans/standard-16c64g400/values.yaml b/addons/postgresql-cluster/17/plans/standard-16c64g400/values.yaml
index f4cd8ae8..72b92be7 100644
--- a/addons/postgresql-cluster/17/plans/standard-16c64g400/values.yaml
+++ b/addons/postgresql-cluster/17/plans/standard-16c64g400/values.yaml
@@ -6,7 +6,7 @@ patroni:
     max_worker_processes: 32
     max_parallel_workers: 16
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -57,18 +57,18 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 40GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 16000m
-    memory: 64Gi
     hugepages-2Mi: 40Mi
+    memory: 64Gi
   requests:
     cpu: 100m
     memory: 1Gi
@@ -78,4 +78,4 @@ persistentVolume:
   size: 400Gi
 
 shmVolume:
-  sizeLimit: "32Gi"
\ No newline at end of file
+  sizeLimit: "32Gi"
diff --git a/addons/postgresql-cluster/17/plans/standard-2c4g20/values.yaml b/addons/postgresql-cluster/17/plans/standard-2c4g20/values.yaml
index bedec78d..098a0a08 100644
--- a/addons/postgresql-cluster/17/plans/standard-2c4g20/values.yaml
+++ b/addons/postgresql-cluster/17/plans/standard-2c4g20/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 4
     max_parallel_workers: 2
     max_connections: 1000
-    max_slot_wal_keep_size: '2 GB'
+    max_slot_wal_keep_size: "2 GB"
 
 postgresql:
   config: |-
@@ -58,17 +58,17 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 2000m
-    memory: 4Gi
     hugepages-2Mi: 20Mi
+    memory: 4Gi
   requests:
     cpu: 100m
     memory: 1Gi
@@ -78,4 +78,4 @@ persistentVolume:
   size: 20Gi
 
 shmVolume:
-  sizeLimit: "2Gi"
\ No newline at end of file
+  sizeLimit: "2Gi"
diff --git a/addons/postgresql-cluster/17/plans/standard-2c8g50/values.yaml b/addons/postgresql-cluster/17/plans/standard-2c8g50/values.yaml
index 564731a7..affca346 100644
--- a/addons/postgresql-cluster/17/plans/standard-2c8g50/values.yaml
+++ b/addons/postgresql-cluster/17/plans/standard-2c8g50/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 4
     max_parallel_workers: 2
     max_connections: 2000
-    max_slot_wal_keep_size: '5 GB'
+    max_slot_wal_keep_size: "5 GB"
 
 postgresql:
   config: |-
@@ -59,18 +59,18 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 5GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 2000m
-    memory: 8Gi
     hugepages-2Mi: 20Mi
+    memory: 8Gi
   requests:
     cpu: 100m
     memory: 1Gi
@@ -80,4 +80,4 @@ persistentVolume:
   size: 50Gi
 
 shmVolume:
-  sizeLimit: "4Gi"
\ No newline at end of file
+  sizeLimit: "4Gi"
diff --git a/addons/postgresql-cluster/17/plans/standard-32c128g800/values.yaml b/addons/postgresql-cluster/17/plans/standard-32c128g800/values.yaml
index 3af68467..c2ca0477 100644
--- a/addons/postgresql-cluster/17/plans/standard-32c128g800/values.yaml
+++ b/addons/postgresql-cluster/17/plans/standard-32c128g800/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 64
     max_parallel_workers: 32
     max_connections: 2000
-    max_slot_wal_keep_size: '100 GB'
+    max_slot_wal_keep_size: "100 GB"
 
 postgresql:
   config: |-
@@ -58,12 +58,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 80GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -79,4 +79,4 @@ persistentVolume:
   size: 800Gi
 
 shmVolume:
-  sizeLimit: "64Gi"
\ No newline at end of file
+  sizeLimit: "64Gi"
diff --git a/addons/postgresql-cluster/17/plans/standard-32c64g4000/values.yaml b/addons/postgresql-cluster/17/plans/standard-32c64g4000/values.yaml
index da70e1c9..56fc31f5 100644
--- a/addons/postgresql-cluster/17/plans/standard-32c64g4000/values.yaml
+++ b/addons/postgresql-cluster/17/plans/standard-32c64g4000/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 64
     max_parallel_workers: 32
     max_connections: 2000
-    max_slot_wal_keep_size: '200 GB'
+    max_slot_wal_keep_size: "200 GB"
 
 postgresql:
   config: |-
@@ -58,12 +58,12 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 100GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
@@ -79,4 +79,4 @@ persistentVolume:
   size: 4Ti
 
 shmVolume:
-  sizeLimit: "32Gi"
\ No newline at end of file
+  sizeLimit: "32Gi"
diff --git a/addons/postgresql-cluster/17/plans/standard-4c16g100/values.yaml b/addons/postgresql-cluster/17/plans/standard-4c16g100/values.yaml
index 6c91f192..83ac2774 100644
--- a/addons/postgresql-cluster/17/plans/standard-4c16g100/values.yaml
+++ b/addons/postgresql-cluster/17/plans/standard-4c16g100/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 8
     max_parallel_workers: 4
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -59,18 +59,18 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
      max_slot_wal_keep_size = 10GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 4000m
-    memory: 16Gi
     hugepages-2Mi: 50Mi
+    memory: 16Gi
   requests:
     cpu: 100m
     memory: 1Gi
@@ -80,4 +80,4 @@ persistentVolume:
   size: 100Gi
 
 shmVolume:
-  sizeLimit: "8Gi"
\ No newline at end of file
+  sizeLimit: "8Gi"
diff --git a/addons/postgresql-cluster/17/plans/standard-8c32g200/values.yaml b/addons/postgresql-cluster/17/plans/standard-8c32g200/values.yaml
index dee10714..297ca6ae 100644
--- a/addons/postgresql-cluster/17/plans/standard-8c32g200/values.yaml
+++ b/addons/postgresql-cluster/17/plans/standard-8c32g200/values.yaml
@@ -7,7 +7,7 @@ patroni:
     max_worker_processes: 16
     max_parallel_workers: 8
     max_connections: 2000
-    max_slot_wal_keep_size: '10 GB'
+    max_slot_wal_keep_size: "10 GB"
 
 postgresql:
   config: |-
@@ -58,18 +58,18 @@ postgresql:
     # Advanced features 
     enable_partitionwise_join = on 
     enable_partitionwise_aggregate = on
-    jit = on
+    jit = off
     max_slot_wal_keep_size = 20GB
     track_wal_io_timing = on
     maintenance_io_concurrency = 100
 
-resources: 
+resources:
   # If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 8000m
-    memory: 32Gi
     hugepages-2Mi: 60Mi
+    memory: 32Gi
   requests:
     cpu: 100m
     memory: 1Gi
@@ -79,4 +79,4 @@ persistentVolume:
   size: 200Gi
 
 shmVolume:
-  sizeLimit: "16Gi"
\ No newline at end of file
+  sizeLimit: "16Gi"