diff --git a/charts/cluster/examples/custom-queries.yaml b/charts/cluster/examples/custom-queries.yaml
index c02af38b60..b7a8f5f311 100644
--- a/charts/cluster/examples/custom-queries.yaml
+++ b/charts/cluster/examples/custom-queries.yaml
@@ -8,7 +8,7 @@ cluster:
     customQueries:
       - name: "pg_cache_hit"
         query: |
-          SELECT 
+          SELECT
             current_database() as datname,
             sum(heap_blks_hit) / (sum(heap_blks_hit) + sum(heap_blks_read)) as ratio
           FROM pg_statio_user_tables;
diff --git a/charts/cluster/templates/scheduled-backups.yaml b/charts/cluster/templates/scheduled-backups.yaml
index 47a0717d69..4db3d56c5f 100644
--- a/charts/cluster/templates/scheduled-backups.yaml
+++ b/charts/cluster/templates/scheduled-backups.yaml
@@ -5,9 +5,10 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
-  name: {{ include "cluster.fullname" $context  }}-{{ .name }}
-  namespace: {{ include "cluster.namespace" $ }}
-  labels: {{ include "cluster.labels" $context | nindent 4 }}
+  name: {{ include "cluster.fullname" $context }}-{{ .name }}
+  namespace: {{ include "cluster.namespace" $context }}
+  labels:
+    {{- include "cluster.labels" $context | nindent 4 }}
 spec:
   immediate: true
   schedule: {{ .schedule | quote }}
diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
index 2c7e8b5c15..d26f14df4e 100644
--- a/charts/cluster/values.yaml
+++ b/charts/cluster/values.yaml
@@ -493,7 +493,7 @@ backups:
   retentionPolicy: "30d"
 
 replica:
-  # --  Defines the name of this cluster. It is used to determine if this is a primary or a replica cluster, comparing it with primary. Leave empty by default.
+  # -- Defines the name of this cluster. It is used to determine if this is a primary or a replica cluster, comparing it with primary. Leave empty by default.
   self: ""
   # -- Primary defines which Cluster is defined to be the primary in the distributed PostgreSQL cluster, based on the topology specified in externalClusters
   primary: ""
@@ -502,7 +502,7 @@ replica:
   # -- When replica mode is enabled, this parameter allows you to replay transactions only when the system time is at least the configured time past the commit time. This provides an opportunity to correct data loss errors. Note that when this parameter is set, a promotion token cannot be used.
   minApplyDelay: ""
   bootstrap:
-    # --  One of `object_store` or `pg_basebackup`. Method to use for bootstrap.
+    # -- One of `object_store` or `pg_basebackup`. Method to use for bootstrap.
     source: ""
     # -- Name of the database used by the application
     database: ""