diff --git a/components/ws-manager-api/go/crd/v1/workspace_types.go b/components/ws-manager-api/go/crd/v1/workspace_types.go
index 2bc80df905e20a..2ac899ea76f9cc 100644
--- a/components/ws-manager-api/go/crd/v1/workspace_types.go
+++ b/components/ws-manager-api/go/crd/v1/workspace_types.go
@@ -121,9 +121,9 @@ type TimeoutSpec struct {
 // SSHKey temporal generated SSH key required to access the workspace
 type SSHKey struct {
 	// +kubebuilder:validation:Required
-	Public string `json:"public"`
+	Public string `json:"publicKey"`
 	// +kubebuilder:validation:Required
-	Private string `json:"private"`
+	Private string `json:"privateKey"`
 }
 
 type AdmissionSpec struct {
diff --git a/components/ws-manager-api/go/crd/v1/zz_generated.deepcopy.go b/components/ws-manager-api/go/crd/v1/zz_generated.deepcopy.go
index 77f8ce2c2e1f92..d15495abb7ae82 100644
--- a/components/ws-manager-api/go/crd/v1/zz_generated.deepcopy.go
+++ b/components/ws-manager-api/go/crd/v1/zz_generated.deepcopy.go
@@ -125,6 +125,21 @@ func (in *PortSpec) DeepCopy() *PortSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SSHKey) DeepCopyInto(out *SSHKey) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SSHKey.
+func (in *SSHKey) DeepCopy() *SSHKey {
+	if in == nil {
+		return nil
+	}
+	out := new(SSHKey)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Snapshot) DeepCopyInto(out *Snapshot) {
 	*out = *in
@@ -411,6 +426,11 @@ func (in *WorkspaceSpec) DeepCopyInto(out *WorkspaceSpec) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.SSHKey != nil {
+		in, out := &in.SSHKey, &out.SSHKey
+		*out = new(SSHKey)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkspaceSpec.
diff --git a/components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_workspaces.yaml b/components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_workspaces.yaml
index 2138a11b23fb97..dbb7c01cf69d16 100644
--- a/components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_workspaces.yaml
+++ b/components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_workspaces.yaml
@@ -157,6 +157,18 @@ spec:
                   type: object
                 minItems: 0
                 type: array
+              ssh:
+                description: SSHKey temporal generated SSH key required to access
+                  the workspace
+                properties:
+                  privateKey:
+                    type: string
+                  publicKey:
+                    type: string
+                required:
+                - privateKey
+                - publicKey
+                type: object
               sshPublicKeys:
                 items:
                   type: string
@@ -557,6 +569,19 @@ spec:
                   prior to shutting the workspace down. This condition is only used
                   for headless workspaces.
                 type: string
+              storage:
+                properties:
+                  attachedDevice:
+                    type: string
+                  mountPath:
+                    type: string
+                  volumeName:
+                    type: string
+                required:
+                - attachedDevice
+                - mountPath
+                - volumeName
+                type: object
               url:
                 type: string
             required: