diff --git a/build/typescript-model/generate.sh b/build/typescript-model/generate.sh
index 675c1236a..3b6cdc846 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=a3aef4de7a1d5dab72021aa282fffd8bc8a022ca
+GEN_REVISION=b32dcd6dc9c1c0c4fcf227c9539ae9ff0530b936
 
 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"
@@ -29,6 +29,7 @@ export REPOSITORY=''
 EOF
     echo "[INFO] Lauching gen to generate typescript files based on swagger json"
     export OPENAPI_SKIP_FETCH_SPEC=true
+    export OPENAPI_GENERATOR_COMMIT="v6.3.0"
     $WORK_DIR/gen/openapi/typescript.sh $WORK_DIR/typescript-models $WORK_DIR/config.sh
 
     sed -i 's/\"name\": \".*\"/"name": "@devfile\/api"/g' $WORK_DIR/typescript-models/package.json
diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go b/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go
index af9775945..6c3b6e784 100644
--- a/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go
+++ b/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go
@@ -56,7 +56,7 @@ type ParentOverrides struct {
 	Commands []CommandParentOverride `json:"commands,omitempty" patchStrategy:"merge" patchMergeKey:"id"`
 }
 
-//+k8s:openapi-gen=true
+// +k8s:openapi-gen=true
 type ComponentParentOverride struct {
 
 	// Mandatory name that allows referencing the component
@@ -721,7 +721,7 @@ type ImportReferenceUnionParentOverride struct {
 // So please be careful when renaming
 type OverridesBaseParentOverride struct{}
 
-//+k8s:openapi-gen=true
+// +k8s:openapi-gen=true
 type ComponentPluginOverrideParentOverride struct {
 
 	// Mandatory name that allows referencing the component
diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go b/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go
index 65056ab92..6a31bb0c4 100644
--- a/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go
+++ b/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go
@@ -25,7 +25,7 @@ type PluginOverrides struct {
 	Commands []CommandPluginOverride `json:"commands,omitempty" patchStrategy:"merge" patchMergeKey:"id"`
 }
 
-//+k8s:openapi-gen=true
+// +k8s:openapi-gen=true
 type ComponentPluginOverride struct {
 
 	// Mandatory name that allows referencing the component