diff --git a/docs/reference/cluster_manifest.md b/docs/reference/cluster_manifest.md
index 92e457d7e..955622843 100644
--- a/docs/reference/cluster_manifest.md
+++ b/docs/reference/cluster_manifest.md
@@ -111,12 +111,12 @@ These parameters are grouped directly under  the `spec` key in the manifest.
   value overrides the `pod_toleration` setting from the operator. Optional.
 
 * **podPriorityClassName**
-   a name of the [priority
-   class](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass)
-   that should be assigned to the cluster pods. When not specified, the value
-   is taken from the `pod_priority_class_name` operator parameter, if not set
-   then the default priority class is taken. The priority class itself must be
-   defined in advance. Optional.
+  a name of the [priority
+  class](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass)
+  that should be assigned to the cluster pods. When not specified, the value
+  is taken from the `pod_priority_class_name` operator parameter, if not set
+  then the default priority class is taken. The priority class itself must be
+  defined in advance. Optional.
 
 * **podAnnotations**
   A map of key value pairs that gets attached as [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
@@ -184,9 +184,9 @@ explanation of `ttl` and `loop_wait` parameters.
   ```
   hostssl all +pamrole all pam
   ```
-  , where pamrole is the name of the role for the pam authentication; any
-    custom `pg_hba` should include the pam line to avoid breaking pam
-    authentication. Optional.
+  where pamrole is the name of the role for the pam authentication; any
+  custom `pg_hba` should include the pam line to avoid breaking pam
+  authentication. Optional.
 
 * **ttl**
   Patroni `ttl` parameter value, optional. The default is set by the Spilo
@@ -379,4 +379,4 @@ Those parameters are grouped under the `tls` top-level key.
 
 * **caFile**
   Optional filename to the CA certificate. Useful when the client connects
-  with `sslmode=verify-ca` or `sslmode=verify-full`.
+  with `sslmode=verify-ca` or `sslmode=verify-full`. Default is empty.
diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md
index ba8e73cf8..86eedd33c 100644
--- a/docs/reference/operator_parameters.md
+++ b/docs/reference/operator_parameters.md
@@ -285,11 +285,11 @@ configuration they are grouped under the `kubernetes` key.
   capability. The default is `false`.
 
 * **master_pod_move_timeout**
-   The period of time to wait for the success of migration of master pods from
-   an unschedulable node. The migration includes Patroni switchovers to
-   respective replicas on healthy nodes. The situation where master pods still
-   exist on the old node after this timeout expires has to be fixed manually.
-   The default is 20 minutes.
+  The period of time to wait for the success of migration of master pods from
+  an unschedulable node. The migration includes Patroni switchovers to
+  respective replicas on healthy nodes. The situation where master pods still
+  exist on the old node after this timeout expires has to be fixed manually.
+  The default is 20 minutes.
 
 * **enable_pod_antiaffinity**
   toggles [pod anti affinity](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)
diff --git a/docs/user.md b/docs/user.md
index 6e71d0404..9a6752185 100644
--- a/docs/user.md
+++ b/docs/user.md
@@ -30,7 +30,7 @@ spec:
   databases:
     foo: zalando
   postgresql:
-    version: "11"
+    version: "12"
 ```
 
 Once you cloned the Postgres Operator [repository](https://github.com/zalando/postgres-operator)
@@ -515,9 +515,9 @@ executed.
 ## Custom TLS certificates
 
 By default, the spilo image generates its own TLS certificate during startup.
-This certificate is not secure since it cannot be verified and thus doesn't
-protect from active MITM attacks. In this section we show how a Kubernete
-Secret resources can be loaded with a custom TLS certificate.
+However, this certificate cannot be verified and thus doesn't protect from
+active MITM attacks. In this section we show how to specify a custom TLS
+certificate which is mounted in the database pods via a K8s Secret.
 
 Before applying these changes, the operator must also be configured with the
 `spilo_fsgroup` set to the GID matching the postgres user group. If the value
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index f6be8a600..f0d8a0b23 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -473,7 +473,7 @@ class K8s:
     Wraps around K8 api client and helper methods.
     '''
 
-    RETRY_TIMEOUT_SEC = 5
+    RETRY_TIMEOUT_SEC = 10
 
     def __init__(self):
         self.api = K8sApi()
diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml
index ceb27a5c3..c82f1eac5 100644
--- a/manifests/complete-postgres-manifest.yaml
+++ b/manifests/complete-postgres-manifest.yaml
@@ -24,7 +24,7 @@ spec:
   databases:
     foo: zalando
   postgresql:
-    version: "11"
+    version: "12"
     parameters: # Expert section
       shared_buffers: "32MB"
       max_connections: "10"
diff --git a/manifests/minimal-postgres-manifest.yaml b/manifests/minimal-postgres-manifest.yaml
index 75dfdf07f..af0add8e6 100644
--- a/manifests/minimal-postgres-manifest.yaml
+++ b/manifests/minimal-postgres-manifest.yaml
@@ -16,4 +16,4 @@ spec:
   databases:
     foo: zalando  # dbname: owner
   postgresql:
-    version: "11"
+    version: "12"
diff --git a/manifests/standby-manifest.yaml b/manifests/standby-manifest.yaml
index 2b621bd10..4c8d09650 100644
--- a/manifests/standby-manifest.yaml
+++ b/manifests/standby-manifest.yaml
@@ -9,7 +9,7 @@ spec:
     size: 1Gi
   numberOfInstances: 1
   postgresql:
-    version: "11"
+    version: "12"
 # 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/"
diff --git a/ui/manifests/deployment.yaml b/ui/manifests/deployment.yaml
index 477e4d655..6138ca1a8 100644
--- a/ui/manifests/deployment.yaml
+++ b/ui/manifests/deployment.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: postgres-operator-ui
       containers:
         - name: "service"
-          image: registry.opensource.zalan.do/acid/postgres-operator-ui:v1.3.0
+          image: registry.opensource.zalan.do/acid/postgres-operator-ui:v1.4.0
           ports:
             - containerPort: 8081
               protocol: "TCP"