diff --git a/manifests/00-crd-consoleclidownloads.yaml b/manifests/00-crd-consoleclidownloads.yaml
index bf87ada81d..91fdd8e9ff 100644
--- a/manifests/00-crd-consoleclidownloads.yaml
+++ b/manifests/00-crd-consoleclidownloads.yaml
@@ -8,35 +8,36 @@ metadata:
       (CLI) downloads.
 spec:
   scope: Cluster
+  preserveUnknownField: false
   group: console.openshift.io
   versions:
-    - name: v1
-      served: true
-      storage: true
+  - name: v1
+    served: true
+    storage: true
   names:
     plural: consoleclidownloads
     singular: consoleclidownload
     kind: ConsoleCLIDownload
     listKind: ConsoleCLIDownloadList
   additionalPrinterColumns:
-    - name: Display name
-      type: string
-      JSONPath: .spec.displayName
-    - name: Age
-      type: string
-      JSONPath: .metadata.creationTimestamp
-    - name: Description
-      type: string
-      JSONPath: .spec.description
+  - name: Display name
+    type: string
+    JSONPath: .spec.displayName
+  - name: Age
+    type: string
+    JSONPath: .metadata.creationTimestamp
+  - name: Description
+    type: string
+    JSONPath: .spec.description
   subresources:
     status: {}
-  validation:
-    openAPIV3Schema:
+  "validation":
+    "openAPIV3Schema":
       description: ConsoleCLIDownload is an extension for configuring openshift web
         console command line interface (CLI) downloads.
       type: object
       required:
-        - spec
+      - spec
       properties:
         apiVersion:
           description: 'APIVersion defines the versioned schema of this representation
@@ -49,15 +50,14 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: ConsoleCLIDownloadSpec is the desired cli download configuration.
           type: object
           required:
-            - description
-            - displayName
-            - links
+          - description
+          - displayName
+          - links
           properties:
             description:
               description: description is the description of the CLI download (can
@@ -73,13 +73,13 @@ spec:
               items:
                 type: object
                 required:
-                  - href
+                - href
                 properties:
                   href:
                     description: href is the absolute secure URL for the link (must
                       use https)
                     type: string
-                    pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+                    pattern: ^https://
                   text:
                     description: text is the display text for the link
                     type: string
diff --git a/manifests/00-crd-consolelinks.yaml b/manifests/00-crd-consolelinks.yaml
index 9071f4a726..f68c2f9fd8 100644
--- a/manifests/00-crd-consolelinks.yaml
+++ b/manifests/00-crd-consolelinks.yaml
@@ -7,38 +7,39 @@ metadata:
     description: Extension for customizing OpenShift web console links
 spec:
   scope: Cluster
+  preserveUnknownField: false
   group: console.openshift.io
   versions:
-    - name: v1
-      served: true
-      storage: true
+  - name: v1
+    served: true
+    storage: true
   names:
     plural: consolelinks
     singular: consolelink
     kind: ConsoleLink
     listKind: ConsoleLinkList
   additionalPrinterColumns:
-    - name: Text
-      type: string
-      JSONPath: .spec.text
-    - name: URL
-      type: string
-      JSONPath: .spec.href
-    - name: Menu
-      type: string
-      JSONPath: .spec.menu
-    - name: Age
-      type: date
-      JSONPath: .metadata.creationTimestamp
+  - name: Text
+    type: string
+    JSONPath: .spec.text
+  - name: URL
+    type: string
+    JSONPath: .spec.href
+  - name: Menu
+    type: string
+    JSONPath: .spec.menu
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
-  validation:
-    openAPIV3Schema:
+  "validation":
+    "openAPIV3Schema":
       description: ConsoleLink is an extension for customizing OpenShift web console
         links.
       type: object
       required:
-        - spec
+      - spec
       properties:
         apiVersion:
           description: 'APIVersion defines the versioned schema of this representation
@@ -51,15 +52,14 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: ConsoleLinkSpec is the desired console link configuration.
           type: object
           required:
-            - href
-            - location
-            - text
+          - href
+          - location
+          - text
           properties:
             applicationMenu:
               description: applicationMenu holds information about section and icon
@@ -67,7 +67,7 @@ spec:
                 when location is set to ApplicationMenu.
               type: object
               required:
-                - section
+              - section
               properties:
                 imageURL:
                   description: imageUrl is the URL for the icon used in front of the
@@ -86,7 +86,7 @@ spec:
               description: href is the absolute secure URL for the link (must use
                 https)
               type: string
-              pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+              pattern: ^https://
             location:
               description: location determines which location in the console the link
                 will be appended to (ApplicationMenu, HelpMenu, UserMenu, NamespaceDashboard).
@@ -99,7 +99,7 @@ spec:
                 link will appear in all namespaces.
               type: object
               required:
-                - namespaces
+              - namespaces
               properties:
                 namespaces:
                   description: namespaces is an array of namespace names in which
diff --git a/manifests/00-crd-consolenotifications.yaml b/manifests/00-crd-consolenotifications.yaml
index 56f820c248..e487b3f0b7 100644
--- a/manifests/00-crd-consolenotifications.yaml
+++ b/manifests/00-crd-consolenotifications.yaml
@@ -7,35 +7,36 @@ metadata:
     description: Extension for configuring openshift web console notifications.
 spec:
   scope: Cluster
+  preserveUnknownField: false
   group: console.openshift.io
   versions:
-    - name: v1
-      served: true
-      storage: true
+  - name: v1
+    served: true
+    storage: true
   names:
     plural: consolenotifications
     singular: consolenotification
     kind: ConsoleNotification
     listKind: ConsoleNotificationList
   additionalPrinterColumns:
-    - name: Text
-      type: string
-      JSONPath: .spec.text
-    - name: Location
-      type: string
-      JSONPath: .spec.location
-    - name: Age
-      type: date
-      JSONPath: .metadata.creationTimestamp
+  - name: Text
+    type: string
+    JSONPath: .spec.text
+  - name: Location
+    type: string
+    JSONPath: .spec.location
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
-  validation:
-    openAPIV3Schema:
+  "validation":
+    "openAPIV3Schema":
       description: ConsoleNotification is the extension for configuring openshift
         web console notifications.
       type: object
       required:
-        - spec
+      - spec
       properties:
         apiVersion:
           description: 'APIVersion defines the versioned schema of this representation
@@ -48,14 +49,13 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: ConsoleNotificationSpec is the desired console notification
             configuration.
           type: object
           required:
-            - text
+          - text
           properties:
             backgroundColor:
               description: backgroundColor is the color of the background for the
@@ -69,14 +69,14 @@ spec:
               description: link is an object that holds notification link details.
               type: object
               required:
-                - href
-                - text
+              - href
+              - text
               properties:
                 href:
                   description: href is the absolute secure URL for the link (must
                     use https)
                   type: string
-                  pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+                  pattern: ^https://
                 text:
                   description: text is the display text for the link
                   type: string