diff --git a/charts/postgres-operator/crds/postgresqls.yaml b/charts/postgres-operator/crds/postgresqls.yaml
index 0d444e568..788892f17 100644
--- a/charts/postgres-operator/crds/postgresqls.yaml
+++ b/charts/postgres-operator/crds/postgresqls.yaml
@@ -57,6 +57,7 @@ spec:
       required:
         - kind
         - apiVersion
+        - metadata
         - spec
       properties:
         kind:
@@ -67,6 +68,14 @@ spec:
           type: string
           enum:
             - acid.zalan.do/v1
+        metadata:
+          type: object
+          required:
+            - name
+          properties:
+            name:
+              type: string
+              maxLength: 50
         spec:
           type: object
           required:
diff --git a/manifests/postgresql.crd.yaml b/manifests/postgresql.crd.yaml
index 97b72a8ca..c85e0bb92 100644
--- a/manifests/postgresql.crd.yaml
+++ b/manifests/postgresql.crd.yaml
@@ -53,6 +53,7 @@ spec:
       required:
         - kind
         - apiVersion
+        - metadata
         - spec
       properties:
         kind:
@@ -63,6 +64,14 @@ spec:
           type: string
           enum:
             - acid.zalan.do/v1
+        metadata:
+          type: object
+          required:
+            - name
+          properties:
+            name:
+              type: string
+              maxLength: 50
         spec:
           type: object
           required:
diff --git a/pkg/apis/acid.zalan.do/v1/crds.go b/pkg/apis/acid.zalan.do/v1/crds.go
index 2cfc28856..4bdb46449 100644
--- a/pkg/apis/acid.zalan.do/v1/crds.go
+++ b/pkg/apis/acid.zalan.do/v1/crds.go
@@ -107,12 +107,13 @@ var min0 = 0.0
 var min1 = 1.0
 var min2 = 2.0
 var minDisable = -1.0
+var maxLength = int64(50)
 
 // PostgresCRDResourceValidation to check applied manifest parameters
 var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 	OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{
 		Type:     "object",
-		Required: []string{"kind", "apiVersion", "spec"},
+		Required: []string{"kind", "apiVersion", "metadata", "spec"},
 		Properties: map[string]apiextv1beta1.JSONSchemaProps{
 			"kind": {
 				Type: "string",
@@ -130,6 +131,16 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 				},
 			},
+			"metadata": {
+				Type:     "object",
+				Required: []string{"name"},
+				Properties: map[string]apiextv1beta1.JSONSchemaProps{
+					"name": {
+						Type:      "string",
+						MaxLength: &maxLength,
+					},
+				},
+			},
 			"spec": {
 				Type:     "object",
 				Required: []string{"numberOfInstances", "teamId", "postgresql", "volume"},