diff --git a/components/public-api/gitpod/v1/envvar.proto b/components/public-api/gitpod/v1/envvar.proto
index 691d7e8a7bbedc..5fc0450ec1be46 100644
--- a/components/public-api/gitpod/v1/envvar.proto
+++ b/components/public-api/gitpod/v1/envvar.proto
@@ -15,45 +15,62 @@ service EnvironmentVariableService {
 
   // UpdateEnvironmentVariable updates an environment variable for the
   // authenticated user.
-  //
-  // workspace_id +return NOT_FOUND Workspace does not exist
   rpc UpdateEnvironmentVariable(UpdateEnvironmentVariableRequest)
       returns (UpdateEnvironmentVariableResponse) {}
 
+  // CreateEnvironmentVariable creates a new environment variable for the
+  // authenticated user.
+  rpc CreateEnvironmentVariable(CreateEnvironmentVariableRequest)
+      returns (CreateEnvironmentVariableResponse) {}
+
   // DeleteEnvironmentVariable deletes an environment variable for the
   // authenticated user.
-  //
-  // workspace_id +return NOT_FOUND Workspace does not exist
   rpc DeleteEnvironmentVariable(DeleteEnvironmentVariableRequest)
       returns (DeleteEnvironmentVariableResponse) {}
 }
 
