diff --git a/charts/pg-db/Chart.yaml b/charts/pg-db/Chart.yaml
index 5663baf4..065995c8 100644
--- a/charts/pg-db/Chart.yaml
+++ b/charts/pg-db/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: pg-db
 description: 'A Helm chart to deploy the PostgreSQL database with the Percona Operator for PostgreSQL'
 type: application
-version: 2.5.0
+version: 2.5.1
 appVersion: 2.5.0
 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/
 maintainers:
diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md
index 30a4446e..728b7a80 100644
--- a/charts/pg-db/README.md
+++ b/charts/pg-db/README.md
@@ -24,7 +24,7 @@ To install the chart with the `pg` release name using a dedicated namespace (rec
 
 ```sh
 helm repo add percona https://percona.github.io/percona-helm-charts/
-helm install my-db percona/pg-db --version 2.5.0 --namespace my-namespace
+helm install my-db percona/pg-db --version 2.5.1 --namespace my-namespace
 ```
 
 The chart can be customized using the following configurable parameters:
diff --git a/charts/pg-db/templates/cluster.yaml b/charts/pg-db/templates/cluster.yaml
index ac318c4b..78b6a475 100644
--- a/charts/pg-db/templates/cluster.yaml
+++ b/charts/pg-db/templates/cluster.yaml
@@ -227,12 +227,7 @@ spec:
 
       {{- if $instance.tolerations }}
       tolerations:
-      {{- range $toleration :=  $instance.tolerations }}
-        - effect: {{ $toleration.effect }}
-          key: {{ $toleration.key }}
-          operator: {{ $toleration.operator }}
-          value: {{ $toleration.value }}
-      {{- end }}
+{{ $instance.tolerations | toYaml | indent 8 }}
       {{- end }}
 
       {{- if $instance.priorityClassName }}
@@ -361,12 +356,7 @@ spec:
       {{- end }}
       {{- if .Values.proxy.pgBouncer.tolerations }}
       tolerations:
-      {{- range $toleration := .Values.proxy.pgBouncer.tolerations }}
-        - effect: {{ $toleration.effect }}
-          key: {{ $toleration.key }}
-          operator: {{ $toleration.operator }}
-          value: {{ $toleration.value }}
-      {{- end }}
+{{ .Values.proxy.pgBouncer.tolerations | toYaml | indent 8 }}
       {{- end }}
       {{- if .Values.proxy.pgBouncer.securityContext }}
       securityContext: 
@@ -422,15 +412,10 @@ spec:
             memory: {{ .Values.backups.pgbackrest.jobs.resources.limits.memory }}
         {{- if .Values.backups.pgbackrest.jobs.tolerations }}
         tolerations:
-        {{- range $toleration := .Values.backups.pgbackrest.jobs.tolerations }}
-          - effect: {{ $toleration.effect }}
-            key: {{ $toleration.key }}
-            operator: {{ $toleration.operator }}
-            value: {{ $toleration.value }}
-        {{- end }}
+{{ .Values.backups.pgbackrest.jobs.tolerations | toYaml | indent 10 }}
         {{- end }}
         {{- if .Values.backups.pgbackrest.jobs.securityContext }}
-        securityContext: 
+        securityContext:
 {{ .Values.backups.pgbackrest.jobs.securityContext | toYaml | indent 10 }}
         {{- end }}
       {{- end }}