diff --git a/charts/kyverno/crds/crds.yaml b/charts/kyverno/crds/crds.yaml
index 9d88128f55..b02e460304 100644
--- a/charts/kyverno/crds/crds.yaml
+++ b/charts/kyverno/crds/crds.yaml
@@ -99,8 +99,7 @@ spec:
                         - namespace
                         - name
                         type: object
-                      data:
-                        AnyValue: {}
+                      data: {}
                       kind:
                         type: string
                       name:
@@ -180,10 +179,8 @@ spec:
                     type: object
                   mutate:
                     properties:
-                      overlay:
-                        AnyValue: {}
-                      patchStrategicMerge:
-                        AnyValue: {}
+                      overlay: {}
+                      patchStrategicMerge: {}
                       patches:
                         items:
                           properties:
@@ -195,8 +192,7 @@ spec:
                               type: string
                             path:
                               type: string
-                            value:
-                              AnyValue: {}
+                            value: {}
                           required:
                           - path
                           - op
@@ -217,8 +213,7 @@ spec:
                     type: array
                   validate:
                     properties:
-                      anyPattern:
-                        AnyValue: {}
+                      anyPattern: {}
                       deny:
                         properties:
                           conditions:
@@ -248,8 +243,7 @@ spec:
                             type: array
                       message:
                         type: string
-                      pattern:
-                        AnyValue: {}
+                      pattern: {}
                     type: object
                 required:
                 - name
diff --git a/definitions/crds/crds.yaml b/definitions/crds/crds.yaml
index bc09ff4d5b..f1c7c2db7f 100644
--- a/definitions/crds/crds.yaml
+++ b/definitions/crds/crds.yaml
@@ -181,10 +181,8 @@ spec:
                   mutate:
                     type: object
                     properties:
-                      overlay:
-                        AnyValue: {}
-                      patchStrategicMerge:
-                        AnyValue: {}
+                      overlay: {}
+                      patchStrategicMerge: {}
                       patchesJson6902:
                         type: string
                       patches:
@@ -203,17 +201,14 @@ spec:
                               - add
                               - replace
                               - remove
-                            value:
-                              AnyValue: {}
+                            value: {}
                   validate:
                     type: object
                     properties:
                       message:
                         type: string
-                      pattern:
-                        AnyValue: {}
-                      anyPattern:
-                        AnyValue: {}
+                      pattern: {}
+                      anyPattern: {}
                       deny:
                         properties:
                           conditions:
@@ -267,8 +262,7 @@ spec:
                             type: string
                           name:
                             type: string
-                      data:
-                        AnyValue: {}
+                      data: {}
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
diff --git a/definitions/install.yaml b/definitions/install.yaml
index 280c1d9548..d47e77e8c0 100644
--- a/definitions/install.yaml
+++ b/definitions/install.yaml
@@ -104,8 +104,7 @@ spec:
                         - namespace
                         - name
                         type: object
-                      data:
-                        AnyValue: {}
+                      data: {}
                       kind:
                         type: string
                       name:
@@ -185,10 +184,8 @@ spec:
                     type: object
                   mutate:
                     properties:
-                      overlay:
-                        AnyValue: {}
-                      patchStrategicMerge:
-                        AnyValue: {}
+                      overlay: {}
+                      patchStrategicMerge: {}
                       patches:
                         items:
                           properties:
@@ -200,8 +197,7 @@ spec:
                               type: string
                             path:
                               type: string
-                            value:
-                              AnyValue: {}
+                            value: {}
                           required:
                           - path
                           - op
@@ -222,8 +218,7 @@ spec:
                     type: array
                   validate:
                     properties:
-                      anyPattern:
-                        AnyValue: {}
+                      anyPattern: {}
                       deny:
                         properties:
                           conditions:
@@ -253,8 +248,7 @@ spec:
                             type: array
                       message:
                         type: string
-                      pattern:
-                        AnyValue: {}
+                      pattern: {}
                     type: object
                 required:
                 - name
diff --git a/definitions/install_debug.yaml b/definitions/install_debug.yaml
index 808c40746b..60a59330b2 100644
--- a/definitions/install_debug.yaml
+++ b/definitions/install_debug.yaml
@@ -104,8 +104,7 @@ spec:
                         - namespace
                         - name
                         type: object
-                      data:
-                        AnyValue: {}
+                      data: {}
                       kind:
                         type: string
                       name:
@@ -185,10 +184,8 @@ spec:
                     type: object
                   mutate:
                     properties:
-                      overlay:
-                        AnyValue: {}
-                      patchStrategicMerge:
-                        AnyValue: {}
+                      overlay: {}
+                      patchStrategicMerge: {}
                       patches:
                         items:
                           properties:
@@ -200,8 +197,7 @@ spec:
                               type: string
                             path:
                               type: string
-                            value:
-                              AnyValue: {}
+                            value: {}
                           required:
                           - path
                           - op
@@ -222,8 +218,7 @@ spec:
                     type: array
                   validate:
                     properties:
-                      anyPattern:
-                        AnyValue: {}
+                      anyPattern: {}
                       deny:
                         properties:
                           conditions:
@@ -253,8 +248,7 @@ spec:
                             type: array
                       message:
                         type: string
-                      pattern:
-                        AnyValue: {}
+                      pattern: {}
                     type: object
                 required:
                 - name
diff --git a/definitions/release/install.yaml b/definitions/release/install.yaml
index 280c1d9548..d47e77e8c0 100644
--- a/definitions/release/install.yaml
+++ b/definitions/release/install.yaml
@@ -104,8 +104,7 @@ spec:
                         - namespace
                         - name
                         type: object
-                      data:
-                        AnyValue: {}
+                      data: {}
                       kind:
                         type: string
                       name:
@@ -185,10 +184,8 @@ spec:
                     type: object
                   mutate:
                     properties:
-                      overlay:
-                        AnyValue: {}
-                      patchStrategicMerge:
-                        AnyValue: {}
+                      overlay: {}
+                      patchStrategicMerge: {}
                       patches:
                         items:
                           properties:
@@ -200,8 +197,7 @@ spec:
                               type: string
                             path:
                               type: string
-                            value:
-                              AnyValue: {}
+                            value: {}
                           required:
                           - path
                           - op
@@ -222,8 +218,7 @@ spec:
                     type: array
                   validate:
                     properties:
-                      anyPattern:
-                        AnyValue: {}
+                      anyPattern: {}
                       deny:
                         properties:
                           conditions:
@@ -253,8 +248,7 @@ spec:
                             type: array
                       message:
                         type: string
-                      pattern:
-                        AnyValue: {}
+                      pattern: {}
                     type: object
                 required:
                 - name