-message UserEnvironmentVariable {
+message EnvironmentVariable {
   string id = 1;
   string name = 2;
   string value = 3;
-  string repository_pattern = 4;
+  string repository_pattern = 4; // Only set for user env variables
+  string configuration_id = 5;   // Only set for project env variables
+  bool censored = 6;             // Only set for project env variables
 }
 
-message ListEnvironmentVariablesRequest { optional string workspace_id = 1; }
+message ListEnvironmentVariablesRequest {
+  string workspace_id = 1;
+  string configuration_id = 2;
+}
 
 message ListEnvironmentVariablesResponse {
-  repeated UserEnvironmentVariable environment_variables = 1;
+  repeated EnvironmentVariable environment_variables = 1;
 }
 
 message UpdateEnvironmentVariableRequest {
-  optional string envvar_name = 1;
-  optional string envvar_value = 2;
-  optional string envvar_repository_pattern = 3;
+  optional string env_var_name = 1;
+  optional string env_var_value = 2;
+  optional string env_var_repository_pattern = 3;
+  optional string env_var_configuration_id = 4;
+  optional bool env_var_censored = 5;
 }
 
 message UpdateEnvironmentVariableResponse {
-  UserEnvironmentVariable environment_variable = 1;
+  EnvironmentVariable environment_variable = 1;
+}
+
+message CreateEnvironmentVariableRequest {
+  string env_var_name = 1;
+  string env_var_value = 2;
+  string env_var_repository_pattern = 3;
+  string env_var_configuration_id = 4;
+  bool env_var_censored = 5;
 }
 
-message DeleteEnvironmentVariableRequest {
-  string envvar_name = 1;
-  string envvar_repository_pattern = 2;
+message CreateEnvironmentVariableResponse {
+  EnvironmentVariable environment_variable = 1;
 }
 
+message DeleteEnvironmentVariableRequest { string env_var_id = 1; }
+
 message DeleteEnvironmentVariableResponse {}
diff --git a/components/public-api/go/v1/envvar.pb.go b/components/public-api/go/v1/envvar.pb.go
index 4c77b9e9574c45..05ca0f2ae77f62 100644
--- a/components/public-api/go/v1/envvar.pb.go
+++ b/components/public-api/go/v1/envvar.pb.go
@@ -24,7 +24,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type UserEnvironmentVariable struct {
+type EnvironmentVariable struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -32,11 +32,13 @@ type UserEnvironmentVariable struct {
 	Id                string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Name              string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	Value             string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
-	RepositoryPattern string `protobuf:"bytes,4,opt,name=repository_pattern,json=repositoryPattern,proto3" json:"repository_pattern,omitempty"`
+	RepositoryPattern string `protobuf:"bytes,4,opt,name=repository_pattern,json=repositoryPattern,proto3" json:"repository_pattern,omitempty"` // Only set for user env variables
+	ConfigurationId   string `protobuf:"bytes,5,opt,name=configuration_id,json=configurationId,proto3" json:"configuration_id,omitempty"`       // Only set for project env variables
+	Censored          bool   `protobuf:"varint,6,opt,name=censored,proto3" json:"censored,omitempty"`                                           // Only set for project env variables
 }
 
-func (x *UserEnvironmentVariable) Reset() {
-	*x = UserEnvironmentVariable{}
+func (x *EnvironmentVariable) Reset() {
+	*x = EnvironmentVariable{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gitpod_v1_envvar_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -44,13 +46,13 @@ func (x *UserEnvironmentVariable) Reset() {
 	}
 }
 
-func (x *UserEnvironmentVariable) String() string {
+func (x *EnvironmentVariable) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*UserEnvironmentVariable) ProtoMessage() {}
+func (*EnvironmentVariable) ProtoMessage() {}
 
-func (x *UserEnvironmentVariable) ProtoReflect() protoreflect.Message {
+func (x *EnvironmentVariable) ProtoReflect() protoreflect.Message {
 	mi := &file_gitpod_v1_envvar_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -62,45 +64,60 @@ func (x *UserEnvironmentVariable) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UserEnvironmentVariable.ProtoReflect.Descriptor instead.
-func (*UserEnvironmentVariable) Descriptor() ([]byte, []int) {
+// Deprecated: Use EnvironmentVariable.ProtoReflect.Descriptor instead.
+func (*EnvironmentVariable) Descriptor() ([]byte, []int) {
 	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *UserEnvironmentVariable) GetId() string {
+func (x *EnvironmentVariable) GetId() string {
 	if x != nil {
 		return x.Id
 	}
 	return ""
 }
 
-func (x *UserEnvironmentVariable) GetName() string {
+func (x *EnvironmentVariable) GetName() string {
 	if x != nil {
 		return x.Name
 	}
 	return ""
 }
 
-func (x *UserEnvironmentVariable) GetValue() string {
+func (x *EnvironmentVariable) GetValue() string {
 	if x != nil {
 		return x.Value
 	}
 	return ""
 }
 
-func (x *UserEnvironmentVariable) GetRepositoryPattern() string {
+func (x *EnvironmentVariable) GetRepositoryPattern() string {
 	if x != nil {
 		return x.RepositoryPattern
 	}
 	return ""
 }
 
+func (x *EnvironmentVariable) GetConfigurationId() string {
+	if x != nil {
+		return x.ConfigurationId
+	}
+	return ""
+}
+
+func (x *EnvironmentVariable) GetCensored() bool {
+	if x != nil {
+		return x.Censored
+	}
+	return false
+}
+
 type ListEnvironmentVariablesRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	WorkspaceId *string `protobuf:"bytes,1,opt,name=workspace_id,json=workspaceId,proto3,oneof" json:"workspace_id,omitempty"`
+	WorkspaceId     string `protobuf:"bytes,1,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
+	ConfigurationId string `protobuf:"bytes,2,opt,name=configuration_id,json=configurationId,proto3" json:"configuration_id,omitempty"`
 }
 
 func (x *ListEnvironmentVariablesRequest) Reset() {
@@ -136,8 +153,15 @@ func (*ListEnvironmentVariablesRequest) Descriptor() ([]byte, []int) {
 }
 
 func (x *ListEnvironmentVariablesRequest) GetWorkspaceId() string {
-	if x != nil && x.WorkspaceId != nil {
-		return *x.WorkspaceId
+	if x != nil {
+		return x.WorkspaceId
+	}
+	return ""
+}
+
+func (x *ListEnvironmentVariablesRequest) GetConfigurationId() string {
+	if x != nil {
+		return x.ConfigurationId
 	}
 	return ""
 }
@@ -147,7 +171,7 @@ type ListEnvironmentVariablesResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	EnvironmentVariables []*UserEnvironmentVariable `protobuf:"bytes,1,rep,name=environment_variables,json=environmentVariables,proto3" json:"environment_variables,omitempty"`
+	EnvironmentVariables []*EnvironmentVariable `protobuf:"bytes,1,rep,name=environment_variables,json=environmentVariables,proto3" json:"environment_variables,omitempty"`
 }
 
 func (x *ListEnvironmentVariablesResponse) Reset() {
@@ -182,7 +206,7 @@ func (*ListEnvironmentVariablesResponse) Descriptor() ([]byte, []int) {
 	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *ListEnvironmentVariablesResponse) GetEnvironmentVariables() []*UserEnvironmentVariable {
+func (x *ListEnvironmentVariablesResponse) GetEnvironmentVariables() []*EnvironmentVariable {
 	if x != nil {
 		return x.EnvironmentVariables
 	}
@@ -194,9 +218,11 @@ type UpdateEnvironmentVariableRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	EnvvarName              *string `protobuf:"bytes,1,opt,name=envvar_name,json=envvarName,proto3,oneof" json:"envvar_name,omitempty"`
-	EnvvarValue             *string `protobuf:"bytes,2,opt,name=envvar_value,json=envvarValue,proto3,oneof" json:"envvar_value,omitempty"`
-	EnvvarRepositoryPattern *string `protobuf:"bytes,3,opt,name=envvar_repository_pattern,json=envvarRepositoryPattern,proto3,oneof" json:"envvar_repository_pattern,omitempty"`
+	EnvVarName              *string `protobuf:"bytes,1,opt,name=env_var_name,json=envVarName,proto3,oneof" json:"env_var_name,omitempty"`
+	EnvVarValue             *string `protobuf:"bytes,2,opt,name=env_var_value,json=envVarValue,proto3,oneof" json:"env_var_value,omitempty"`
+	EnvVarRepositoryPattern *string `protobuf:"bytes,3,opt,name=env_var_repository_pattern,json=envVarRepositoryPattern,proto3,oneof" json:"env_var_repository_pattern,omitempty"`
+	EnvVarConfigurationId   *string `protobuf:"bytes,4,opt,name=env_var_configuration_id,json=envVarConfigurationId,proto3,oneof" json:"env_var_configuration_id,omitempty"`
+	EnvVarCensored          *bool   `protobuf:"varint,5,opt,name=env_var_censored,json=envVarCensored,proto3,oneof" json:"env_var_censored,omitempty"`
 }
 
 func (x *UpdateEnvironmentVariableRequest) Reset() {
@@ -231,33 +257,47 @@ func (*UpdateEnvironmentVariableRequest) Descriptor() ([]byte, []int) {
 	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *UpdateEnvironmentVariableRequest) GetEnvvarName() string {
-	if x != nil && x.EnvvarName != nil {
-		return *x.EnvvarName
+func (x *UpdateEnvironmentVariableRequest) GetEnvVarName() string {
+	if x != nil && x.EnvVarName != nil {
+		return *x.EnvVarName
 	}
 	return ""
 }
 
-func (x *UpdateEnvironmentVariableRequest) GetEnvvarValue() string {
-	if x != nil && x.EnvvarValue != nil {
-		return *x.EnvvarValue
+func (x *UpdateEnvironmentVariableRequest) GetEnvVarValue() string {
+	if x != nil && x.EnvVarValue != nil {
+		return *x.EnvVarValue
 	}
 	return ""
 }
 
-func (x *UpdateEnvironmentVariableRequest) GetEnvvarRepositoryPattern() string {
-	if x != nil && x.EnvvarRepositoryPattern != nil {
-		return *x.EnvvarRepositoryPattern
+func (x *UpdateEnvironmentVariableRequest) GetEnvVarRepositoryPattern() string {
+	if x != nil && x.EnvVarRepositoryPattern != nil {
+		return *x.EnvVarRepositoryPattern
 	}
 	return ""
 }
 
+func (x *UpdateEnvironmentVariableRequest) GetEnvVarConfigurationId() string {
+	if x != nil && x.EnvVarConfigurationId != nil {
+		return *x.EnvVarConfigurationId
+	}
+	return ""
+}
+
+func (x *UpdateEnvironmentVariableRequest) GetEnvVarCensored() bool {
+	if x != nil && x.EnvVarCensored != nil {
+		return *x.EnvVarCensored
+	}
+	return false
+}
+
 type UpdateEnvironmentVariableResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	EnvironmentVariable *UserEnvironmentVariable `protobuf:"bytes,1,opt,name=environment_variable,json=environmentVariable,proto3" json:"environment_variable,omitempty"`
+	EnvironmentVariable *EnvironmentVariable `protobuf:"bytes,1,opt,name=environment_variable,json=environmentVariable,proto3" json:"environment_variable,omitempty"`
 }
 
 func (x *UpdateEnvironmentVariableResponse) Reset() {
@@ -292,24 +332,27 @@ func (*UpdateEnvironmentVariableResponse) Descriptor() ([]byte, []int) {
 	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *UpdateEnvironmentVariableResponse) GetEnvironmentVariable() *UserEnvironmentVariable {
+func (x *UpdateEnvironmentVariableResponse) GetEnvironmentVariable() *EnvironmentVariable {
 	if x != nil {
 		return x.EnvironmentVariable
 	}
 	return nil
 }
 
-type DeleteEnvironmentVariableRequest struct {
+type CreateEnvironmentVariableRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	EnvvarName              string `protobuf:"bytes,1,opt,name=envvar_name,json=envvarName,proto3" json:"envvar_name,omitempty"`
-	EnvvarRepositoryPattern string `protobuf:"bytes,2,opt,name=envvar_repository_pattern,json=envvarRepositoryPattern,proto3" json:"envvar_repository_pattern,omitempty"`
+	EnvVarName              string `protobuf:"bytes,1,opt,name=env_var_name,json=envVarName,proto3" json:"env_var_name,omitempty"`
+	EnvVarValue             string `protobuf:"bytes,2,opt,name=env_var_value,json=envVarValue,proto3" json:"env_var_value,omitempty"`
+	EnvVarRepositoryPattern string `protobuf:"bytes,3,opt,name=env_var_repository_pattern,json=envVarRepositoryPattern,proto3" json:"env_var_repository_pattern,omitempty"`
+	EnvVarConfigurationId   string `protobuf:"bytes,4,opt,name=env_var_configuration_id,json=envVarConfigurationId,proto3" json:"env_var_configuration_id,omitempty"`
+	EnvVarCensored          bool   `protobuf:"varint,5,opt,name=env_var_censored,json=envVarCensored,proto3" json:"env_var_censored,omitempty"`
 }
 
-func (x *DeleteEnvironmentVariableRequest) Reset() {
-	*x = DeleteEnvironmentVariableRequest{}
+func (x *CreateEnvironmentVariableRequest) Reset() {
+	*x = CreateEnvironmentVariableRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gitpod_v1_envvar_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -317,13 +360,13 @@ func (x *DeleteEnvironmentVariableRequest) Reset() {
 	}
 }
 
-func (x *DeleteEnvironmentVariableRequest) String() string {
+func (x *CreateEnvironmentVariableRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DeleteEnvironmentVariableRequest) ProtoMessage() {}
+func (*CreateEnvironmentVariableRequest) ProtoMessage() {}
 
-func (x *DeleteEnvironmentVariableRequest) ProtoReflect() protoreflect.Message {
+func (x *CreateEnvironmentVariableRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_gitpod_v1_envvar_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -335,21 +378,136 @@ func (x *DeleteEnvironmentVariableRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DeleteEnvironmentVariableRequest.ProtoReflect.Descriptor instead.
-func (*DeleteEnvironmentVariableRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use CreateEnvironmentVariableRequest.ProtoReflect.Descriptor instead.
+func (*CreateEnvironmentVariableRequest) Descriptor() ([]byte, []int) {
 	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *DeleteEnvironmentVariableRequest) GetEnvvarName() string {
+func (x *CreateEnvironmentVariableRequest) GetEnvVarName() string {
+	if x != nil {
+		return x.EnvVarName
+	}
+	return ""
+}
+
+func (x *CreateEnvironmentVariableRequest) GetEnvVarValue() string {
+	if x != nil {
+		return x.EnvVarValue
+	}
+	return ""
+}
+
+func (x *CreateEnvironmentVariableRequest) GetEnvVarRepositoryPattern() string {
+	if x != nil {
+		return x.EnvVarRepositoryPattern
+	}
+	return ""
+}
+
+func (x *CreateEnvironmentVariableRequest) GetEnvVarConfigurationId() string {
 	if x != nil {
-		return x.EnvvarName
+		return x.EnvVarConfigurationId
 	}
 	return ""
 }
 
-func (x *DeleteEnvironmentVariableRequest) GetEnvvarRepositoryPattern() string {
+func (x *CreateEnvironmentVariableRequest) GetEnvVarCensored() bool {
+	if x != nil {
+		return x.EnvVarCensored
+	}
+	return false
+}
+
+type CreateEnvironmentVariableResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	EnvironmentVariable *EnvironmentVariable `protobuf:"bytes,1,opt,name=environment_variable,json=environmentVariable,proto3" json:"environment_variable,omitempty"`
+}
+
+func (x *CreateEnvironmentVariableResponse) Reset() {
+	*x = CreateEnvironmentVariableResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_gitpod_v1_envvar_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CreateEnvironmentVariableResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CreateEnvironmentVariableResponse) ProtoMessage() {}
+
+func (x *CreateEnvironmentVariableResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_gitpod_v1_envvar_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CreateEnvironmentVariableResponse.ProtoReflect.Descriptor instead.
+func (*CreateEnvironmentVariableResponse) Descriptor() ([]byte, []int) {
+	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *CreateEnvironmentVariableResponse) GetEnvironmentVariable() *EnvironmentVariable {
+	if x != nil {
+		return x.EnvironmentVariable
+	}
+	return nil
+}
+
+type DeleteEnvironmentVariableRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	EnvVarId string `protobuf:"bytes,1,opt,name=env_var_id,json=envVarId,proto3" json:"env_var_id,omitempty"`
+}
+
+func (x *DeleteEnvironmentVariableRequest) Reset() {
+	*x = DeleteEnvironmentVariableRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_gitpod_v1_envvar_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DeleteEnvironmentVariableRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DeleteEnvironmentVariableRequest) ProtoMessage() {}
+
+func (x *DeleteEnvironmentVariableRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_gitpod_v1_envvar_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DeleteEnvironmentVariableRequest.ProtoReflect.Descriptor instead.
+func (*DeleteEnvironmentVariableRequest) Descriptor() ([]byte, []int) {
+	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *DeleteEnvironmentVariableRequest) GetEnvVarId() string {
 	if x != nil {
-		return x.EnvvarRepositoryPattern
+		return x.EnvVarId
 	}
 	return ""
 }
@@ -363,7 +521,7 @@ type DeleteEnvironmentVariableResponse struct {
 func (x *DeleteEnvironmentVariableResponse) Reset() {
 	*x = DeleteEnvironmentVariableResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gitpod_v1_envvar_proto_msgTypes[6]
+		mi := &file_gitpod_v1_envvar_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -376,7 +534,7 @@ func (x *DeleteEnvironmentVariableResponse) String() string {
 func (*DeleteEnvironmentVariableResponse) ProtoMessage() {}
 
 func (x *DeleteEnvironmentVariableResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_gitpod_v1_envvar_proto_msgTypes[6]
+	mi := &file_gitpod_v1_envvar_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -389,7 +547,7 @@ func (x *DeleteEnvironmentVariableResponse) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use DeleteEnvironmentVariableResponse.ProtoReflect.Descriptor instead.
 func (*DeleteEnvironmentVariableResponse) Descriptor() ([]byte, []int) {
-	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{6}
+	return file_gitpod_v1_envvar_proto_rawDescGZIP(), []int{8}
 }
 
 var File_gitpod_v1_envvar_proto protoreflect.FileDescriptor
@@ -397,91 +555,134 @@ var File_gitpod_v1_envvar_proto protoreflect.FileDescriptor
 var file_gitpod_v1_envvar_proto_rawDesc = []byte{
 	0x0a, 0x16, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x6e, 0x76, 0x76,
 	0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x22, 0x82, 0x01, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x69,
-	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12,
-	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2d, 0x0a, 0x12, 0x72, 0x65, 0x70,
-	0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72,
-	0x79, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x22, 0x5a, 0x0a, 0x1f, 0x4c, 0x69, 0x73, 0x74,
-	0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0c, 0x77,
-	0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x48, 0x00, 0x52, 0x0b, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64,
-	0x88, 0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x5f, 0x69, 0x64, 0x22, 0x7b, 0x0a, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x76, 0x69,
-	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x57, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69,
-	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
-	0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x14, 0x65, 0x6e, 0x76,
-	0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x22, 0xf0, 0x01, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69,
+	0x2e, 0x76, 0x31, 0x22, 0xc5, 0x01, 0x0a, 0x13, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
+	0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2d, 0x0a, 0x12, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74,
+	0x6f, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x11, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x61, 0x74,
+	0x74, 0x65, 0x72, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12,
+	0x1a, 0x0a, 0x08, 0x63, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x08, 0x63, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x65, 0x64, 0x22, 0x6f, 0x0a, 0x1f, 0x4c,
+	0x69, 0x73, 0x74, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61,
+	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21,
+	0x0a, 0x0c, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49,
+	0x64, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x77, 0x0a, 0x20,
+	0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56,
+	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x53, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f,
+	0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x1e, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x76, 0x69,
 	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0b, 0x65, 0x6e, 0x76, 0x76, 0x61, 0x72,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0a, 0x65,
-	0x6e, 0x76, 0x76, 0x61, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0c,
-	0x65, 0x6e, 0x76, 0x76, 0x61, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x65, 0x6e, 0x76, 0x76, 0x61, 0x72, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x88, 0x01, 0x01, 0x12, 0x3f, 0x0a, 0x19, 0x65, 0x6e, 0x76, 0x76, 0x61, 0x72, 0x5f, 0x72,
-	0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72,
-	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x17, 0x65, 0x6e, 0x76, 0x76, 0x61,
-	0x72, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x61, 0x74, 0x74, 0x65,
-	0x72, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x65, 0x6e, 0x76, 0x76, 0x61, 0x72,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x65, 0x6e, 0x76, 0x76, 0x61, 0x72,
-	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x1c, 0x0a, 0x1a, 0x5f, 0x65, 0x6e, 0x76, 0x76, 0x61,
-	0x72, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x74,
-	0x74, 0x65, 0x72, 0x6e, 0x22, 0x7a, 0x0a, 0x21, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e,
-	0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x55, 0x0a, 0x14, 0x65, 0x6e, 0x76,
-	0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
-	0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x13, 0x65, 0x6e, 0x76,
-	0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x22, 0x7f, 0x0a, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f,
-	0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x6e, 0x76, 0x76, 0x61, 0x72, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x6e, 0x76, 0x76, 0x61,
-	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x3a, 0x0a, 0x19, 0x65, 0x6e, 0x76, 0x76, 0x61, 0x72, 0x5f,
-	0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65,
-	0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x65, 0x6e, 0x76, 0x76, 0x61, 0x72,
-	0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72,
-	0x6e, 0x22, 0x23, 0x0a, 0x21, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72,
-	0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x87, 0x03, 0x0a, 0x1a, 0x45, 0x6e, 0x76, 0x69, 0x72,
-	0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x75, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x76,
+	0x14, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x22, 0x95, 0x03, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61,
+	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x0c, 0x65, 0x6e,
+	0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x48, 0x00, 0x52, 0x0a, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01,
+	0x01, 0x12, 0x27, 0x0a, 0x0d, 0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x65, 0x6e, 0x76, 0x56,
+	0x61, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x12, 0x40, 0x0a, 0x1a, 0x65, 0x6e,
+	0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79,
+	0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02,
+	0x52, 0x17, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f,
+	0x72, 0x79, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x3c, 0x0a, 0x18,
+	0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03,
+	0x52, 0x15, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x10, 0x65, 0x6e,
+	0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x63, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x65, 0x64, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x08, 0x48, 0x04, 0x52, 0x0e, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x43, 0x65,
+	0x6e, 0x73, 0x6f, 0x72, 0x65, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x65, 0x6e,
+	0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x65,
+	0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x1d, 0x0a, 0x1b,
+	0x5f, 0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74,
+	0x6f, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x42, 0x1b, 0x0a, 0x19, 0x5f,
+	0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x65, 0x6e, 0x76,
+	0x5f, 0x76, 0x61, 0x72, 0x5f, 0x63, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x65, 0x64, 0x22, 0x76, 0x0a,
+	0x21, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65,
+	0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x51, 0x0a, 0x14, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x76,
 	0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72,
-	0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e,
-	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e,
-	0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
-	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x19,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
-	0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70,
-	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69,
-	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e,
-	0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x19, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x52, 0x13, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72,
+	0x69, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x88, 0x02, 0x0a, 0x20, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
 	0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61,
-	0x62, 0x6c, 0x65, 0x12, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
-	0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c,
+	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0c, 0x65, 0x6e,
+	0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0d,
+	0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x12, 0x3b, 0x0a, 0x1a, 0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x72, 0x65, 0x70, 0x6f,
+	0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x52, 0x65, 0x70, 0x6f,
+	0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12, 0x37, 0x0a,
+	0x18, 0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x15, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61,
+	0x72, 0x5f, 0x63, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0e, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x43, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x65, 0x64,
+	0x22, 0x76, 0x0a, 0x21, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f,
+	0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x14, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e,
+	0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
+	0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61,
+	0x62, 0x6c, 0x65, 0x52, 0x13, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
+	0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x40, 0x0a, 0x20, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72,
+	0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x0a,
+	0x65, 0x6e, 0x76, 0x5f, 0x76, 0x61, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x65, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x21, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56,
+	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32,
+	0x81, 0x04, 0x0a, 0x1a, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56,
+	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x75,
+	0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74,
+	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x76, 0x69, 0x72,
+	0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65,
+	0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45,
+	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62,
+	0x6c, 0x65, 0x12, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
+	0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72,
+	0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x78, 0x0a, 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e,
+	0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2b, 0x2e, 0x67,
+	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45,
+	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62,
+	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69,
+	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x19, 0x44, 0x65, 0x6c,
 	0x65, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61,
-	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x42, 0x39, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67,
-	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2d, 0x69, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2f,
-	0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x75, 0x62, 0x6c, 0x69,
-	0x63, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e,
+	0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2d, 0x69, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x75,
+	0x62, 0x6c, 0x69, 0x63, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x31, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -496,30 +697,35 @@ func file_gitpod_v1_envvar_proto_rawDescGZIP() []byte {
 	return file_gitpod_v1_envvar_proto_rawDescData
 }
 
-var file_gitpod_v1_envvar_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_gitpod_v1_envvar_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_gitpod_v1_envvar_proto_goTypes = []interface{}{
-	(*UserEnvironmentVariable)(nil),           // 0: gitpod.v1.UserEnvironmentVariable
+	(*EnvironmentVariable)(nil),               // 0: gitpod.v1.EnvironmentVariable
 	(*ListEnvironmentVariablesRequest)(nil),   // 1: gitpod.v1.ListEnvironmentVariablesRequest
 	(*ListEnvironmentVariablesResponse)(nil),  // 2: gitpod.v1.ListEnvironmentVariablesResponse
 	(*UpdateEnvironmentVariableRequest)(nil),  // 3: gitpod.v1.UpdateEnvironmentVariableRequest
 	(*UpdateEnvironmentVariableResponse)(nil), // 4: gitpod.v1.UpdateEnvironmentVariableResponse
-	(*DeleteEnvironmentVariableRequest)(nil),  // 5: gitpod.v1.DeleteEnvironmentVariableRequest
-	(*DeleteEnvironmentVariableResponse)(nil), // 6: gitpod.v1.DeleteEnvironmentVariableResponse
+	(*CreateEnvironmentVariableRequest)(nil),  // 5: gitpod.v1.CreateEnvironmentVariableRequest
+	(*CreateEnvironmentVariableResponse)(nil), // 6: gitpod.v1.CreateEnvironmentVariableResponse
+	(*DeleteEnvironmentVariableRequest)(nil),  // 7: gitpod.v1.DeleteEnvironmentVariableRequest
+	(*DeleteEnvironmentVariableResponse)(nil), // 8: gitpod.v1.DeleteEnvironmentVariableResponse
 }
 var file_gitpod_v1_envvar_proto_depIdxs = []int32{
-	0, // 0: gitpod.v1.ListEnvironmentVariablesResponse.environment_variables:type_name -> gitpod.v1.UserEnvironmentVariable
-	0, // 1: gitpod.v1.UpdateEnvironmentVariableResponse.environment_variable:type_name -> gitpod.v1.UserEnvironmentVariable
-	1, // 2: gitpod.v1.EnvironmentVariableService.ListEnvironmentVariables:input_type -> gitpod.v1.ListEnvironmentVariablesRequest
-	3, // 3: gitpod.v1.EnvironmentVariableService.UpdateEnvironmentVariable:input_type -> gitpod.v1.UpdateEnvironmentVariableRequest
-	5, // 4: gitpod.v1.EnvironmentVariableService.DeleteEnvironmentVariable:input_type -> gitpod.v1.DeleteEnvironmentVariableRequest
-	2, // 5: gitpod.v1.EnvironmentVariableService.ListEnvironmentVariables:output_type -> gitpod.v1.ListEnvironmentVariablesResponse
-	4, // 6: gitpod.v1.EnvironmentVariableService.UpdateEnvironmentVariable:output_type -> gitpod.v1.UpdateEnvironmentVariableResponse
-	6, // 7: gitpod.v1.EnvironmentVariableService.DeleteEnvironmentVariable:output_type -> gitpod.v1.DeleteEnvironmentVariableResponse
-	5, // [5:8] is the sub-list for method output_type
-	2, // [2:5] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
+	0, // 0: gitpod.v1.ListEnvironmentVariablesResponse.environment_variables:type_name -> gitpod.v1.EnvironmentVariable
+	0, // 1: gitpod.v1.UpdateEnvironmentVariableResponse.environment_variable:type_name -> gitpod.v1.EnvironmentVariable
+	0, // 2: gitpod.v1.CreateEnvironmentVariableResponse.environment_variable:type_name -> gitpod.v1.EnvironmentVariable
+	1, // 3: gitpod.v1.EnvironmentVariableService.ListEnvironmentVariables:input_type -> gitpod.v1.ListEnvironmentVariablesRequest
+	3, // 4: gitpod.v1.EnvironmentVariableService.UpdateEnvironmentVariable:input_type -> gitpod.v1.UpdateEnvironmentVariableRequest
+	5, // 5: gitpod.v1.EnvironmentVariableService.CreateEnvironmentVariable:input_type -> gitpod.v1.CreateEnvironmentVariableRequest
+	7, // 6: gitpod.v1.EnvironmentVariableService.DeleteEnvironmentVariable:input_type -> gitpod.v1.DeleteEnvironmentVariableRequest
+	2, // 7: gitpod.v1.EnvironmentVariableService.ListEnvironmentVariables:output_type -> gitpod.v1.ListEnvironmentVariablesResponse
+	4, // 8: gitpod.v1.EnvironmentVariableService.UpdateEnvironmentVariable:output_type -> gitpod.v1.UpdateEnvironmentVariableResponse
+	6, // 9: gitpod.v1.EnvironmentVariableService.CreateEnvironmentVariable:output_type -> gitpod.v1.CreateEnvironmentVariableResponse
+	8, // 10: gitpod.v1.EnvironmentVariableService.DeleteEnvironmentVariable:output_type -> gitpod.v1.DeleteEnvironmentVariableResponse
+	7, // [7:11] is the sub-list for method output_type
+	3, // [3:7] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_gitpod_v1_envvar_proto_init() }
@@ -529,7 +735,7 @@ func file_gitpod_v1_envvar_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_gitpod_v1_envvar_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserEnvironmentVariable); i {
+			switch v := v.(*EnvironmentVariable); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -589,7 +795,7 @@ func file_gitpod_v1_envvar_proto_init() {
 			}
 		}
 		file_gitpod_v1_envvar_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteEnvironmentVariableRequest); i {
+			switch v := v.(*CreateEnvironmentVariableRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -601,6 +807,30 @@ func file_gitpod_v1_envvar_proto_init() {
 			}
 		}
 		file_gitpod_v1_envvar_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CreateEnvironmentVariableResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_gitpod_v1_envvar_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DeleteEnvironmentVariableRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_gitpod_v1_envvar_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeleteEnvironmentVariableResponse); i {
 			case 0:
 				return &v.state
@@ -613,7 +843,6 @@ func file_gitpod_v1_envvar_proto_init() {
 			}
 		}
 	}
-	file_gitpod_v1_envvar_proto_msgTypes[1].OneofWrappers = []interface{}{}
 	file_gitpod_v1_envvar_proto_msgTypes[3].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -621,7 +850,7 @@ func file_gitpod_v1_envvar_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_gitpod_v1_envvar_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/components/public-api/go/v1/envvar_grpc.pb.go b/components/public-api/go/v1/envvar_grpc.pb.go
index f54b75d175804b..cdf35422accf43 100644
--- a/components/public-api/go/v1/envvar_grpc.pb.go
+++ b/components/public-api/go/v1/envvar_grpc.pb.go
@@ -34,13 +34,12 @@ type EnvironmentVariableServiceClient interface {
 	ListEnvironmentVariables(ctx context.Context, in *ListEnvironmentVariablesRequest, opts ...grpc.CallOption) (*ListEnvironmentVariablesResponse, error)
 	// UpdateEnvironmentVariable updates an environment variable for the
 	// authenticated user.
-	//
-	// workspace_id +return NOT_FOUND Workspace does not exist
 	UpdateEnvironmentVariable(ctx context.Context, in *UpdateEnvironmentVariableRequest, opts ...grpc.CallOption) (*UpdateEnvironmentVariableResponse, error)
+	// CreateEnvironmentVariable creates a new environment variable for the
+	// authenticated user.
+	CreateEnvironmentVariable(ctx context.Context, in *CreateEnvironmentVariableRequest, opts ...grpc.CallOption) (*CreateEnvironmentVariableResponse, error)
 	// DeleteEnvironmentVariable deletes an environment variable for the
 	// authenticated user.
-	//
-	// workspace_id +return NOT_FOUND Workspace does not exist
 	DeleteEnvironmentVariable(ctx context.Context, in *DeleteEnvironmentVariableRequest, opts ...grpc.CallOption) (*DeleteEnvironmentVariableResponse, error)
 }
 
@@ -70,6 +69,15 @@ func (c *environmentVariableServiceClient) UpdateEnvironmentVariable(ctx context
 	return out, nil
 }
 
+func (c *environmentVariableServiceClient) CreateEnvironmentVariable(ctx context.Context, in *CreateEnvironmentVariableRequest, opts ...grpc.CallOption) (*CreateEnvironmentVariableResponse, error) {
+	out := new(CreateEnvironmentVariableResponse)
+	err := c.cc.Invoke(ctx, "/gitpod.v1.EnvironmentVariableService/CreateEnvironmentVariable", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *environmentVariableServiceClient) DeleteEnvironmentVariable(ctx context.Context, in *DeleteEnvironmentVariableRequest, opts ...grpc.CallOption) (*DeleteEnvironmentVariableResponse, error) {
 	out := new(DeleteEnvironmentVariableResponse)
 	err := c.cc.Invoke(ctx, "/gitpod.v1.EnvironmentVariableService/DeleteEnvironmentVariable", in, out, opts...)
@@ -91,13 +99,12 @@ type EnvironmentVariableServiceServer interface {
 	ListEnvironmentVariables(context.Context, *ListEnvironmentVariablesRequest) (*ListEnvironmentVariablesResponse, error)
 	// UpdateEnvironmentVariable updates an environment variable for the
 	// authenticated user.
-	//
-	// workspace_id +return NOT_FOUND Workspace does not exist
 	UpdateEnvironmentVariable(context.Context, *UpdateEnvironmentVariableRequest) (*UpdateEnvironmentVariableResponse, error)
+	// CreateEnvironmentVariable creates a new environment variable for the
+	// authenticated user.
+	CreateEnvironmentVariable(context.Context, *CreateEnvironmentVariableRequest) (*CreateEnvironmentVariableResponse, error)
 	// DeleteEnvironmentVariable deletes an environment variable for the
 	// authenticated user.
-	//
-	// workspace_id +return NOT_FOUND Workspace does not exist
 	DeleteEnvironmentVariable(context.Context, *DeleteEnvironmentVariableRequest) (*DeleteEnvironmentVariableResponse, error)
 	mustEmbedUnimplementedEnvironmentVariableServiceServer()
 }
@@ -112,6 +119,9 @@ func (UnimplementedEnvironmentVariableServiceServer) ListEnvironmentVariables(co
 func (UnimplementedEnvironmentVariableServiceServer) UpdateEnvironmentVariable(context.Context, *UpdateEnvironmentVariableRequest) (*UpdateEnvironmentVariableResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEnvironmentVariable not implemented")
 }
+func (UnimplementedEnvironmentVariableServiceServer) CreateEnvironmentVariable(context.Context, *CreateEnvironmentVariableRequest) (*CreateEnvironmentVariableResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CreateEnvironmentVariable not implemented")
+}
 func (UnimplementedEnvironmentVariableServiceServer) DeleteEnvironmentVariable(context.Context, *DeleteEnvironmentVariableRequest) (*DeleteEnvironmentVariableResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEnvironmentVariable not implemented")
 }
@@ -165,6 +175,24 @@ func _EnvironmentVariableService_UpdateEnvironmentVariable_Handler(srv interface
 	return interceptor(ctx, in, info, handler)
 }
 
+func _EnvironmentVariableService_CreateEnvironmentVariable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateEnvironmentVariableRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EnvironmentVariableServiceServer).CreateEnvironmentVariable(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/gitpod.v1.EnvironmentVariableService/CreateEnvironmentVariable",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EnvironmentVariableServiceServer).CreateEnvironmentVariable(ctx, req.(*CreateEnvironmentVariableRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _EnvironmentVariableService_DeleteEnvironmentVariable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(DeleteEnvironmentVariableRequest)
 	if err := dec(in); err != nil {
@@ -198,6 +226,10 @@ var EnvironmentVariableService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateEnvironmentVariable",
 			Handler:    _EnvironmentVariableService_UpdateEnvironmentVariable_Handler,
 		},
+		{
+			MethodName: "CreateEnvironmentVariable",
+			Handler:    _EnvironmentVariableService_CreateEnvironmentVariable_Handler,
+		},
 		{
 			MethodName: "DeleteEnvironmentVariable",
 			Handler:    _EnvironmentVariableService_DeleteEnvironmentVariable_Handler,
diff --git a/components/public-api/go/v1/v1connect/envvar.connect.go b/components/public-api/go/v1/v1connect/envvar.connect.go
index 1e9c63639d6366..5a8e0a9884af66 100644
--- a/components/public-api/go/v1/v1connect/envvar.connect.go
+++ b/components/public-api/go/v1/v1connect/envvar.connect.go
@@ -41,13 +41,12 @@ type EnvironmentVariableServiceClient interface {
 	ListEnvironmentVariables(context.Context, *connect_go.Request[v1.ListEnvironmentVariablesRequest]) (*connect_go.Response[v1.ListEnvironmentVariablesResponse], error)
 	// UpdateEnvironmentVariable updates an environment variable for the
 	// authenticated user.
-	//
-	// workspace_id +return NOT_FOUND Workspace does not exist
 	UpdateEnvironmentVariable(context.Context, *connect_go.Request[v1.UpdateEnvironmentVariableRequest]) (*connect_go.Response[v1.UpdateEnvironmentVariableResponse], error)
+	// CreateEnvironmentVariable creates a new environment variable for the
+	// authenticated user.
+	CreateEnvironmentVariable(context.Context, *connect_go.Request[v1.CreateEnvironmentVariableRequest]) (*connect_go.Response[v1.CreateEnvironmentVariableResponse], error)
 	// DeleteEnvironmentVariable deletes an environment variable for the
 	// authenticated user.
-	//
-	// workspace_id +return NOT_FOUND Workspace does not exist
 	DeleteEnvironmentVariable(context.Context, *connect_go.Request[v1.DeleteEnvironmentVariableRequest]) (*connect_go.Response[v1.DeleteEnvironmentVariableResponse], error)
 }
 
@@ -71,6 +70,11 @@ func NewEnvironmentVariableServiceClient(httpClient connect_go.HTTPClient, baseU
 			baseURL+"/gitpod.v1.EnvironmentVariableService/UpdateEnvironmentVariable",
 			opts...,
 		),
+		createEnvironmentVariable: connect_go.NewClient[v1.CreateEnvironmentVariableRequest, v1.CreateEnvironmentVariableResponse](
+			httpClient,
+			baseURL+"/gitpod.v1.EnvironmentVariableService/CreateEnvironmentVariable",
+			opts...,
+		),
 		deleteEnvironmentVariable: connect_go.NewClient[v1.DeleteEnvironmentVariableRequest, v1.DeleteEnvironmentVariableResponse](
 			httpClient,
 			baseURL+"/gitpod.v1.EnvironmentVariableService/DeleteEnvironmentVariable",
@@ -83,6 +87,7 @@ func NewEnvironmentVariableServiceClient(httpClient connect_go.HTTPClient, baseU
 type environmentVariableServiceClient struct {
 	listEnvironmentVariables  *connect_go.Client[v1.ListEnvironmentVariablesRequest, v1.ListEnvironmentVariablesResponse]
 	updateEnvironmentVariable *connect_go.Client[v1.UpdateEnvironmentVariableRequest, v1.UpdateEnvironmentVariableResponse]
+	createEnvironmentVariable *connect_go.Client[v1.CreateEnvironmentVariableRequest, v1.CreateEnvironmentVariableResponse]
 	deleteEnvironmentVariable *connect_go.Client[v1.DeleteEnvironmentVariableRequest, v1.DeleteEnvironmentVariableResponse]
 }
 
@@ -96,6 +101,11 @@ func (c *environmentVariableServiceClient) UpdateEnvironmentVariable(ctx context
 	return c.updateEnvironmentVariable.CallUnary(ctx, req)
 }
 
+// CreateEnvironmentVariable calls gitpod.v1.EnvironmentVariableService.CreateEnvironmentVariable.
+func (c *environmentVariableServiceClient) CreateEnvironmentVariable(ctx context.Context, req *connect_go.Request[v1.CreateEnvironmentVariableRequest]) (*connect_go.Response[v1.CreateEnvironmentVariableResponse], error) {
+	return c.createEnvironmentVariable.CallUnary(ctx, req)
+}
+
 // DeleteEnvironmentVariable calls gitpod.v1.EnvironmentVariableService.DeleteEnvironmentVariable.
 func (c *environmentVariableServiceClient) DeleteEnvironmentVariable(ctx context.Context, req *connect_go.Request[v1.DeleteEnvironmentVariableRequest]) (*connect_go.Response[v1.DeleteEnvironmentVariableResponse], error) {
 	return c.deleteEnvironmentVariable.CallUnary(ctx, req)
@@ -112,13 +122,12 @@ type EnvironmentVariableServiceHandler interface {
 	ListEnvironmentVariables(context.Context, *connect_go.Request[v1.ListEnvironmentVariablesRequest]) (*connect_go.Response[v1.ListEnvironmentVariablesResponse], error)
 	// UpdateEnvironmentVariable updates an environment variable for the
 	// authenticated user.
-	//
-	// workspace_id +return NOT_FOUND Workspace does not exist
 	UpdateEnvironmentVariable(context.Context, *connect_go.Request[v1.UpdateEnvironmentVariableRequest]) (*connect_go.Response[v1.UpdateEnvironmentVariableResponse], error)
+	// CreateEnvironmentVariable creates a new environment variable for the
+	// authenticated user.
+	CreateEnvironmentVariable(context.Context, *connect_go.Request[v1.CreateEnvironmentVariableRequest]) (*connect_go.Response[v1.CreateEnvironmentVariableResponse], error)
 	// DeleteEnvironmentVariable deletes an environment variable for the
 	// authenticated user.
-	//
-	// workspace_id +return NOT_FOUND Workspace does not exist
 	DeleteEnvironmentVariable(context.Context, *connect_go.Request[v1.DeleteEnvironmentVariableRequest]) (*connect_go.Response[v1.DeleteEnvironmentVariableResponse], error)
 }
 
@@ -139,6 +148,11 @@ func NewEnvironmentVariableServiceHandler(svc EnvironmentVariableServiceHandler,
 		svc.UpdateEnvironmentVariable,
 		opts...,
 	))
+	mux.Handle("/gitpod.v1.EnvironmentVariableService/CreateEnvironmentVariable", connect_go.NewUnaryHandler(
+		"/gitpod.v1.EnvironmentVariableService/CreateEnvironmentVariable",
+		svc.CreateEnvironmentVariable,
+		opts...,
+	))
 	mux.Handle("/gitpod.v1.EnvironmentVariableService/DeleteEnvironmentVariable", connect_go.NewUnaryHandler(
 		"/gitpod.v1.EnvironmentVariableService/DeleteEnvironmentVariable",
 		svc.DeleteEnvironmentVariable,
@@ -158,6 +172,10 @@ func (UnimplementedEnvironmentVariableServiceHandler) UpdateEnvironmentVariable(
 	return nil, connect_go.NewError(connect_go.CodeUnimplemented, errors.New("gitpod.v1.EnvironmentVariableService.UpdateEnvironmentVariable is not implemented"))
 }
 
+func (UnimplementedEnvironmentVariableServiceHandler) CreateEnvironmentVariable(context.Context, *connect_go.Request[v1.CreateEnvironmentVariableRequest]) (*connect_go.Response[v1.CreateEnvironmentVariableResponse], error) {
+	return nil, connect_go.NewError(connect_go.CodeUnimplemented, errors.New("gitpod.v1.EnvironmentVariableService.CreateEnvironmentVariable is not implemented"))
+}
+
 func (UnimplementedEnvironmentVariableServiceHandler) DeleteEnvironmentVariable(context.Context, *connect_go.Request[v1.DeleteEnvironmentVariableRequest]) (*connect_go.Response[v1.DeleteEnvironmentVariableResponse], error) {
 	return nil, connect_go.NewError(connect_go.CodeUnimplemented, errors.New("gitpod.v1.EnvironmentVariableService.DeleteEnvironmentVariable is not implemented"))
 }
diff --git a/components/public-api/go/v1/v1connect/envvar.proxy.connect.go b/components/public-api/go/v1/v1connect/envvar.proxy.connect.go
index a5a13c803abc4e..f5fd56629bafa1 100644
--- a/components/public-api/go/v1/v1connect/envvar.proxy.connect.go
+++ b/components/public-api/go/v1/v1connect/envvar.proxy.connect.go
@@ -39,6 +39,16 @@ func (s *ProxyEnvironmentVariableServiceHandler) UpdateEnvironmentVariable(ctx c
 	return connect_go.NewResponse(resp), nil
 }
 
+func (s *ProxyEnvironmentVariableServiceHandler) CreateEnvironmentVariable(ctx context.Context, req *connect_go.Request[v1.CreateEnvironmentVariableRequest]) (*connect_go.Response[v1.CreateEnvironmentVariableResponse], error) {
+	resp, err := s.Client.CreateEnvironmentVariable(ctx, req.Msg)
+	if err != nil {
+		// TODO(milan): Convert to correct status code
+		return nil, err
+	}
+
+	return connect_go.NewResponse(resp), nil
+}
+
 func (s *ProxyEnvironmentVariableServiceHandler) DeleteEnvironmentVariable(ctx context.Context, req *connect_go.Request[v1.DeleteEnvironmentVariableRequest]) (*connect_go.Response[v1.DeleteEnvironmentVariableResponse], error) {
 	resp, err := s.Client.DeleteEnvironmentVariable(ctx, req.Msg)
 	if err != nil {
diff --git a/components/public-api/typescript/src/gitpod/v1/envvar_connect.ts b/components/public-api/typescript/src/gitpod/v1/envvar_connect.ts
index 69445ea1d684c0..bbac882c22e72c 100644
--- a/components/public-api/typescript/src/gitpod/v1/envvar_connect.ts
+++ b/components/public-api/typescript/src/gitpod/v1/envvar_connect.ts
@@ -9,7 +9,7 @@
 /* eslint-disable */
 // @ts-nocheck
 
-import { DeleteEnvironmentVariableRequest, DeleteEnvironmentVariableResponse, ListEnvironmentVariablesRequest, ListEnvironmentVariablesResponse, UpdateEnvironmentVariableRequest, UpdateEnvironmentVariableResponse } from "./envvar_pb.js";
+import { CreateEnvironmentVariableRequest, CreateEnvironmentVariableResponse, DeleteEnvironmentVariableRequest, DeleteEnvironmentVariableResponse, ListEnvironmentVariablesRequest, ListEnvironmentVariablesResponse, UpdateEnvironmentVariableRequest, UpdateEnvironmentVariableResponse } from "./envvar_pb.js";
 import { MethodKind } from "@bufbuild/protobuf";
 
 /**
@@ -37,8 +37,6 @@ export const EnvironmentVariableService = {
      * UpdateEnvironmentVariable updates an environment variable for the
      * authenticated user.
      *
-     * workspace_id +return NOT_FOUND Workspace does not exist
-     *
      * @generated from rpc gitpod.v1.EnvironmentVariableService.UpdateEnvironmentVariable
      */
     updateEnvironmentVariable: {
@@ -48,10 +46,20 @@ export const EnvironmentVariableService = {
       kind: MethodKind.Unary,
     },
     /**
-     * DeleteEnvironmentVariable deletes an environment variable for the
+     * CreateEnvironmentVariable creates a new environment variable for the
      * authenticated user.
      *
-     * workspace_id +return NOT_FOUND Workspace does not exist
+     * @generated from rpc gitpod.v1.EnvironmentVariableService.CreateEnvironmentVariable
+     */
+    createEnvironmentVariable: {
+      name: "CreateEnvironmentVariable",
+      I: CreateEnvironmentVariableRequest,
+      O: CreateEnvironmentVariableResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * DeleteEnvironmentVariable deletes an environment variable for the
+     * authenticated user.
      *
      * @generated from rpc gitpod.v1.EnvironmentVariableService.DeleteEnvironmentVariable
      */
diff --git a/components/public-api/typescript/src/gitpod/v1/envvar_pb.ts b/components/public-api/typescript/src/gitpod/v1/envvar_pb.ts
index 75c515a7a822b7..4823650b850c7c 100644
--- a/components/public-api/typescript/src/gitpod/v1/envvar_pb.ts
+++ b/components/public-api/typescript/src/gitpod/v1/envvar_pb.ts
@@ -13,9 +13,9 @@ import type { BinaryReadOptions, FieldList, JsonReadOptions, JsonValue, PartialM
 import { Message, proto3 } from "@bufbuild/protobuf";
 
 /**
- * @generated from message gitpod.v1.UserEnvironmentVariable
+ * @generated from message gitpod.v1.EnvironmentVariable
  */
-export class UserEnvironmentVariable extends Message<UserEnvironmentVariable> {
+export class EnvironmentVariable extends Message<EnvironmentVariable> {
   /**
    * @generated from field: string id = 1;
    */
@@ -32,38 +32,56 @@ export class UserEnvironmentVariable extends Message<UserEnvironmentVariable> {
   value = "";
 
   /**
+   * Only set for user env variables
+   *
    * @generated from field: string repository_pattern = 4;
    */
   repositoryPattern = "";
 
-  constructor(data?: PartialMessage<UserEnvironmentVariable>) {
+  /**
+   * Only set for project env variables
+   *
+   * @generated from field: string configuration_id = 5;
+   */
+  configurationId = "";
+
+  /**
+   * Only set for project env variables
+   *
+   * @generated from field: bool censored = 6;
+   */
+  censored = false;
+
+  constructor(data?: PartialMessage<EnvironmentVariable>) {
     super();
     proto3.util.initPartial(data, this);
   }
 
   static readonly runtime: typeof proto3 = proto3;
-  static readonly typeName = "gitpod.v1.UserEnvironmentVariable";
+  static readonly typeName = "gitpod.v1.EnvironmentVariable";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 3, name: "value", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 4, name: "repository_pattern", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 5, name: "configuration_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 6, name: "censored", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
-  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UserEnvironmentVariable {
-    return new UserEnvironmentVariable().fromBinary(bytes, options);
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): EnvironmentVariable {
+    return new EnvironmentVariable().fromBinary(bytes, options);
   }
 
-  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): UserEnvironmentVariable {
-    return new UserEnvironmentVariable().fromJson(jsonValue, options);
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): EnvironmentVariable {
+    return new EnvironmentVariable().fromJson(jsonValue, options);
   }
 
-  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): UserEnvironmentVariable {
-    return new UserEnvironmentVariable().fromJsonString(jsonString, options);
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): EnvironmentVariable {
+    return new EnvironmentVariable().fromJsonString(jsonString, options);
   }
 
-  static equals(a: UserEnvironmentVariable | PlainMessage<UserEnvironmentVariable> | undefined, b: UserEnvironmentVariable | PlainMessage<UserEnvironmentVariable> | undefined): boolean {
-    return proto3.util.equals(UserEnvironmentVariable, a, b);
+  static equals(a: EnvironmentVariable | PlainMessage<EnvironmentVariable> | undefined, b: EnvironmentVariable | PlainMessage<EnvironmentVariable> | undefined): boolean {
+    return proto3.util.equals(EnvironmentVariable, a, b);
   }
 }
 
@@ -72,9 +90,14 @@ export class UserEnvironmentVariable extends Message<UserEnvironmentVariable> {
  */
 export class ListEnvironmentVariablesRequest extends Message<ListEnvironmentVariablesRequest> {
   /**
-   * @generated from field: optional string workspace_id = 1;
+   * @generated from field: string workspace_id = 1;
+   */
+  workspaceId = "";
+
+  /**
+   * @generated from field: string configuration_id = 2;
    */
-  workspaceId?: string;
+  configurationId = "";
 
   constructor(data?: PartialMessage<ListEnvironmentVariablesRequest>) {
     super();
@@ -84,7 +107,8 @@ export class ListEnvironmentVariablesRequest extends Message<ListEnvironmentVari
   static readonly runtime: typeof proto3 = proto3;
   static readonly typeName = "gitpod.v1.ListEnvironmentVariablesRequest";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "workspace_id", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 1, name: "workspace_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: "configuration_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): ListEnvironmentVariablesRequest {
@@ -109,9 +133,9 @@ export class ListEnvironmentVariablesRequest extends Message<ListEnvironmentVari
  */
 export class ListEnvironmentVariablesResponse extends Message<ListEnvironmentVariablesResponse> {
   /**
-   * @generated from field: repeated gitpod.v1.UserEnvironmentVariable environment_variables = 1;
+   * @generated from field: repeated gitpod.v1.EnvironmentVariable environment_variables = 1;
    */
-  environmentVariables: UserEnvironmentVariable[] = [];
+  environmentVariables: EnvironmentVariable[] = [];
 
   constructor(data?: PartialMessage<ListEnvironmentVariablesResponse>) {
     super();
@@ -121,7 +145,7 @@ export class ListEnvironmentVariablesResponse extends Message<ListEnvironmentVar
   static readonly runtime: typeof proto3 = proto3;
   static readonly typeName = "gitpod.v1.ListEnvironmentVariablesResponse";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "environment_variables", kind: "message", T: UserEnvironmentVariable, repeated: true },
+    { no: 1, name: "environment_variables", kind: "message", T: EnvironmentVariable, repeated: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): ListEnvironmentVariablesResponse {
@@ -146,19 +170,29 @@ export class ListEnvironmentVariablesResponse extends Message<ListEnvironmentVar
  */
 export class UpdateEnvironmentVariableRequest extends Message<UpdateEnvironmentVariableRequest> {
   /**
-   * @generated from field: optional string envvar_name = 1;
+   * @generated from field: optional string env_var_name = 1;
    */
-  envvarName?: string;
+  envVarName?: string;
 
   /**
-   * @generated from field: optional string envvar_value = 2;
+   * @generated from field: optional string env_var_value = 2;
    */
-  envvarValue?: string;
+  envVarValue?: string;
 
   /**
-   * @generated from field: optional string envvar_repository_pattern = 3;
+   * @generated from field: optional string env_var_repository_pattern = 3;
    */
-  envvarRepositoryPattern?: string;
+  envVarRepositoryPattern?: string;
+
+  /**
+   * @generated from field: optional string env_var_configuration_id = 4;
+   */
+  envVarConfigurationId?: string;
+
+  /**
+   * @generated from field: optional bool env_var_censored = 5;
+   */
+  envVarCensored?: boolean;
 
   constructor(data?: PartialMessage<UpdateEnvironmentVariableRequest>) {
     super();
@@ -168,9 +202,11 @@ export class UpdateEnvironmentVariableRequest extends Message<UpdateEnvironmentV
   static readonly runtime: typeof proto3 = proto3;
   static readonly typeName = "gitpod.v1.UpdateEnvironmentVariableRequest";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "envvar_name", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
-    { no: 2, name: "envvar_value", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
-    { no: 3, name: "envvar_repository_pattern", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 1, name: "env_var_name", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 2, name: "env_var_value", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 3, name: "env_var_repository_pattern", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 4, name: "env_var_configuration_id", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 5, name: "env_var_censored", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UpdateEnvironmentVariableRequest {
@@ -195,9 +231,9 @@ export class UpdateEnvironmentVariableRequest extends Message<UpdateEnvironmentV
  */
 export class UpdateEnvironmentVariableResponse extends Message<UpdateEnvironmentVariableResponse> {
   /**
-   * @generated from field: gitpod.v1.UserEnvironmentVariable environment_variable = 1;
+   * @generated from field: gitpod.v1.EnvironmentVariable environment_variable = 1;
    */
-  environmentVariable?: UserEnvironmentVariable;
+  environmentVariable?: EnvironmentVariable;
 
   constructor(data?: PartialMessage<UpdateEnvironmentVariableResponse>) {
     super();
@@ -207,7 +243,7 @@ export class UpdateEnvironmentVariableResponse extends Message<UpdateEnvironment
   static readonly runtime: typeof proto3 = proto3;
   static readonly typeName = "gitpod.v1.UpdateEnvironmentVariableResponse";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "environment_variable", kind: "message", T: UserEnvironmentVariable },
+    { no: 1, name: "environment_variable", kind: "message", T: EnvironmentVariable },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UpdateEnvironmentVariableResponse {
@@ -228,18 +264,111 @@ export class UpdateEnvironmentVariableResponse extends Message<UpdateEnvironment
 }
 
 /**
- * @generated from message gitpod.v1.DeleteEnvironmentVariableRequest
+ * @generated from message gitpod.v1.CreateEnvironmentVariableRequest
  */
-export class DeleteEnvironmentVariableRequest extends Message<DeleteEnvironmentVariableRequest> {
+export class CreateEnvironmentVariableRequest extends Message<CreateEnvironmentVariableRequest> {
+  /**
+   * @generated from field: string env_var_name = 1;
+   */
+  envVarName = "";
+
+  /**
+   * @generated from field: string env_var_value = 2;
+   */
+  envVarValue = "";
+
+  /**
+   * @generated from field: string env_var_repository_pattern = 3;
+   */
+  envVarRepositoryPattern = "";
+
+  /**
+   * @generated from field: string env_var_configuration_id = 4;
+   */
+  envVarConfigurationId = "";
+
+  /**
+   * @generated from field: bool env_var_censored = 5;
+   */
+  envVarCensored = false;
+
+  constructor(data?: PartialMessage<CreateEnvironmentVariableRequest>) {
+    super();
+    proto3.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto3 = proto3;
+  static readonly typeName = "gitpod.v1.CreateEnvironmentVariableRequest";
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: "env_var_name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: "env_var_value", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 3, name: "env_var_repository_pattern", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 4, name: "env_var_configuration_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 5, name: "env_var_censored", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): CreateEnvironmentVariableRequest {
+    return new CreateEnvironmentVariableRequest().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): CreateEnvironmentVariableRequest {
+    return new CreateEnvironmentVariableRequest().fromJson(jsonValue, options);
+  }
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): CreateEnvironmentVariableRequest {
+    return new CreateEnvironmentVariableRequest().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: CreateEnvironmentVariableRequest | PlainMessage<CreateEnvironmentVariableRequest> | undefined, b: CreateEnvironmentVariableRequest | PlainMessage<CreateEnvironmentVariableRequest> | undefined): boolean {
+    return proto3.util.equals(CreateEnvironmentVariableRequest, a, b);
+  }
+}
+
+/**
+ * @generated from message gitpod.v1.CreateEnvironmentVariableResponse
+ */
+export class CreateEnvironmentVariableResponse extends Message<CreateEnvironmentVariableResponse> {
   /**
-   * @generated from field: string envvar_name = 1;
+   * @generated from field: gitpod.v1.EnvironmentVariable environment_variable = 1;
    */
-  envvarName = "";
+  environmentVariable?: EnvironmentVariable;
+
+  constructor(data?: PartialMessage<CreateEnvironmentVariableResponse>) {
+    super();
+    proto3.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto3 = proto3;
+  static readonly typeName = "gitpod.v1.CreateEnvironmentVariableResponse";
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: "environment_variable", kind: "message", T: EnvironmentVariable },
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): CreateEnvironmentVariableResponse {
+    return new CreateEnvironmentVariableResponse().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): CreateEnvironmentVariableResponse {
+    return new CreateEnvironmentVariableResponse().fromJson(jsonValue, options);
+  }
 
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): CreateEnvironmentVariableResponse {
+    return new CreateEnvironmentVariableResponse().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: CreateEnvironmentVariableResponse | PlainMessage<CreateEnvironmentVariableResponse> | undefined, b: CreateEnvironmentVariableResponse | PlainMessage<CreateEnvironmentVariableResponse> | undefined): boolean {
+    return proto3.util.equals(CreateEnvironmentVariableResponse, a, b);
+  }
+}
+
+/**
+ * @generated from message gitpod.v1.DeleteEnvironmentVariableRequest
+ */
+export class DeleteEnvironmentVariableRequest extends Message<DeleteEnvironmentVariableRequest> {
   /**
-   * @generated from field: string envvar_repository_pattern = 2;
+   * @generated from field: string env_var_id = 1;
    */
-  envvarRepositoryPattern = "";
+  envVarId = "";
 
   constructor(data?: PartialMessage<DeleteEnvironmentVariableRequest>) {
     super();
@@ -249,8 +378,7 @@ export class DeleteEnvironmentVariableRequest extends Message<DeleteEnvironmentV
   static readonly runtime: typeof proto3 = proto3;
   static readonly typeName = "gitpod.v1.DeleteEnvironmentVariableRequest";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "envvar_name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-    { no: 2, name: "envvar_repository_pattern", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 1, name: "env_var_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): DeleteEnvironmentVariableRequest {