diff --git a/build/typescript-model/generate.sh b/build/typescript-model/generate.sh
index 18e6c27f6..fff53a88f 100755
--- a/build/typescript-model/generate.sh
+++ b/build/typescript-model/generate.sh
@@ -6,7 +6,7 @@ WORK_DIR=${SCRIPT_DIR}/workdir
 echo "[INFO] Using the following folder to store all build files ${SCRIPT_DIR}/workdir"
 mkdir -p $WORK_DIR
 
-GEN_REVISION=5c6d90b260fd94af32157f304f971778c899b5e2
+GEN_REVISION=a3aef4de7a1d5dab72021aa282fffd8bc8a022ca
 
 k8s_client_gen() {
     [ ! -d $WORK_DIR/gen ] && git clone https://github.com/kubernetes-client/gen.git $WORK_DIR/gen || echo "kubernetes-client/gen is already cloned into $WORK_DIR/gen"
diff --git a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml
index cda25a565..44dceee4c 100644
--- a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml
+++ b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml
@@ -4098,7 +4098,7 @@ spec:
             - workspaceId
             type: object
         type: object
-    served: true
+    served: false
     storage: false
   - additionalPrinterColumns:
     - JSONPath: .status.devworkspaceId
diff --git a/crds/workspace.devfile.io_devworkspaces.yaml b/crds/workspace.devfile.io_devworkspaces.yaml
index 95b16f85e..db212ecb1 100644
--- a/crds/workspace.devfile.io_devworkspaces.yaml
+++ b/crds/workspace.devfile.io_devworkspaces.yaml
@@ -4094,7 +4094,7 @@ spec:
             - workspaceId
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       status: {}
diff --git a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml
index db000a11e..2fe981406 100644
--- a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml
+++ b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml
@@ -3891,7 +3891,7 @@ spec:
                 type: array
             type: object
         type: object
-    served: true
+    served: false
     storage: false
   - name: v1alpha2
     schema:
diff --git a/crds/workspace.devfile.io_devworkspacetemplates.yaml b/crds/workspace.devfile.io_devworkspacetemplates.yaml
index 329899038..03d1be8d1 100644
--- a/crds/workspace.devfile.io_devworkspacetemplates.yaml
+++ b/crds/workspace.devfile.io_devworkspacetemplates.yaml
@@ -3889,7 +3889,7 @@ spec:
                 type: array
             type: object
         type: object
-    served: true
+    served: false
     storage: false
   - name: v1alpha2
     schema:
diff --git a/pkg/apis/workspaces/v1alpha1/devworkspace_types.go b/pkg/apis/workspaces/v1alpha1/devworkspace_types.go
index e9acd8d55..0e12c813e 100644
--- a/pkg/apis/workspaces/v1alpha1/devworkspace_types.go
+++ b/pkg/apis/workspaces/v1alpha1/devworkspace_types.go
@@ -77,6 +77,7 @@ const (
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="The current workspace startup phase"
 // +kubebuilder:printcolumn:name="URL",type="string",JSONPath=".status.ideUrl",description="Url endpoint for accessing workspace"
 // +kubebuilder:deprecatedversion
+// +kubebuilder:unservedversion
 type DevWorkspace struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/pkg/apis/workspaces/v1alpha1/devworkspacetemplate_types.go b/pkg/apis/workspaces/v1alpha1/devworkspacetemplate_types.go
index 0b8c955b6..7e58fa347 100644
--- a/pkg/apis/workspaces/v1alpha1/devworkspacetemplate_types.go
+++ b/pkg/apis/workspaces/v1alpha1/devworkspacetemplate_types.go
@@ -10,6 +10,7 @@ import (
 // +k8s:openapi-gen=true
 // +kubebuilder:resource:path=devworkspacetemplates,scope=Namespaced,shortName=dwt
 // +kubebuilder:deprecatedversion
+// +kubebuilder:unservedversion
 type DevWorkspaceTemplate struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`