diff --git a/charts/postgres-operator/templates/customrresourcedefinition.yaml b/charts/postgres-operator/templates/customrresourcedefinition.yaml
index ffea73c84..96bffaed5 100644
--- a/charts/postgres-operator/templates/customrresourcedefinition.yaml
+++ b/charts/postgres-operator/templates/customrresourcedefinition.yaml
@@ -162,8 +162,8 @@ spec:
                   items:
                     type: string
                 slots:
-                  type: array
-                  items:
+                  type: object
+                  additionalProperties:
                     type: object
                     additionalProperties:
                       type: string
diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml
index 34dd6cf83..daac0067e 100644
--- a/manifests/complete-postgres-manifest.yaml
+++ b/manifests/complete-postgres-manifest.yaml
@@ -13,7 +13,7 @@ spec:
   teamId: "ACID"
   volume:
     size: 1Gi
-#   storageClass: my-sc
+#    storageClass: my-sc
   numberOfInstances: 2
   users:  # Application/Robot users
     zalando:
@@ -30,7 +30,7 @@ spec:
 # Expert section
 
   enableShmVolume: true
-# spiloFSGroup: 103
+  spiloFSGroup: 103
   postgresql:
     version: "11"
     parameters:
@@ -52,13 +52,13 @@ spec:
     pg_hba:
     - hostssl all all 0.0.0.0/0 md5
     - host    all all 0.0.0.0/0 md5
-#   slots:
-#     - permanent_physical_1:
-#         type: physical
-#     - permanent_logical_1:
-#         type: logical
-#         database: foo
-#         plugin: pgoutput
+#    slots:
+#      permanent_physical_1:
+#        type: physical
+#      permanent_logical_1:
+#        type: logical
+#        database: foo
+#        plugin: pgoutput
     ttl: 30
     loop_wait: &loop_wait 10
     retry_timeout: 10
@@ -66,28 +66,28 @@ spec:
 # restore a Postgres DB with point-in-time-recovery
 # with a non-empty timestamp, clone from an S3 bucket using the latest backup before the timestamp
 # with an empty/absent timestamp, clone from an existing alive cluster using pg_basebackup
-# clone:
-#   uid: "efd12e58-5786-11e8-b5a7-06148230260c"
-#   cluster: "acid-batman"
-#   timestamp: "2017-12-19T12:40:33+01:00"  # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
-#   s3_wal_path: "s3://custom/path/to/bucket"
+#  clone:
+#    uid: "efd12e58-5786-11e8-b5a7-06148230260c"
+#    cluster: "acid-batman"
+#    timestamp: "2017-12-19T12:40:33+01:00"  # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
+#    s3_wal_path: "s3://custom/path/to/bucket"
 
 # run periodic backups with k8s cron jobs
-# enableLogicalBackup: true
-# logicalBackupSchedule: "30 00 * * *"
+#  enableLogicalBackup: true
+#  logicalBackupSchedule: "30 00 * * *"
   maintenanceWindows:
   - 01:00-06:00  #UTC
   - Sat:00:00-04:00
-# sidecars:
-#   - name: "telegraf-sidecar"
-#     image: "telegraf:latest"
-#     resources:
-#       limits:
-#         cpu: 500m
-#         memory: 500Mi
-#       requests:
-#         cpu: 100m
-#         memory: 100Mi
+#  sidecars:
+#    - name: "telegraf-sidecar"
+#      image: "telegraf:latest"
+#      resources:
+#        limits:
+#          cpu: 500m
+#          memory: 500Mi
+#        requests:
+#          cpu: 100m
+#          memory: 100Mi
 #      env:
 #        - name: "USEFUL_VAR"
 #          value: "perhaps-true"
diff --git a/manifests/postgresql.crd.yaml b/manifests/postgresql.crd.yaml
index 3a85c668e..cca9e2691 100644
--- a/manifests/postgresql.crd.yaml
+++ b/manifests/postgresql.crd.yaml
@@ -122,8 +122,8 @@ spec:
                   items:
                     type: string
                 slots:
-                  type: array
-                  items:
+                  type: object
+                  additionalProperties:
                     type: object
                     additionalProperties:
                       type: string
diff --git a/pkg/apis/acid.zalan.do/v1/crds.go b/pkg/apis/acid.zalan.do/v1/crds.go
index 3e1fb3250..064ce0750 100644
--- a/pkg/apis/acid.zalan.do/v1/crds.go
+++ b/pkg/apis/acid.zalan.do/v1/crds.go
@@ -263,8 +263,8 @@ var postgresCRDResourceValidation = apiextv1beta1.JSONSchemaProps{
 							},
 						},
 						"slots": {
-							Type: "array",
-							Items: &apiextv1beta1.JSONSchemaPropsOrArray{
+							Type: "object",
+							AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
 								Schema: &apiextv1beta1.JSONSchemaProps{
 									Type: "object",
 									AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{