diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml
new file mode 100644
index 000000000..78ce9cedc
--- /dev/null
+++ b/charts/postgres-operator/crds/operatorconfigurations.yaml
@@ -0,0 +1,297 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: operatorconfigurations.acid.zalan.do
+  labels:
+    app.kubernetes.io/name: postgres-operator
+  annotations:
+    "helm.sh/hook": crd-install
+spec:
+  group: acid.zalan.do
+  names:
+    kind: OperatorConfiguration
+    listKind: OperatorConfigurationList
+    plural: operatorconfigurations
+    singular: operatorconfiguration
+    shortNames:
+    - opconfig
+  additionalPrinterColumns:
+  - name: Image
+    type: string
+    description: Spilo image to be used for Pods
+    JSONPath: .configuration.docker_image
+  - name: Cluster-Label
+    type: string
+    description: Label for K8s resources created by operator
+    JSONPath: .configuration.kubernetes.cluster_name_label
+  - name: Service-Account
+    type: string
+    description: Name of service account to be used
+    JSONPath: .configuration.kubernetes.pod_service_account_name
+  - name: Min-Instances
+    type: integer
+    description: Minimum number of instances per Postgres cluster
+    JSONPath: .configuration.min_instances
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
+  scope: Namespaced
+  subresources:
+    status: {}
+  version: v1
+  validation:
+    openAPIV3Schema:
+      type: object
+      required:
+        - kind
+        - apiVersion
+        - configuration
+      properties:
+        kind:
+          type: string
+          enum:
+            - OperatorConfiguration
+        apiVersion:
+          type: string
+          enum:
+            - acid.zalan.do/v1
+        configuration:
+          type: object
+          properties:
+            etcd_host:
+              type: string
+            docker_image:
+              type: string
+            max_instances:
+              type: integer
+              minimum: -1  # -1 = disabled
+            min_instances:
+              type: integer
+              minimum: -1  # -1 = disabled
+            resync_period:
+              type: string
+            repair_period:
+              type: string
+            set_memory_request_to_limit:
+              type: boolean
+            sidecar_docker_images:
+              type: object
+              additionalProperties:
+                type: string
+            workers:
+              type: integer
+              minimum: 1
+            users:
+              type: object
+              properties:
+                replication_username:
+                   type: string
+                super_username:
+                   type: string
+            kubernetes:
+              type: object
+              properties:
+                cluster_domain:
+                  type: string
+                cluster_labels:
+                  type: object
+                  additionalProperties:
+                    type: string
+                cluster_name_label:
+                  type: string
+                custom_pod_annotations:
+                  type: object
+                  additionalProperties:
+                    type: string
+                enable_pod_antiaffinity:
+                  type: boolean
+                enable_pod_disruption_budget:
+                  type: boolean
+                infrastructure_roles_secret_name:
+                  type: string
+                inherited_labels:
+                  type: array
+                  items:
+                    type: string
+                node_readiness_label:
+                  type: array
+                  items:
+                    type: string
+                  nullable: true
+                oauth_token_secret_name:
+                  type: string
+                pdb_name_format:
+                  type: string
+                pod_antiaffinity_topology_key:
+                  type: string
+                pod_environment_configmap:
+                  type: string
+                pod_management_policy:
+                  type: string
+                  enum:
+                    - "ordered_ready"
+                    - "parallel"
+                pod_role_label:
+                  type: string
+                pod_service_account_name:
+                  type: string
+                pod_terminate_grace_period:
+                  type: string
+                secret_name_template:
+                  type: string
+                spilo_fsgroup:
+                  type: integer
+                spilo_privileged:
+                  type: boolean
+                toleration:
+                  type: object
+                  additionalProperties:
+                    type: string
+                watched_namespace:
+                  type: string
+            postgres_pod_resources:
+              type: object
+              properties:
+                default_cpu_limit:
+                  type: string
+                  pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
+                default_cpu_request:
+                  type: string
+                  pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
+                default_memory_limit:
+                  type: string
+                  pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
+                default_memory_request:
+                  type: string
+                  pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
+            timeouts:
+              type: object
+              properties:
+                pod_label_wait_timeout:
+                  type: string
+                pod_deletion_wait_timeout:
+                  type: string
+                ready_wait_interval:
+                  type: string
+                ready_wait_timeout:
+                  type: string
+                resource_check_interval:
+                  type: string
+                resource_check_timeout:
+                  type: string
+            load_balancer:
+              type: object
+              properties:
+                db_hosted_zone:
+                  type: string
+                enable_master_load_balancer:
+                  type: boolean
+                enable_replica_load_balancer:
+                  type: boolean
+                custom_service_annotations:
+                  type: object
+                  additionalProperties:
+                    type: string
+                master_dns_name_format:
+                  type: string
+                replica_dns_name_format:
+                  type: string
+            aws_or_gcp:
+              type: object
+              properties:
+                additional_secret_mount:
+                  type: string
+                additional_secret_mount_path:
+                  type: string
+                aws_region:
+                  type: string
+                kube_iam_role:
+                  type: string
+                log_s3_bucket:
+                  type: string
+                wal_s3_bucket:
+                  type: string
+            logical_backup:
+              type: object
+              properties:
+                logical_backup_schedule:
+                  type: string
+                  pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
+                logical_backup_docker_image:
+                  type: string
+                logical_backup_s3_bucket:
+                  type: string
+                logical_backup_s3_endpoint:
+                  type: string
+                logical_backup_s3_sse:
+                  type: string
+                logical_backup_s3_access_key_id:
+                  type: string
+                logical_backup_s3_secret_access_key:
+                  type: string
+            debug:
+              type: object
+              properties:
+                debug_logging:
+                  type: boolean
+                enable_database_access:
+                  type: boolean
+            teams_api:
+              type: object
+              properties:
+                enable_admin_role_for_users:
+                  type: boolean
+                enable_team_superuser:
+                  type: boolean
+                enable_teams_api:
+                  type: boolean
+                pam_configuration:
+                  type: string
+                pam_role_name:
+                  type: string
+                postgres_superuser_teams:
+                  type: array
+                  items:
+                    type: string
+                protected_role_names:
+                  type: array
+                  items:
+                    type: string
+                team_admin_role:
+                  type: string
+                team_api_role_configuration:
+                  type: object
+                  additionalProperties:
+                    type: string
+                teams_api_url:
+                  type: string
+            logging_rest_api:
+              type: object
+              properties:
+                api_port:
+                  type: integer
+                cluster_history_entries:
+                  type: integer
+                ring_log_lines:
+                  type: integer
+            scalyr:
+              type: object
+              properties:
+                scalyr_api_key:
+                  type: string
+                scalyr_cpu_limit:
+                  type: string
+                  pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
+                scalyr_cpu_request:
+                  type: string
+                  pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
+                scalyr_image:
+                  type: string
+                scalyr_memory_limit:
+                  type: string
+                  pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
+                scalyr_memory_request:
+                  type: string
+                  pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
+                scalyr_server_url:
+                  type: string
diff --git a/charts/postgres-operator/templates/customrresourcedefinition.yaml b/charts/postgres-operator/crds/postgresqls.yaml
similarity index 56%
rename from charts/postgres-operator/templates/customrresourcedefinition.yaml
rename to charts/postgres-operator/crds/postgresqls.yaml
index 79a74a090..a8c5f2954 100644
--- a/charts/postgres-operator/templates/customrresourcedefinition.yaml
+++ b/charts/postgres-operator/crds/postgresqls.yaml
@@ -1,13 +1,9 @@
-{{ if .Values.crd.create }}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: postgresqls.acid.zalan.do
   labels:
-    app.kubernetes.io/name: {{ template "postgres-operator.name" . }}
-    helm.sh/chart: {{ template "postgres-operator.chart" . }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/name: postgres-operator
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -365,305 +361,3 @@ spec:
                   type: string
                 subPath:
                   type: string
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: operatorconfigurations.acid.zalan.do
-  labels:
-    app.kubernetes.io/name: {{ template "postgres-operator.name" . }}
-    helm.sh/chart: {{ template "postgres-operator.chart" . }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-  annotations:
-    "helm.sh/hook": crd-install
-spec:
-  group: acid.zalan.do
-  names:
-    kind: OperatorConfiguration
-    listKind: OperatorConfigurationList
-    plural: operatorconfigurations
-    singular: operatorconfiguration
-    shortNames:
-    - opconfig
-  additionalPrinterColumns:
-  - name: Image
-    type: string
-    description: Spilo image to be used for Pods
-    JSONPath: .configuration.docker_image
-  - name: Cluster-Label
-    type: string
-    description: Label for K8s resources created by operator
-    JSONPath: .configuration.kubernetes.cluster_name_label
-  - name: Service-Account
-    type: string
-    description: Name of service account to be used
-    JSONPath: .configuration.kubernetes.pod_service_account_name
-  - name: Min-Instances
-    type: integer
-    description: Minimum number of instances per Postgres cluster
-    JSONPath: .configuration.min_instances
-  - name: Age
-    type: date
-    JSONPath: .metadata.creationTimestamp
-  scope: Namespaced
-  subresources:
-    status: {}
-  version: v1
-  validation:
-    openAPIV3Schema:
-      type: object
-      required:
-        - kind
-        - apiVersion
-        - configuration
-      properties:
-        kind:
-          type: string
-          enum:
-            - OperatorConfiguration
-        apiVersion:
-          type: string
-          enum:
-            - acid.zalan.do/v1
-        configuration:
-          type: object
-          properties:
-            etcd_host:
-              type: string
-            docker_image:
-              type: string
-            max_instances:
-              type: integer
-              minimum: -1  # -1 = disabled
-            min_instances:
-              type: integer
-              minimum: -1  # -1 = disabled
-            resync_period:
-              type: string
-            repair_period:
-              type: string
-            set_memory_request_to_limit:
-              type: boolean
-            sidecar_docker_images:
-              type: object
-              additionalProperties:
-                type: string
-            workers:
-              type: integer
-              minimum: 1
-            users:
-              type: object
-              properties:
-                replication_username:
-                   type: string
-                super_username:
-                   type: string
-            kubernetes:
-              type: object
-              properties:
-                cluster_domain:
-                  type: string
-                cluster_labels:
-                  type: object
-                  additionalProperties:
-                    type: string
-                cluster_name_label:
-                  type: string
-                custom_pod_annotations:
-                  type: object
-                  additionalProperties:
-                    type: string
-                enable_pod_antiaffinity:
-                  type: boolean
-                enable_pod_disruption_budget:
-                  type: boolean
-                infrastructure_roles_secret_name:
-                  type: string
-                inherited_labels:
-                  type: array
-                  items:
-                    type: string
-                node_readiness_label:
-                  type: array
-                  items:
-                    type: string
-                  nullable: true
-                oauth_token_secret_name:
-                  type: string
-                pdb_name_format:
-                  type: string
-                pod_antiaffinity_topology_key:
-                  type: string
-                pod_environment_configmap:
-                  type: string
-                pod_management_policy:
-                  type: string
-                  enum:
-                    - "ordered_ready"
-                    - "parallel"
-                pod_role_label:
-                  type: string
-                pod_service_account_name:
-                  type: string
-                pod_terminate_grace_period:
-                  type: string
-                secret_name_template:
-                  type: string
-                spilo_fsgroup:
-                  type: integer
-                spilo_privileged:
-                  type: boolean
-                toleration:
-                  type: object
-                  additionalProperties:
-                    type: string
-                watched_namespace:
-                  type: string
-            postgres_pod_resources:
-              type: object
-              properties:
-                default_cpu_limit:
-                  type: string
-                  pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
-                default_cpu_request:
-                  type: string
-                  pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
-                default_memory_limit:
-                  type: string
-                  pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
-                default_memory_request:
-                  type: string
-                  pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
-            timeouts:
-              type: object
-              properties:
-                pod_label_wait_timeout:
-                  type: string
-                pod_deletion_wait_timeout:
-                  type: string
-                ready_wait_interval:
-                  type: string
-                ready_wait_timeout:
-                  type: string
-                resource_check_interval:
-                  type: string
-                resource_check_timeout:
-                  type: string
-            load_balancer:
-              type: object
-              properties:
-                db_hosted_zone:
-                  type: string
-                enable_master_load_balancer:
-                  type: boolean
-                enable_replica_load_balancer:
-                  type: boolean
-                custom_service_annotations:
-                  type: object
-                  additionalProperties:
-                    type: string
-                master_dns_name_format:
-                  type: string
-                replica_dns_name_format:
-                  type: string
-            aws_or_gcp:
-              type: object
-              properties:
-                additional_secret_mount:
-                  type: string
-                additional_secret_mount_path:
-                  type: string
-                aws_region:
-                  type: string
-                kube_iam_role:
-                  type: string
-                log_s3_bucket:
-                  type: string
-                wal_s3_bucket:
-                  type: string
-            logical_backup:
-              type: object
-              properties:
-                logical_backup_schedule:
-                  type: string
-                  pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
-                logical_backup_docker_image:
-                  type: string
-                logical_backup_s3_bucket:
-                  type: string
-                logical_backup_s3_endpoint:
-                  type: string
-                logical_backup_s3_sse:
-                  type: string
-                logical_backup_s3_access_key_id:
-                  type: string
-                logical_backup_s3_secret_access_key:
-                  type: string
-            debug:
-              type: object
-              properties:
-                debug_logging:
-                  type: boolean
-                enable_database_access:
-                  type: boolean
-            teams_api:
-              type: object
-              properties:
-                enable_admin_role_for_users:
-                  type: boolean
-                enable_team_superuser:
-                  type: boolean
-                enable_teams_api:
-                  type: boolean
-                pam_configuration:
-                  type: string
-                pam_role_name:
-                  type: string
-                postgres_superuser_teams:
-                  type: array
-                  items:
-                    type: string
-                protected_role_names:
-                  type: array
-                  items:
-                    type: string
-                team_admin_role:
-                  type: string
-                team_api_role_configuration:
-                  type: object
-                  additionalProperties:
-                    type: string
-                teams_api_url:
-                  type: string
-            logging_rest_api:
-              type: object
-              properties:
-                api_port:
-                  type: integer
-                cluster_history_entries:
-                  type: integer
-                ring_log_lines:
-                  type: integer
-            scalyr:
-              type: object
-              properties:
-                scalyr_api_key:
-                  type: string
-                scalyr_cpu_limit:
-                  type: string
-                  pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
-                scalyr_cpu_request:
-                  type: string
-                  pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
-                scalyr_image:
-                  type: string
-                scalyr_memory_limit:
-                  type: string
-                  pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
-                scalyr_memory_request:
-                  type: string
-                  pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
-                scalyr_server_url:
-                  type: string
-{{ end }}
diff --git a/charts/postgres-operator/templates/crds.yaml b/charts/postgres-operator/templates/crds.yaml
new file mode 100644
index 000000000..733830014
--- /dev/null
+++ b/charts/postgres-operator/templates/crds.yaml
@@ -0,0 +1,6 @@
+{{ if .Values.crd.create }}
+{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
+{{ $.Files.Get $path }}
+---
+{{- end }}
+{{- end }}
diff --git a/docs/quickstart.md b/docs/quickstart.md
index f5546fc98..2da2cab7c 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -73,22 +73,23 @@ manifest.
 ### Helm chart
 
 Alternatively, the operator can be installed by using the provided [Helm](https://helm.sh/)
-chart which saves you the manual steps. Therefore, install the helm CLI on your
-machine. After initializing helm (and its server component Tiller) in your local
-cluster you can install the operator chart. You can define a release name that
-is prepended to the operator resource's names.
-
-Use `--name zalando` to match with the default service account name as older
-operator versions do not support custom names for service accounts. To use
-CRD-based configuration you need to specify the [values-crd yaml file](../charts/postgres-operator/values-crd.yaml).
+chart which saves you the manual steps. Clone this repo and change directory to
+the repo root. With Helm v3 installed you should be able to run:
 
 ```bash
-# 1) initialize helm
-helm init
-# 2) install postgres-operator chart
-helm install --name zalando ./charts/postgres-operator
+helm install postgres-operator ./charts/postgres-operator
 ```
 
+To use CRD-based configuration you need to specify the [values-crd yaml file](../charts/postgres-operator/values-crd.yaml).
+
+```bash
+helm install postgres-operator ./charts/postgres-operator -f ./charts/postgres-operator/values-crd.yaml
+```
+
+The chart works with both Helm 2 and Helm 3. The `crd-install` hook from v2 will
+be skipped with warning when using v3. Documentation for installing applications
+with Helm 2 can be found in the [v2 docs](https://v2.helm.sh/docs/).
+
 ### Operator Lifecycle Manager (OLM)
 
 The [Operator Lifecycle Manager (OLM)](https://github.com/operator-framework/operator-lifecycle-manager)
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml
index 0936fc341..6320a712c 100644
--- a/manifests/postgresql-operator-default-configuration.yaml
+++ b/manifests/postgresql-operator-default-configuration.yaml
@@ -76,7 +76,6 @@ configuration:
     log_s3_bucket: ""
     wal_s3_bucket: ""
   logical_backup:
-    log_s3_bucket: ""
     logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
     logical_backup_s3_access_key_id: ""
     logical_backup_s3_bucket: "my-bucket-url"