diff --git a/charts/postgres-operator/values-configmap.yaml b/charts/postgres-operator/values-configmap.yaml
index ae9e06fe9..4b12b1091 100644
--- a/charts/postgres-operator/values-configmap.yaml
+++ b/charts/postgres-operator/values-configmap.yaml
@@ -55,7 +55,7 @@ configKubernetes:
   # additional labels assigned to the cluster objects
   cluster_labels: application:spilo
   # label assigned to Kubernetes objects created by the operator
-  cluster_name_label: version
+  cluster_name_label: cluster-name
   # annotations attached to each database pod
   # custom_pod_annotations: keya:valuea,keyb:valueb
 
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml
index a8e9cbb61..5b1a15b1d 100644
--- a/manifests/postgresql-operator-default-configuration.yaml
+++ b/manifests/postgresql-operator-default-configuration.yaml
@@ -22,7 +22,7 @@ configuration:
     cluster_domain: cluster.local
     cluster_labels:
       application: spilo
-    cluster_name_label: version
+    cluster_name_label: cluster-name
     # custom_pod_annotations:
     #   keya: valuea
     #   keyb: valueb
diff --git a/manifests/standby-manifest.yaml b/manifests/standby-manifest.yaml
index 49f2b1a1f..e1bcaf104 100644
--- a/manifests/standby-manifest.yaml
+++ b/manifests/standby-manifest.yaml
@@ -9,7 +9,7 @@ spec:
     size: 1Gi
   numberOfInstances: 1
   postgresql:
-    version: "10"
+    version: "11"
 # Make this a standby cluster and provide the s3 bucket path of source cluster for continuous streaming.
   standby:
     s3_wal_path: "s3://path/to/bucket/containing/wal/of/source/cluster/"