diff --git a/.github/workflows/test-go.yaml b/.github/workflows/test-go.yaml
index 5426e39c325..6714d3a7abc 100644
--- a/.github/workflows/test-go.yaml
+++ b/.github/workflows/test-go.yaml
@@ -37,9 +37,9 @@ jobs:
         run: |
           go mod download
 
-          curl -L -O "https://github.com/kubernetes-sigs/kubebuilder/releases/download/v1.0.7/kubebuilder_1.0.7_linux_amd64.tar.gz"
-          tar -zxvf kubebuilder_1.0.7_linux_amd64.tar.gz
-          sudo mv kubebuilder_1.0.7_linux_amd64 /usr/local/kubebuilder
+          curl -L -O "https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.0/kubebuilder_2.3.0_linux_amd64.tar.gz"
+          tar -zxvf kubebuilder_2.3.0_linux_amd64.tar.gz
+          sudo mv kubebuilder_2.3.0_linux_amd64 /usr/local/kubebuilder
           export PATH=$PATH:/usr/local/kubebuilder/bin
 
           make check
diff --git a/manifests/v1beta1/components/crd/experiment.yaml b/manifests/v1beta1/components/crd/experiment.yaml
index 5a7b06febd0..d3e94fc0e0b 100644
--- a/manifests/v1beta1/components/crd/experiment.yaml
+++ b/manifests/v1beta1/components/crd/experiment.yaml
@@ -1,23 +1,30 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: experiments.kubeflow.org
 spec:
-  additionalPrinterColumns:
-    - JSONPath: .status.conditions[-1:].type
-      name: Type
-      type: string
-    - JSONPath: .status.conditions[-1:].status
-      name: Status
-      type: string
-    - JSONPath: .metadata.creationTimestamp
-      name: Age
-      type: date
   group: kubeflow.org
-  version: v1beta1
   scope: Namespaced
-  subresources:
-    status: {}
+  versions:
+    - name: v1beta1
+      served: true
+      storage: true
+      additionalPrinterColumns:
+        - name: Type
+          type: string
+          jsonPath: .status.conditions[-1:].type
+        - name: Status
+          type: string
+          jsonPath: .status.conditions[-1:].status
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          type: object
+          x-kubernetes-preserve-unknown-fields: true
   names:
     kind: Experiment
     singular: experiment
diff --git a/manifests/v1beta1/components/crd/suggestion.yaml b/manifests/v1beta1/components/crd/suggestion.yaml
index 8de13785c00..edd14899976 100644
--- a/manifests/v1beta1/components/crd/suggestion.yaml
+++ b/manifests/v1beta1/components/crd/suggestion.yaml
@@ -1,29 +1,36 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: suggestions.kubeflow.org
 spec:
-  additionalPrinterColumns:
-    - JSONPath: .status.conditions[-1:].type
-      name: Type
-      type: string
-    - JSONPath: .status.conditions[-1:].status
-      name: Status
-      type: string
-    - JSONPath: .spec.requests
-      name: Requested
-      type: string
-    - JSONPath: .status.suggestionCount
-      name: Assigned
-      type: string
-    - JSONPath: .metadata.creationTimestamp
-      name: Age
-      type: date
   group: kubeflow.org
-  version: v1beta1
   scope: Namespaced
-  subresources:
-    status: {}
+  versions:
+    - name: v1beta1
+      served: true
+      storage: true
+      additionalPrinterColumns:
+        - name: Type
+          type: string
+          jsonPath: .status.conditions[-1:].type
+        - name: Status
+          type: string
+          jsonPath: .status.conditions[-1:].status
+        - name: Requested
+          type: string
+          jsonPath: .spec.requests
+        - name: Assigned
+          type: string
+          jsonPath: .status.suggestionCount
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          type: object
+          x-kubernetes-preserve-unknown-fields: true
   names:
     kind: Suggestion
     singular: suggestion
diff --git a/manifests/v1beta1/components/crd/trial.yaml b/manifests/v1beta1/components/crd/trial.yaml
index 6b7dd5347f0..9ff74879850 100644
--- a/manifests/v1beta1/components/crd/trial.yaml
+++ b/manifests/v1beta1/components/crd/trial.yaml
@@ -1,23 +1,30 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: trials.kubeflow.org
 spec:
-  additionalPrinterColumns:
-    - JSONPath: .status.conditions[-1:].type
-      name: Type
-      type: string
-    - JSONPath: .status.conditions[-1:].status
-      name: Status
-      type: string
-    - JSONPath: .metadata.creationTimestamp
-      name: Age
-      type: date
   group: kubeflow.org
-  version: v1beta1
   scope: Namespaced
-  subresources:
-    status: {}
+  versions:
+    - name: v1beta1
+      served: true
+      storage: true
+      additionalPrinterColumns:
+        - name: Type
+          type: string
+          jsonPath: .status.conditions[-1:].type
+        - name: Status
+          type: string
+          jsonPath: .status.conditions[-1:].status
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          type: object
+          x-kubernetes-preserve-unknown-fields: true
   names:
     kind: Trial
     singular: trial