diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml
index 78ce9cedc..2863b1b2d 100644
--- a/charts/postgres-operator/crds/operatorconfigurations.yaml
+++ b/charts/postgres-operator/crds/operatorconfigurations.yaml
@@ -58,10 +58,14 @@ spec:
         configuration:
           type: object
           properties:
-            etcd_host:
-              type: string
             docker_image:
               type: string
+            enable_crd_validation:
+              type: boolean
+            enable_shm_volume:
+              type: boolean
+            etcd_host:
+              type: string
             max_instances:
               type: integer
               minimum: -1  # -1 = disabled
diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml
index 2600b177d..2bcd1b0f7 100644
--- a/charts/postgres-operator/values-crd.yaml
+++ b/charts/postgres-operator/values-crd.yaml
@@ -59,7 +59,10 @@ configKubernetes:
   # label assigned to Kubernetes objects created by the operator
   cluster_name_label: cluster-name
   # additional annotations to add to every database pod
-  custom_pod_annotations:
+  # custom_pod_annotations:
+  #   keya: valuea
+  #   keyb: valueb
+
   # toggles pod anti affinity on the Postgres pods
   enable_pod_antiaffinity: false
   # toggles PDB to set to MinAvailabe 0 or 1
@@ -230,7 +233,7 @@ configTeamsApi:
   # teams_api_url: http://fake-teams-api.default.svc.cluster.local
 
 # Scalyr is a log management tool that Zalando uses as a sidecar
-scalyr:
+configScalyr:
   # API key for the Scalyr sidecar
   # scalyr_api_key: ""
 
diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml
index 5e9e3f0db..ae9e06fe9 100644
--- a/charts/postgres-operator/values.yaml
+++ b/charts/postgres-operator/values.yaml
@@ -57,7 +57,8 @@ configKubernetes:
   # label assigned to Kubernetes objects created by the operator
   cluster_name_label: version
   # annotations attached to each database pod
-  # custom_pod_annotations: keya:valuea
+  # custom_pod_annotations: keya:valuea,keyb:valueb
+
   # toggles pod anti affinity on the Postgres pods
   enable_pod_antiaffinity: "false"
   # toggles PDB to set to MinAvailabe 0 or 1
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index 4b2d2ef4a..6dd6c5469 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -12,7 +12,7 @@ data:
   cluster_labels: application:spilo
   cluster_name_label: version
   # custom_service_annotations: "keyx:valuez,keya:valuea"
-  # custom_pod_annotations: "keya:valuea"
+  # custom_pod_annotations: "keya:valuea,keyb:valueb"
   db_hosted_zone: db.example.com
   debug_logging: "true"
   # default_cpu_limit: "3"
diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml
index 0b15d32ea..49b068b8c 100644
--- a/manifests/operatorconfiguration.crd.yaml
+++ b/manifests/operatorconfiguration.crd.yaml
@@ -34,10 +34,14 @@ spec:
         configuration:
           type: object
           properties:
-            etcd_host:
-              type: string
             docker_image:
               type: string
+            enable_crd_validation:
+              type: boolean
+            enable_shm_volume:
+              type: boolean
+            etcd_host:
+              type: string
             max_instances:
               type: integer
               minimum: -1  # -1 = disabled
diff --git a/pkg/apis/acid.zalan.do/v1/crds.go b/pkg/apis/acid.zalan.do/v1/crds.go
index 7bcf3b22e..e154e065c 100644
--- a/pkg/apis/acid.zalan.do/v1/crds.go
+++ b/pkg/apis/acid.zalan.do/v1/crds.go
@@ -607,10 +607,16 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 			"configuration": {
 				Type: "object",
 				Properties: map[string]apiextv1beta1.JSONSchemaProps{
-					"etcd_host": {
+					"docker_image": {
 						Type: "string",
 					},
-					"docker_image": {
+					"enable_crd_validation": {
+						Type: "boolean",
+					},
+					"enable_shm_volume": {
+						Type: "boolean",
+					},
+					"etcd_host": {
 						Type: "string",
 					},
 					"max_instances": {