diff --git a/controller/state.go b/controller/state.go
index d13aebb93e078..dd955db0c93f7 100644
--- a/controller/state.go
+++ b/controller/state.go
@@ -209,8 +209,7 @@ func (m *appStateManager) getRepoObjs(app *v1alpha1.Application, sources []v1alp
 			ProjectName:        proj.Name,
 			ProjectSourceRepos: proj.Spec.SourceRepos,
 			ApplicationIdentity: &apiclient.ApplicationIdentity{
-				Runtime:   "runtime",
-				Cluster:   "cluster",
+				Cluster:   app.Spec.Destination.Server,
 				Namespace: app.Spec.Destination.Namespace,
 				Name:      app.InstanceName(m.namespace),
 			},
diff --git a/pkg/codefresh/client.go b/pkg/codefresh/client.go
index 7a7eaf1a8ab58..97803924b20fe 100644
--- a/pkg/codefresh/client.go
+++ b/pkg/codefresh/client.go
@@ -106,8 +106,8 @@ func (cc *CodefreshClient) Send(ctx context.Context, appName string, event *even
 func (client *CodefreshClient) GetApplicationConfiguration(app *ApplicationIdentity) (*ApplicationConfiguration, error) {
 	query := GraphQLQuery{
 		Query: `
-		query ($runtime: String!, $cluster: String!, $namespace: String!, $name: String!) {
-		  applicationConfiguration(runtime: $runtime, cluster: $cluster, namespace: $namespace, name: $name) {
+		query ($cluster: String!, $namespace: String!, $name: String!) {
+		  applicationConfigurationByRuntime(cluster: $cluster, namespace: $namespace, name: $name) {
 			versionSource {
 			  file
 			  jsonPath
@@ -116,7 +116,6 @@ func (client *CodefreshClient) GetApplicationConfiguration(app *ApplicationIdent
 		}
 		`,
 		Variables: map[string]interface{}{
-			"runtime":   app.Runtime,
 			"cluster":   app.Cluster,
 			"namespace": app.Namespace,
 			"name":      app.Name,
diff --git a/reposerver/apiclient/repository.pb.go b/reposerver/apiclient/repository.pb.go
index 6b1064c3b0a3e..139b4b5f7d8f1 100644
--- a/reposerver/apiclient/repository.pb.go
+++ b/reposerver/apiclient/repository.pb.go
@@ -31,10 +31,9 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type ApplicationIdentity struct {
-	Runtime              string   `protobuf:"bytes,1,opt,name=runtime,proto3" json:"runtime,omitempty"`
-	Cluster              string   `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Namespace            string   `protobuf:"bytes,3,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	Cluster              string   `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	Namespace            string   `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -73,13 +72,6 @@ func (m *ApplicationIdentity) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ApplicationIdentity proto.InternalMessageInfo
 
-func (m *ApplicationIdentity) GetRuntime() string {
-	if m != nil {
-		return m.Runtime
-	}
-	return ""
-}
-
 func (m *ApplicationIdentity) GetCluster() string {
 	if m != nil {
 		return m.Cluster
@@ -2506,157 +2498,156 @@ func init() {
 }
 
 var fileDescriptor_dd8723cfcc820480 = []byte{
-	// 2400 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x3a, 0x5b, 0x6f, 0xdc, 0xc6,
-	0xd5, 0x5a, 0x5d, 0x77, 0x8f, 0x24, 0x4b, 0x1a, 0xcb, 0x32, 0xbd, 0xb1, 0xf5, 0x29, 0xfc, 0x62,
-	0xc3, 0xb5, 0x13, 0x2e, 0x24, 0x37, 0x71, 0xe0, 0xb8, 0x29, 0x14, 0x5f, 0x24, 0x5f, 0x64, 0x3b,
-	0xb4, 0xdb, 0x22, 0xa9, 0xdb, 0x62, 0xc4, 0x1d, 0xed, 0x4e, 0x96, 0x97, 0x09, 0x39, 0x94, 0xb1,
-	0x2e, 0x0a, 0xb4, 0x68, 0x51, 0xa0, 0x7f, 0xa0, 0x0f, 0xfd, 0x1f, 0x45, 0x9f, 0x82, 0x3e, 0x05,
-	0xed, 0x63, 0xd0, 0x3f, 0xd0, 0xc2, 0xbf, 0xa4, 0x98, 0x0b, 0xc9, 0x21, 0x97, 0x92, 0x9d, 0xca,
-	0x56, 0xd0, 0xbe, 0xd8, 0x73, 0x0e, 0xcf, 0x9c, 0xdb, 0x9c, 0x39, 0x97, 0xd1, 0xc2, 0x85, 0x98,
-	0xb0, 0x28, 0x21, 0xf1, 0x3e, 0x89, 0x3b, 0x72, 0x49, 0x79, 0x14, 0x0f, 0x8d, 0xa5, 0xc3, 0xe2,
-	0x88, 0x47, 0x08, 0x0a, 0x4c, 0xdb, 0x1e, 0x7c, 0x98, 0x38, 0x34, 0xea, 0x60, 0x46, 0x3b, 0x5e,
-	0x14, 0x93, 0xce, 0xfe, 0x7a, 0xa7, 0x47, 0x42, 0x12, 0x63, 0x4e, 0xba, 0x8a, 0xbe, 0xfd, 0xfd,
-	0x82, 0x26, 0xc0, 0x5e, 0x9f, 0x86, 0x24, 0x1e, 0x76, 0xd8, 0xa0, 0x27, 0x10, 0x49, 0x27, 0x20,
-	0x1c, 0xd7, 0xed, 0xba, 0xdf, 0xa3, 0xbc, 0x9f, 0xee, 0x3a, 0x5e, 0x14, 0x74, 0x70, 0xdc, 0x8b,
-	0x58, 0x1c, 0x7d, 0x21, 0x17, 0xef, 0x79, 0xdd, 0xce, 0xfe, 0x46, 0xc1, 0x00, 0x33, 0xe6, 0x53,
-	0x0f, 0x73, 0x1a, 0x85, 0x9d, 0xfd, 0x75, 0xec, 0xb3, 0x3e, 0x1e, 0xe5, 0xf6, 0x56, 0x2f, 0x8a,
-	0x7a, 0x3e, 0xe9, 0x48, 0x68, 0x37, 0xdd, 0xeb, 0x90, 0x80, 0x71, 0x6d, 0x90, 0xfd, 0x4b, 0x38,
-	0xb9, 0x59, 0x30, 0xb9, 0xd3, 0x25, 0x21, 0xa7, 0x7c, 0x88, 0x2c, 0x98, 0x89, 0xd3, 0x90, 0xd3,
-	0x80, 0x58, 0x8d, 0xb5, 0xc6, 0xc5, 0x96, 0x9b, 0x81, 0xe2, 0x8b, 0xe7, 0xa7, 0x09, 0x27, 0xb1,
-	0x35, 0xae, 0xbe, 0x68, 0x10, 0x9d, 0x85, 0x56, 0x88, 0x03, 0x92, 0x30, 0xec, 0x11, 0x6b, 0x42,
-	0x7e, 0x2b, 0x10, 0x08, 0xc1, 0xa4, 0x00, 0xac, 0x49, 0xf9, 0x41, 0xae, 0xed, 0xaf, 0xe6, 0x61,
-	0x61, 0x07, 0x87, 0x74, 0x8f, 0x24, 0xdc, 0x25, 0x5f, 0xa6, 0x24, 0xe1, 0xe8, 0x29, 0x4c, 0x0a,
-	0x1f, 0x4b, 0xb1, 0xb3, 0x1b, 0xdb, 0x4e, 0xe1, 0x0a, 0x27, 0x73, 0x85, 0x5c, 0xfc, 0xc2, 0xeb,
-	0x3a, 0xfb, 0x1b, 0x0e, 0x1b, 0xf4, 0x1c, 0xe1, 0x0a, 0xc7, 0x70, 0x85, 0x93, 0xb9, 0xc2, 0x71,
-	0xf3, 0xd3, 0x72, 0x25, 0x57, 0xd4, 0x86, 0x66, 0x4c, 0xf6, 0x69, 0x42, 0xa3, 0x50, 0xab, 0x9f,
-	0xc3, 0xc2, 0xb2, 0x30, 0xba, 0x81, 0xbd, 0xbe, 0xd2, 0xbe, 0xe9, 0x66, 0x20, 0x5a, 0x83, 0x59,
-	0xcc, 0xd8, 0x7d, 0xbc, 0x4b, 0xfc, 0x7b, 0x64, 0xa8, 0x4d, 0x30, 0x51, 0x62, 0x2f, 0x66, 0xec,
-	0x81, 0x30, 0x70, 0x4a, 0x79, 0x45, 0x83, 0x65, 0xaf, 0x34, 0xab, 0x5e, 0xf9, 0x15, 0x2c, 0x19,
-	0x8a, 0x3f, 0x8e, 0xd2, 0xd8, 0x23, 0x16, 0x48, 0xd3, 0x1f, 0x1e, 0xcd, 0xf4, 0xcd, 0x2a, 0x5b,
-	0x77, 0x54, 0x12, 0xfa, 0x39, 0x4c, 0xc9, 0x80, 0xb6, 0x66, 0xd7, 0x26, 0x5e, 0xab, 0xb7, 0x15,
-	0x5b, 0x14, 0xc2, 0x0c, 0xf3, 0xd3, 0x1e, 0x0d, 0x13, 0x6b, 0x4e, 0x4a, 0x78, 0x72, 0x34, 0x09,
-	0x37, 0xa2, 0x70, 0x8f, 0xf6, 0x76, 0x70, 0x88, 0x7b, 0x24, 0x20, 0x21, 0x7f, 0x24, 0x99, 0xbb,
-	0x99, 0x10, 0xf4, 0x1c, 0x16, 0x07, 0x69, 0xc2, 0xa3, 0x80, 0x3e, 0x27, 0x0f, 0x99, 0xd8, 0x9b,
-	0x58, 0xf3, 0xd2, 0x9b, 0x0f, 0x8e, 0x26, 0xf8, 0x5e, 0x85, 0xab, 0x3b, 0x22, 0x47, 0x04, 0xc9,
-	0x20, 0xdd, 0x25, 0x3f, 0x26, 0xb1, 0x8c, 0xae, 0x13, 0x2a, 0x48, 0x0c, 0x94, 0x0a, 0x23, 0xaa,
-	0xa1, 0xc4, 0x5a, 0x58, 0x9b, 0x50, 0x61, 0x94, 0xa3, 0xd0, 0x45, 0x58, 0xd8, 0x27, 0x31, 0xdd,
-	0x1b, 0x3e, 0xa6, 0xbd, 0x10, 0xf3, 0x34, 0x26, 0xd6, 0xa2, 0x0c, 0xc5, 0x2a, 0x1a, 0x05, 0x30,
-	0xdf, 0x27, 0x7e, 0x20, 0x5c, 0x7e, 0x23, 0x26, 0xdd, 0xc4, 0x5a, 0x92, 0xfe, 0xdd, 0x3a, 0xfa,
-	0x09, 0x4a, 0x76, 0x6e, 0x99, 0xbb, 0x50, 0x2c, 0x8c, 0x5c, 0x7d, 0x53, 0xd4, 0x1d, 0x41, 0x4a,
-	0xb1, 0x0a, 0x1a, 0x5d, 0x80, 0x13, 0x3c, 0xc6, 0xde, 0x80, 0x86, 0xbd, 0x1d, 0xc2, 0xfb, 0x51,
-	0xd7, 0x3a, 0x29, 0x3d, 0x51, 0xc1, 0x22, 0x0f, 0x10, 0x09, 0xf1, 0xae, 0x4f, 0xba, 0x2a, 0x16,
-	0x9f, 0x0c, 0x19, 0x49, 0xac, 0x65, 0x69, 0xc5, 0x15, 0xc7, 0x48, 0xbc, 0x95, 0x04, 0xe1, 0xdc,
-	0x1a, 0xd9, 0x75, 0x2b, 0xe4, 0xf1, 0xd0, 0xad, 0x61, 0x87, 0x06, 0x30, 0x2b, 0xec, 0xc8, 0x42,
-	0xe1, 0x94, 0x0c, 0x85, 0x3b, 0x47, 0xf3, 0xd1, 0x76, 0xc1, 0xd0, 0x35, 0xb9, 0x23, 0x07, 0x50,
-	0x1f, 0x27, 0x3b, 0xa9, 0xcf, 0x29, 0xf3, 0x89, 0x52, 0x23, 0xb1, 0x56, 0xa4, 0x9b, 0x6a, 0xbe,
-	0xa0, 0x7b, 0x00, 0x31, 0xd9, 0xcb, 0xe8, 0x4e, 0x4b, 0xcb, 0x2f, 0x1f, 0x66, 0xb9, 0x9b, 0x53,
-	0x2b, 0x8b, 0x8d, 0xed, 0xe8, 0x53, 0x38, 0x89, 0x47, 0xf3, 0xb8, 0x65, 0x49, 0x8b, 0xff, 0xcf,
-	0xe4, 0x5a, 0x93, 0xee, 0xdd, 0xba, 0xbd, 0xc2, 0x1e, 0xe1, 0x19, 0xe2, 0x71, 0x9d, 0x40, 0x64,
-	0xa6, 0x38, 0x23, 0xa3, 0xb6, 0xe6, 0x8b, 0x08, 0x6f, 0x8d, 0x95, 0x79, 0xb0, 0xad, 0x2e, 0x80,
-	0x81, 0x6a, 0xdf, 0x82, 0xd3, 0x07, 0x9c, 0x1e, 0x5a, 0x84, 0x89, 0x01, 0x19, 0xea, 0x62, 0x23,
-	0x96, 0x68, 0x19, 0xa6, 0xf6, 0xb1, 0x9f, 0x12, 0x99, 0xa7, 0x9b, 0xae, 0x02, 0xae, 0x8d, 0x7f,
-	0xd8, 0x68, 0xff, 0xbe, 0x01, 0x0b, 0x15, 0x5f, 0xd4, 0xec, 0xff, 0x99, 0xb9, 0xff, 0x35, 0xdc,
-	0x8c, 0xbd, 0x27, 0x38, 0xee, 0x11, 0x6e, 0x28, 0x62, 0xff, 0xa3, 0x01, 0x56, 0xe5, 0x90, 0x7e,
-	0x42, 0x79, 0xff, 0x36, 0xf5, 0x49, 0x82, 0xae, 0xc2, 0x4c, 0xac, 0x70, 0xba, 0x96, 0xbd, 0x75,
-	0xc8, 0xd9, 0x6e, 0x8f, 0xb9, 0x19, 0x35, 0xfa, 0x18, 0x9a, 0xa2, 0x31, 0xe8, 0x62, 0x8e, 0xb5,
-	0xee, 0x6b, 0x75, 0x3b, 0x85, 0x94, 0x1d, 0x4d, 0xb7, 0x3d, 0xe6, 0xe6, 0x7b, 0xd0, 0xfb, 0x30,
-	0xe5, 0xf5, 0xd3, 0x70, 0x20, 0xab, 0xd8, 0xec, 0xc6, 0xb9, 0x83, 0x36, 0xdf, 0x10, 0x44, 0xdb,
-	0x63, 0xae, 0xa2, 0xfe, 0x64, 0x1a, 0x26, 0x19, 0x8e, 0xb9, 0x7d, 0x1b, 0x96, 0xeb, 0x44, 0x88,
-	0xd2, 0xe9, 0xf5, 0x89, 0x37, 0x48, 0xd2, 0x40, 0xbb, 0x39, 0x87, 0x45, 0x71, 0x4f, 0xe8, 0x73,
-	0xe5, 0xea, 0x09, 0x57, 0xae, 0xed, 0xef, 0xc1, 0xd2, 0x88, 0x34, 0x71, 0xa8, 0x4a, 0x37, 0xc1,
-	0x61, 0x4e, 0x8b, 0xb6, 0x53, 0x38, 0xf5, 0x44, 0xfa, 0x22, 0xaf, 0x1f, 0xc7, 0xd1, 0x0c, 0xd8,
-	0xdb, 0xb0, 0x52, 0x15, 0x9b, 0xb0, 0x28, 0x4c, 0x88, 0x08, 0x7d, 0x99, 0x70, 0x29, 0xe9, 0x16,
-	0x5f, 0xa5, 0x16, 0x4d, 0xb7, 0xe6, 0x8b, 0xfd, 0x9b, 0x71, 0x58, 0x71, 0x49, 0x12, 0xf9, 0xfb,
-	0x24, 0xcb, 0x86, 0xc7, 0xd3, 0xcf, 0xfc, 0x14, 0x26, 0x30, 0x63, 0x3a, 0x4c, 0xee, 0xbc, 0xb6,
-	0x8e, 0xc1, 0x15, 0x5c, 0xd1, 0xbb, 0xb0, 0x84, 0x83, 0x5d, 0xda, 0x4b, 0xa3, 0x34, 0xc9, 0xcc,
-	0xd2, 0x8d, 0xdd, 0xe8, 0x07, 0xdb, 0x83, 0xd3, 0x23, 0x2e, 0xd0, 0xee, 0x34, 0xbb, 0xae, 0x46,
-	0xa5, 0xeb, 0xaa, 0x15, 0x32, 0x7e, 0x90, 0x90, 0x5f, 0x37, 0xa0, 0x99, 0x45, 0x15, 0xba, 0x04,
-	0x8b, 0x5e, 0x14, 0x30, 0xea, 0x93, 0x6e, 0x86, 0xd3, 0xec, 0x47, 0xf0, 0x22, 0x39, 0xc5, 0xf8,
-	0x59, 0x4e, 0xa6, 0x04, 0x98, 0x28, 0x11, 0xc3, 0x0c, 0xf3, 0xbe, 0x36, 0x50, 0xae, 0x05, 0xce,
-	0xa7, 0xa1, 0x6a, 0x5a, 0xa7, 0x5c, 0xb9, 0xb6, 0x3f, 0x87, 0xb9, 0x9b, 0x84, 0x91, 0xb0, 0x4b,
-	0x42, 0x8f, 0x92, 0x44, 0xd2, 0x44, 0xde, 0x40, 0x4b, 0x96, 0x6b, 0x81, 0xeb, 0x12, 0x96, 0x68,
-	0x31, 0x72, 0x8d, 0x6c, 0x98, 0x13, 0x37, 0x9c, 0xc6, 0xb2, 0x73, 0x49, 0xb4, 0x9c, 0x12, 0xce,
-	0x4e, 0x4a, 0xdd, 0x78, 0xde, 0x16, 0xac, 0x02, 0x60, 0xc6, 0xb2, 0xce, 0x42, 0x09, 0x32, 0x30,
-	0xe8, 0x3a, 0xcc, 0x75, 0x0d, 0x95, 0x74, 0x38, 0x58, 0xe6, 0xc5, 0x37, 0x55, 0x76, 0x4b, 0xd4,
-	0xf6, 0xd7, 0x13, 0xb0, 0x58, 0xa4, 0x23, 0x7d, 0x64, 0x1b, 0xd0, 0x0a, 0x34, 0x2e, 0xb1, 0x1a,
-	0xb2, 0x36, 0x2d, 0xd7, 0xe6, 0xaf, 0x82, 0xac, 0xdc, 0xea, 0x8e, 0x57, 0x5b, 0xdd, 0x15, 0x98,
-	0x56, 0x03, 0x96, 0xb6, 0x5c, 0x43, 0xa5, 0xe0, 0x98, 0xac, 0x04, 0xc7, 0x2a, 0x40, 0x92, 0x57,
-	0x0a, 0x6b, 0x5a, 0x19, 0x5e, 0x60, 0x84, 0x4f, 0x55, 0x63, 0xe4, 0x92, 0x24, 0xf5, 0xb9, 0x35,
-	0xa3, 0x7c, 0x6a, 0xe2, 0xd0, 0x3b, 0x30, 0xef, 0x45, 0x41, 0x40, 0xf9, 0x0e, 0x49, 0x12, 0xdc,
-	0xcb, 0x9a, 0xf0, 0x32, 0x52, 0x70, 0x52, 0x88, 0xcd, 0x94, 0xf7, 0xa3, 0xd8, 0x6a, 0x29, 0x4e,
-	0x26, 0x0e, 0xdd, 0x05, 0x50, 0xf0, 0x4d, 0xcc, 0xb3, 0x2e, 0xfd, 0x92, 0xa3, 0x26, 0x3c, 0xc7,
-	0x9c, 0xf0, 0x8a, 0x8b, 0x26, 0x92, 0xb2, 0xb3, 0xbf, 0xee, 0x3c, 0xa1, 0x01, 0x71, 0x8d, 0xdd,
-	0x95, 0x7a, 0x9d, 0xf7, 0x84, 0xb3, 0x87, 0xd6, 0xeb, 0x8c, 0xcc, 0xad, 0xdb, 0x6b, 0x47, 0xb0,
-	0x70, 0x9f, 0x8a, 0x23, 0xdc, 0x4b, 0x8e, 0x27, 0x7f, 0x7e, 0x00, 0x93, 0x42, 0x98, 0x38, 0xc1,
-	0xdd, 0x18, 0x87, 0x5e, 0x9f, 0xa8, 0x50, 0x69, 0xb9, 0x39, 0x2c, 0x6e, 0x02, 0xc7, 0x3d, 0x11,
-	0x92, 0x02, 0x2f, 0xd7, 0xf6, 0x5f, 0xc6, 0x95, 0xa6, 0x9b, 0x8c, 0x25, 0xdf, 0xfd, 0xd8, 0x57,
-	0xdf, 0x88, 0x4e, 0x8c, 0x36, 0xa2, 0x15, 0x95, 0xbf, 0x4d, 0x23, 0xfa, 0x9a, 0x3a, 0x1f, 0x3b,
-	0x85, 0x99, 0x4d, 0xc6, 0x84, 0x22, 0x68, 0x1d, 0x26, 0x31, 0x63, 0xd9, 0xdd, 0x3c, 0x57, 0x89,
-	0x18, 0x41, 0x22, 0xfe, 0xd7, 0x2a, 0x49, 0xd2, 0xf6, 0x55, 0x68, 0xe5, 0xa8, 0x97, 0x89, 0x6d,
-	0x99, 0x62, 0xd7, 0x00, 0xd4, 0xa4, 0x75, 0x27, 0xdc, 0x8b, 0xf2, 0x49, 0xbe, 0x61, 0x4c, 0xf2,
-	0xd7, 0x32, 0x0a, 0xa9, 0xdb, 0xbb, 0x30, 0x45, 0x39, 0x09, 0x32, 0xe5, 0x56, 0x4c, 0xe5, 0x0a,
-	0x46, 0xae, 0x22, 0xb2, 0xff, 0xd6, 0x84, 0x33, 0xe2, 0xc4, 0x1e, 0xcb, 0x7c, 0xb0, 0xc9, 0xd8,
-	0x4d, 0xc2, 0x31, 0xf5, 0x93, 0x4f, 0x53, 0x12, 0x0f, 0xdf, 0x70, 0x60, 0xf4, 0x60, 0x5a, 0xa5,
-	0x13, 0x9d, 0x33, 0x5f, 0xfb, 0xd0, 0xad, 0xd9, 0x17, 0x93, 0xf6, 0xc4, 0x9b, 0x99, 0xb4, 0xeb,
-	0x26, 0xdf, 0xc9, 0x63, 0x9a, 0x7c, 0x0f, 0x7e, 0xfc, 0x30, 0x9e, 0x54, 0xa6, 0xcb, 0x4f, 0x2a,
-	0x35, 0x03, 0xe5, 0xcc, 0xab, 0x0e, 0x94, 0xcd, 0xda, 0x81, 0x32, 0xa8, 0xbd, 0xc7, 0x2d, 0xe9,
-	0xee, 0x1f, 0x98, 0x11, 0x78, 0x60, 0xac, 0x1d, 0x65, 0xb4, 0x84, 0x37, 0x3a, 0x5a, 0xfe, 0xa8,
-	0x34, 0x2a, 0xaa, 0xc7, 0x9a, 0xf7, 0x5f, 0xcd, 0xa6, 0x43, 0x86, 0xc6, 0xff, 0xb9, 0x79, 0xec,
-	0x77, 0xb2, 0x0d, 0x67, 0x51, 0xe1, 0x83, 0xbc, 0x9f, 0x11, 0x75, 0x48, 0xf4, 0x10, 0x3a, 0x69,
-	0x89, 0x35, 0xba, 0x0c, 0x93, 0xc2, 0xc9, 0x7a, 0x4e, 0x3a, 0x6d, 0xfa, 0x53, 0x9c, 0xc4, 0x26,
-	0x63, 0x8f, 0x19, 0xf1, 0x5c, 0x49, 0x84, 0xae, 0x41, 0x2b, 0x0f, 0x7c, 0x7d, 0xb3, 0xce, 0x9a,
-	0x3b, 0xf2, 0x7b, 0x92, 0x6d, 0x2b, 0xc8, 0xc5, 0xde, 0x2e, 0x8d, 0x89, 0x27, 0xa7, 0x88, 0xa9,
-	0xd1, 0xbd, 0x37, 0xb3, 0x8f, 0xf9, 0xde, 0x9c, 0x1c, 0xad, 0xc3, 0xb4, 0x7a, 0xdd, 0x92, 0x37,
-	0x68, 0x76, 0xe3, 0xcc, 0x68, 0x32, 0xcd, 0x76, 0x69, 0x42, 0xfb, 0xeb, 0x06, 0xbc, 0x5d, 0x04,
-	0x44, 0x76, 0x9b, 0xb2, 0x41, 0xee, 0xbb, 0xaf, 0xb8, 0x17, 0xe0, 0x84, 0x9c, 0x1c, 0x8b, 0x47,
-	0x2e, 0xf5, 0xde, 0x5a, 0xc1, 0xda, 0x7f, 0x6e, 0xc0, 0xf9, 0x51, 0x3b, 0x6e, 0xf4, 0x71, 0xcc,
-	0xf3, 0xe3, 0x3d, 0x0e, 0x5b, 0xb2, 0x82, 0x37, 0x5e, 0x14, 0xbc, 0x92, 0x7d, 0x13, 0x65, 0xfb,
-	0xec, 0xbf, 0x8e, 0xc3, 0xac, 0x11, 0x40, 0x75, 0x05, 0x53, 0x74, 0xb6, 0x32, 0x6e, 0xe5, 0x5b,
-	0x81, 0x2c, 0x0a, 0x2d, 0xd7, 0xc0, 0xa0, 0x01, 0x00, 0xc3, 0x31, 0x0e, 0x08, 0x27, 0xb1, 0xc8,
-	0xe4, 0xe2, 0xc6, 0xdf, 0x3b, 0x7a, 0x76, 0x79, 0x94, 0xf1, 0x74, 0x0d, 0xf6, 0xa2, 0x35, 0x97,
-	0xa2, 0x13, 0x9d, 0xbf, 0x35, 0x84, 0x9e, 0xc1, 0x89, 0x3d, 0xea, 0x93, 0x47, 0x85, 0x22, 0xd3,
-	0x52, 0x91, 0x87, 0x47, 0x57, 0xe4, 0xb6, 0xc9, 0xd7, 0xad, 0x88, 0xb1, 0x2f, 0xc1, 0x62, 0xf5,
-	0x3e, 0x09, 0x25, 0x69, 0x80, 0x7b, 0xb9, 0xb7, 0x34, 0x64, 0x23, 0x58, 0xac, 0xde, 0x1f, 0xfb,
-	0x9f, 0xe3, 0x70, 0x2a, 0x67, 0xb7, 0x19, 0x86, 0x51, 0x1a, 0x7a, 0x72, 0xc4, 0xaa, 0x3d, 0x8b,
-	0x65, 0x98, 0xe2, 0x94, 0xfb, 0x79, 0xe3, 0x23, 0x01, 0x51, 0xbb, 0x78, 0x14, 0xf9, 0x9c, 0x32,
-	0x7d, 0xc0, 0x19, 0xa8, 0xce, 0x5e, 0x4e, 0x6d, 0x5d, 0x99, 0x09, 0x9a, 0x6e, 0x0e, 0x8b, 0x6f,
-	0xa2, 0xab, 0x91, 0xf3, 0x8a, 0x72, 0x66, 0x0e, 0xcb, 0xb8, 0x8f, 0x7c, 0x9f, 0x78, 0xc2, 0x1d,
-	0xc6, 0x44, 0x53, 0xc1, 0xca, 0x49, 0x89, 0xc7, 0x34, 0xec, 0xe9, 0x79, 0x46, 0x43, 0x42, 0x4f,
-	0x1c, 0xc7, 0x78, 0x68, 0x35, 0xa5, 0x03, 0x14, 0x80, 0xae, 0xc3, 0x44, 0x80, 0x99, 0x2e, 0x74,
-	0x97, 0x4a, 0xd9, 0xa1, 0xce, 0x03, 0xce, 0x0e, 0x66, 0xaa, 0x12, 0x88, 0x6d, 0xed, 0x0f, 0xc4,
-	0x3c, 0xcd, 0xbe, 0x7d, 0x4b, 0xf8, 0x05, 0xcc, 0x97, 0x92, 0x0f, 0xfa, 0x0c, 0x56, 0x8a, 0x88,
-	0x32, 0x05, 0xea, 0x26, 0xf0, 0xed, 0x97, 0x6a, 0xe6, 0x1e, 0xc0, 0xc0, 0xfe, 0x12, 0x96, 0x44,
-	0xc8, 0xc8, 0x8b, 0x7f, 0x4c, 0xa3, 0xcd, 0x47, 0xd0, 0xca, 0x45, 0xd6, 0xc6, 0x4c, 0x1b, 0x9a,
-	0xfb, 0xd9, 0xd0, 0xa6, 0x66, 0x9b, 0x1c, 0xb6, 0x37, 0x01, 0x99, 0xfa, 0xea, 0x0a, 0x74, 0xb9,
-	0xdc, 0x14, 0x9f, 0xaa, 0x96, 0x1b, 0x49, 0x9e, 0xf5, 0xc4, 0x7f, 0x18, 0x87, 0x85, 0x2d, 0x2a,
-	0x1f, 0xce, 0x8e, 0x29, 0xc9, 0x5d, 0x82, 0xc5, 0x24, 0xdd, 0x0d, 0xa2, 0x6e, 0xea, 0x13, 0xdd,
-	0x14, 0xe8, 0x4a, 0x3f, 0x82, 0x3f, 0x2c, 0xf9, 0xe5, 0xcf, 0x28, 0x93, 0xc6, 0x33, 0xca, 0x75,
-	0x38, 0xf3, 0x80, 0x3c, 0xd3, 0xf6, 0x6c, 0xf9, 0xd1, 0xee, 0x2e, 0x0d, 0x7b, 0x99, 0x90, 0x29,
-	0x29, 0xe4, 0x60, 0x02, 0xfb, 0xb7, 0x0d, 0x58, 0x2c, 0x7c, 0xa1, 0xbd, 0x79, 0x55, 0x45, 0xbd,
-	0xf2, 0xe5, 0x79, 0xd3, 0x97, 0x55, 0xd2, 0xff, 0x3c, 0xe0, 0xe7, 0xcc, 0x80, 0xff, 0xaa, 0x01,
-	0xa7, 0xb6, 0x28, 0xcf, 0x52, 0x0d, 0xfd, 0x2f, 0x3b, 0x17, 0xdb, 0x81, 0x95, 0xaa, 0xfa, 0xda,
-	0x95, 0xcb, 0x30, 0x25, 0x4e, 0x29, 0x9b, 0xdd, 0x15, 0xb0, 0xf1, 0x4d, 0x0b, 0x96, 0x8a, 0xe2,
-	0x2b, 0xfe, 0xa5, 0x1e, 0x41, 0x0f, 0x61, 0x71, 0x4b, 0xff, 0x79, 0x39, 0x7f, 0x38, 0x3b, 0xec,
-	0x5d, 0xbb, 0x7d, 0xb6, 0xfe, 0xa3, 0x12, 0x6d, 0x8f, 0x21, 0x0f, 0xce, 0x54, 0x19, 0x16, 0x4f,
-	0xe8, 0xef, 0x1c, 0xc2, 0x39, 0xa7, 0x7a, 0x99, 0x88, 0x8b, 0x0d, 0xf4, 0x19, 0x9c, 0x28, 0x3f,
-	0xf4, 0xa2, 0x52, 0x36, 0xaa, 0x7d, 0x7b, 0x6e, 0xdb, 0x87, 0x91, 0xe4, 0xfa, 0x3f, 0x15, 0xad,
-	0x6f, 0xe9, 0xd5, 0x13, 0xd9, 0xe5, 0xc6, 0xbc, 0xee, 0x55, 0xb8, 0xfd, 0xff, 0x87, 0xd2, 0xe4,
-	0xdc, 0x3f, 0x82, 0x66, 0xf6, 0xa4, 0x53, 0x76, 0x73, 0xe5, 0xa1, 0xa7, 0xbd, 0x58, 0xe6, 0xb7,
-	0x97, 0xd8, 0x63, 0xe8, 0x63, 0xb5, 0x59, 0x8c, 0xfc, 0xa3, 0x9b, 0x8d, 0x87, 0x8c, 0xf6, 0xc9,
-	0x9a, 0xc7, 0x03, 0x7b, 0x0c, 0xfd, 0x10, 0x66, 0xc5, 0xea, 0x91, 0xfe, 0xdb, 0xea, 0x8a, 0xa3,
-	0x7e, 0x47, 0xe0, 0x64, 0xbf, 0x23, 0x70, 0x6e, 0x05, 0x8c, 0x0f, 0xdb, 0x35, 0xd3, 0xbd, 0x66,
-	0xf0, 0x14, 0xe6, 0xb7, 0x08, 0x2f, 0x9a, 0x71, 0x74, 0xfe, 0x95, 0x46, 0x96, 0xb6, 0x5d, 0x25,
-	0x1b, 0xed, 0xe7, 0xed, 0x31, 0xf4, 0xc7, 0x06, 0x9c, 0xdc, 0x22, 0xbc, 0xda, 0xde, 0xa2, 0xf7,
-	0xea, 0x85, 0x1c, 0xd0, 0x06, 0xb7, 0x1f, 0x1c, 0xf5, 0xbe, 0x96, 0xd9, 0xda, 0x63, 0xe8, 0x4f,
-	0x0d, 0x38, 0x6d, 0x28, 0x66, 0xf6, 0xab, 0x68, 0xfd, 0x70, 0xe5, 0x6a, 0x7a, 0xdb, 0xf6, 0xdd,
-	0x23, 0xfe, 0xc9, 0xdc, 0x60, 0x69, 0x8f, 0xa1, 0x47, 0xf2, 0x4c, 0x8a, 0xf2, 0x84, 0xce, 0xd5,
-	0xd6, 0xa1, 0x5c, 0xfa, 0xea, 0x41, 0x9f, 0xf3, 0x73, 0xb8, 0x0b, 0xb3, 0x5b, 0x84, 0x67, 0x59,
-	0xb7, 0x1c, 0x69, 0x95, 0x12, 0x56, 0xbe, 0xaa, 0xd5, 0x44, 0x2d, 0x23, 0x66, 0x49, 0xf1, 0x32,
-	0xf2, 0x54, 0xf9, 0xae, 0xd6, 0xa6, 0xe0, 0x72, 0xc4, 0xd4, 0xa7, 0x39, 0x7b, 0xec, 0x93, 0xcd,
-	0xbf, 0xbf, 0x58, 0x6d, 0x7c, 0xf3, 0x62, 0xb5, 0xf1, 0xaf, 0x17, 0xab, 0x8d, 0xcf, 0xaf, 0xbc,
-	0xe4, 0x47, 0x36, 0xc6, 0x2f, 0x82, 0x30, 0xa3, 0x9e, 0x4f, 0x49, 0xc8, 0x77, 0xa7, 0x65, 0xf0,
-	0x5f, 0xf9, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x13, 0xd6, 0xef, 0x1d, 0x30, 0x24, 0x00, 0x00,
+	// 2382 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x1a, 0xdb, 0x6e, 0xdc, 0xc6,
+	0x55, 0xab, 0xeb, 0xee, 0x91, 0x64, 0x49, 0x63, 0x59, 0xa6, 0x37, 0xb6, 0xaa, 0xb0, 0xb1, 0xe1,
+	0xda, 0x09, 0x17, 0x92, 0x9b, 0x38, 0x70, 0xdc, 0x14, 0x8a, 0x2f, 0x92, 0x2f, 0xb2, 0x1d, 0xda,
+	0x6d, 0x91, 0xd4, 0x6d, 0x31, 0xe2, 0x8e, 0x76, 0x27, 0xcb, 0xcb, 0x84, 0x1c, 0xca, 0x58, 0x03,
+	0x05, 0x5a, 0xb4, 0x28, 0xd0, 0x1f, 0xe8, 0x43, 0xff, 0xa3, 0xe8, 0x53, 0xd0, 0xa7, 0xa0, 0x7d,
+	0x0c, 0xfa, 0x03, 0x2d, 0xfc, 0x25, 0xc5, 0x5c, 0x48, 0x0e, 0xb9, 0x94, 0xec, 0x54, 0xb6, 0x82,
+	0xf6, 0xc5, 0x9e, 0x39, 0x3c, 0xf7, 0x39, 0x73, 0x2e, 0xa3, 0x85, 0x0b, 0x31, 0x61, 0x51, 0x42,
+	0xe2, 0x7d, 0x12, 0x77, 0xe4, 0x92, 0xf2, 0x28, 0x1e, 0x1a, 0x4b, 0x87, 0xc5, 0x11, 0x8f, 0x10,
+	0x14, 0x90, 0xb6, 0x3d, 0xf8, 0x30, 0x71, 0x68, 0xd4, 0xc1, 0x8c, 0x76, 0xbc, 0x28, 0x26, 0x9d,
+	0xfd, 0xf5, 0x4e, 0x8f, 0x84, 0x24, 0xc6, 0x9c, 0x74, 0x15, 0x7e, 0xfb, 0x87, 0x05, 0x4e, 0x80,
+	0xbd, 0x3e, 0x0d, 0x49, 0x3c, 0xec, 0xb0, 0x41, 0x4f, 0x00, 0x92, 0x4e, 0x40, 0x38, 0xae, 0xa3,
+	0xba, 0xdf, 0xa3, 0xbc, 0x9f, 0xee, 0x3a, 0x5e, 0x14, 0x74, 0x70, 0xdc, 0x8b, 0x58, 0x1c, 0x7d,
+	0x21, 0x17, 0xef, 0x79, 0xdd, 0xce, 0xfe, 0x46, 0xc1, 0x00, 0x33, 0xe6, 0x53, 0x0f, 0x73, 0x1a,
+	0x85, 0x9d, 0xfd, 0x75, 0xec, 0xb3, 0x3e, 0x1e, 0xe5, 0xf6, 0x56, 0x2f, 0x8a, 0x7a, 0x3e, 0xe9,
+	0xc8, 0xdd, 0x6e, 0xba, 0xd7, 0x21, 0x01, 0xe3, 0xda, 0x20, 0x1b, 0xc3, 0xc9, 0xcd, 0x82, 0xc9,
+	0x9d, 0x2e, 0x09, 0x39, 0xe5, 0x43, 0x64, 0xc1, 0x8c, 0xe7, 0xa7, 0x09, 0x27, 0xb1, 0xd5, 0x58,
+	0x6b, 0x5c, 0x6c, 0xb9, 0xd9, 0x16, 0x9d, 0x85, 0x56, 0x88, 0x03, 0x92, 0x30, 0xec, 0x11, 0x6b,
+	0x5c, 0x7e, 0x2b, 0x00, 0x08, 0xc1, 0xa4, 0xd8, 0x58, 0x13, 0xf2, 0x83, 0x5c, 0xdb, 0x5f, 0xcd,
+	0xc3, 0xc2, 0x0e, 0x0e, 0xe9, 0x1e, 0x49, 0xb8, 0x4b, 0xbe, 0x4c, 0x49, 0xc2, 0xd1, 0x53, 0x98,
+	0x14, 0x9e, 0x94, 0xcc, 0x67, 0x37, 0xb6, 0x9d, 0xc2, 0x60, 0x27, 0x33, 0x58, 0x2e, 0x7e, 0xe5,
+	0x75, 0x9d, 0xfd, 0x0d, 0x87, 0x0d, 0x7a, 0x8e, 0x30, 0xd8, 0x31, 0x0c, 0x76, 0x32, 0x83, 0x1d,
+	0x37, 0x3f, 0x13, 0x57, 0x72, 0x45, 0x6d, 0x68, 0xc6, 0x64, 0x9f, 0x26, 0x34, 0x0a, 0xb5, 0x8a,
+	0xf9, 0x5e, 0x58, 0x16, 0x46, 0x37, 0xb0, 0xd7, 0x57, 0x4a, 0x36, 0xdd, 0x6c, 0x8b, 0xd6, 0x60,
+	0x16, 0x33, 0x76, 0x1f, 0xef, 0x12, 0xff, 0x1e, 0x19, 0x5a, 0x93, 0x92, 0xd0, 0x04, 0x09, 0x5a,
+	0xcc, 0xd8, 0x03, 0x61, 0xe0, 0x94, 0xf2, 0x8a, 0xde, 0x96, 0xbd, 0xd2, 0xac, 0x7a, 0xe5, 0xd7,
+	0xb0, 0x64, 0x28, 0xfe, 0x38, 0x4a, 0x63, 0x8f, 0x58, 0x20, 0x4d, 0x7f, 0x78, 0x34, 0xd3, 0x37,
+	0xab, 0x6c, 0xdd, 0x51, 0x49, 0xe8, 0x97, 0x30, 0x25, 0xc3, 0xd6, 0x9a, 0x5d, 0x9b, 0x78, 0xad,
+	0xde, 0x56, 0x6c, 0x51, 0x08, 0x33, 0xcc, 0x4f, 0x7b, 0x34, 0x4c, 0xac, 0x39, 0x29, 0xe1, 0xc9,
+	0xd1, 0x24, 0xdc, 0x88, 0xc2, 0x3d, 0xda, 0xdb, 0xc1, 0x21, 0xee, 0x91, 0x80, 0x84, 0xfc, 0x91,
+	0x64, 0xee, 0x66, 0x42, 0xd0, 0x73, 0x58, 0x1c, 0xa4, 0x09, 0x8f, 0x02, 0xfa, 0x9c, 0x3c, 0x64,
+	0x82, 0x36, 0xb1, 0xe6, 0xa5, 0x37, 0x1f, 0x1c, 0x4d, 0xf0, 0xbd, 0x0a, 0x57, 0x77, 0x44, 0x8e,
+	0x08, 0x92, 0x41, 0xba, 0x4b, 0x7e, 0x4a, 0x62, 0x19, 0x5d, 0x27, 0x54, 0x90, 0x18, 0x20, 0x15,
+	0x46, 0x54, 0xef, 0x12, 0x6b, 0x61, 0x6d, 0x42, 0x85, 0x51, 0x0e, 0x42, 0x17, 0x61, 0x61, 0x9f,
+	0xc4, 0x74, 0x6f, 0xf8, 0x98, 0xf6, 0x42, 0xcc, 0xd3, 0x98, 0x58, 0x8b, 0x32, 0x14, 0xab, 0x60,
+	0x14, 0xc0, 0x7c, 0x9f, 0xf8, 0x81, 0x70, 0xf9, 0x8d, 0x98, 0x74, 0x13, 0x6b, 0x49, 0xfa, 0x77,
+	0xeb, 0xe8, 0x27, 0x28, 0xd9, 0xb9, 0x65, 0xee, 0x42, 0xb1, 0x30, 0x72, 0xf5, 0x4d, 0x51, 0x77,
+	0x04, 0x29, 0xc5, 0x2a, 0x60, 0x74, 0x01, 0x4e, 0xf0, 0x18, 0x7b, 0x03, 0x1a, 0xf6, 0x76, 0x08,
+	0xef, 0x47, 0x5d, 0xeb, 0xa4, 0xf4, 0x44, 0x05, 0x8a, 0x3c, 0x40, 0x24, 0xc4, 0xbb, 0x3e, 0xe9,
+	0xaa, 0x58, 0x7c, 0x32, 0x64, 0x24, 0xb1, 0x96, 0xa5, 0x15, 0x57, 0x1c, 0x23, 0xbd, 0x56, 0x12,
+	0x84, 0x73, 0x6b, 0x84, 0xea, 0x56, 0xc8, 0xe3, 0xa1, 0x5b, 0xc3, 0x0e, 0x0d, 0x60, 0x56, 0xd8,
+	0x91, 0x85, 0xc2, 0x29, 0x19, 0x0a, 0x77, 0x8e, 0xe6, 0xa3, 0xed, 0x82, 0xa1, 0x6b, 0x72, 0x47,
+	0x0e, 0xa0, 0x3e, 0x4e, 0x76, 0x52, 0x9f, 0x53, 0xe6, 0x13, 0xa5, 0x46, 0x62, 0xad, 0x48, 0x37,
+	0xd5, 0x7c, 0x41, 0xf7, 0x00, 0x62, 0xb2, 0x97, 0xe1, 0x9d, 0x96, 0x96, 0x5f, 0x3e, 0xcc, 0x72,
+	0x37, 0xc7, 0x56, 0x16, 0x1b, 0xe4, 0xe8, 0x53, 0x38, 0x89, 0x47, 0xb3, 0xb5, 0x65, 0x49, 0x8b,
+	0xbf, 0x67, 0x72, 0xad, 0x49, 0xea, 0x6e, 0x1d, 0xad, 0xb0, 0x47, 0x78, 0x86, 0x78, 0x5c, 0x27,
+	0x10, 0x99, 0x29, 0xce, 0xc8, 0xa8, 0xad, 0xf9, 0x22, 0xc2, 0x5b, 0x43, 0x65, 0x1e, 0x6c, 0xab,
+	0x0b, 0x60, 0x80, 0xda, 0xb7, 0xe0, 0xf4, 0x01, 0xa7, 0x87, 0x16, 0x61, 0x62, 0x40, 0x86, 0xba,
+	0xa4, 0x88, 0x25, 0x5a, 0x86, 0xa9, 0x7d, 0xec, 0xa7, 0xaa, 0x94, 0x34, 0x5d, 0xb5, 0xb9, 0x36,
+	0xfe, 0x61, 0xa3, 0xfd, 0x87, 0x06, 0x2c, 0x54, 0x7c, 0x51, 0x43, 0xff, 0x0b, 0x93, 0xfe, 0x35,
+	0xdc, 0x8c, 0xbd, 0x27, 0x38, 0xee, 0x11, 0x6e, 0x28, 0x62, 0xff, 0xb3, 0x01, 0x56, 0xe5, 0x90,
+	0x7e, 0x46, 0x79, 0xff, 0x36, 0xf5, 0x49, 0x82, 0xae, 0xc2, 0x4c, 0xac, 0x60, 0xba, 0x96, 0xbd,
+	0x75, 0xc8, 0xd9, 0x6e, 0x8f, 0xb9, 0x19, 0x36, 0xfa, 0x18, 0x9a, 0xa2, 0xfc, 0x77, 0x31, 0xc7,
+	0x5a, 0xf7, 0xb5, 0x3a, 0x4a, 0x21, 0x65, 0x47, 0xe3, 0x6d, 0x8f, 0xb9, 0x39, 0x0d, 0x7a, 0x1f,
+	0xa6, 0xbc, 0x7e, 0x1a, 0x0e, 0x64, 0x15, 0x9b, 0xdd, 0x38, 0x77, 0x10, 0xf1, 0x0d, 0x81, 0xb4,
+	0x3d, 0xe6, 0x2a, 0xec, 0x4f, 0xa6, 0x61, 0x92, 0xe1, 0x98, 0xdb, 0xb7, 0x61, 0xb9, 0x4e, 0x84,
+	0x28, 0x9d, 0x5e, 0x9f, 0x78, 0x83, 0x24, 0x0d, 0xb4, 0x9b, 0xf3, 0xbd, 0x28, 0xee, 0x09, 0x7d,
+	0xae, 0x5c, 0x3d, 0xe1, 0xca, 0xb5, 0xfd, 0x03, 0x58, 0x1a, 0x91, 0x26, 0x0e, 0x55, 0xe9, 0x26,
+	0x38, 0xcc, 0x69, 0xd1, 0x76, 0x0a, 0xa7, 0x9e, 0x48, 0x5f, 0xe4, 0xf5, 0xe3, 0x38, 0x9a, 0x01,
+	0x7b, 0x1b, 0x56, 0xaa, 0x62, 0x13, 0x16, 0x85, 0x09, 0x11, 0xa1, 0x2f, 0x13, 0x2e, 0x25, 0xdd,
+	0xe2, 0xab, 0xd4, 0xa2, 0xe9, 0xd6, 0x7c, 0xb1, 0x7f, 0x3b, 0x0e, 0x2b, 0x2e, 0x49, 0x22, 0x7f,
+	0x9f, 0x64, 0xd9, 0xf0, 0x78, 0xfa, 0x99, 0x9f, 0xc3, 0x04, 0x66, 0x4c, 0x87, 0xc9, 0x9d, 0xd7,
+	0xd6, 0x31, 0xb8, 0x82, 0x2b, 0x7a, 0x17, 0x96, 0x70, 0xb0, 0x4b, 0x7b, 0x69, 0x94, 0x26, 0x99,
+	0x59, 0xba, 0x7f, 0x1b, 0xfd, 0x60, 0x7b, 0x70, 0x7a, 0xc4, 0x05, 0xda, 0x9d, 0x66, 0xd7, 0xd5,
+	0xa8, 0x74, 0x5d, 0xb5, 0x42, 0xc6, 0x0f, 0x12, 0xf2, 0x9b, 0x06, 0x34, 0xb3, 0xa8, 0x42, 0x97,
+	0x60, 0xd1, 0x8b, 0x02, 0x46, 0x7d, 0xd2, 0xcd, 0x60, 0x9a, 0xfd, 0x08, 0x5c, 0x24, 0xa7, 0x18,
+	0x3f, 0xcb, 0xd1, 0x94, 0x00, 0x13, 0x24, 0x62, 0x98, 0x61, 0xde, 0xcf, 0x1a, 0x54, 0xb1, 0x16,
+	0x30, 0x9f, 0x86, 0x44, 0x76, 0x7c, 0x53, 0xae, 0x5c, 0xdb, 0x9f, 0xc3, 0xdc, 0x4d, 0xc2, 0x48,
+	0xd8, 0x25, 0xa1, 0x47, 0x49, 0x22, 0x71, 0x22, 0x6f, 0xa0, 0x25, 0xcb, 0xb5, 0x80, 0x75, 0x09,
+	0x4b, 0xb4, 0x18, 0xb9, 0x46, 0x36, 0xcc, 0x89, 0x1b, 0x4e, 0x63, 0xd9, 0xb9, 0x24, 0x5a, 0x4e,
+	0x09, 0x66, 0x27, 0xa5, 0x9e, 0x3b, 0x6f, 0x0b, 0x56, 0x01, 0x30, 0x63, 0x59, 0x67, 0xa1, 0x04,
+	0x19, 0x10, 0x74, 0x1d, 0xe6, 0xba, 0x86, 0x4a, 0x3a, 0x1c, 0x2c, 0xf3, 0xe2, 0x9b, 0x2a, 0xbb,
+	0x25, 0x6c, 0xfb, 0xeb, 0x09, 0x58, 0x2c, 0xd2, 0x91, 0x3e, 0xb2, 0x0d, 0x68, 0x05, 0x1a, 0x96,
+	0x58, 0x0d, 0x59, 0x9b, 0x96, 0x6b, 0xf3, 0x57, 0x81, 0xf6, 0x92, 0x01, 0x60, 0x05, 0xa6, 0xd5,
+	0x18, 0xa5, 0x2d, 0xd7, 0xbb, 0x52, 0x70, 0x4c, 0x56, 0x82, 0x63, 0x15, 0x20, 0xc9, 0x2b, 0x85,
+	0x35, 0xad, 0x0c, 0x2f, 0x20, 0xc2, 0xa7, 0xaa, 0x31, 0x72, 0x49, 0x92, 0xfa, 0xdc, 0x9a, 0x51,
+	0x3e, 0x35, 0x61, 0xe8, 0x1d, 0x98, 0xf7, 0xa2, 0x20, 0xa0, 0x7c, 0x87, 0x24, 0x09, 0xee, 0x65,
+	0x4d, 0x78, 0x19, 0x28, 0x38, 0x29, 0xc0, 0x66, 0xca, 0xfb, 0x51, 0x6c, 0xb5, 0x14, 0x27, 0x13,
+	0x86, 0xee, 0x02, 0xa8, 0xfd, 0x4d, 0xcc, 0xb3, 0x2e, 0xfd, 0x92, 0xa3, 0xe6, 0x38, 0xc7, 0x9c,
+	0xe3, 0x8a, 0x8b, 0x26, 0x92, 0xb2, 0xb3, 0xbf, 0xee, 0x3c, 0xa1, 0x01, 0x71, 0x0d, 0xea, 0x4a,
+	0xbd, 0xce, 0x7b, 0xc2, 0xd9, 0x43, 0xeb, 0x75, 0x86, 0xe6, 0xd6, 0xd1, 0xda, 0x11, 0x2c, 0xdc,
+	0xa7, 0xe2, 0x08, 0xf7, 0x92, 0xe3, 0xc9, 0x9f, 0x1f, 0xc0, 0xa4, 0x10, 0x26, 0x4e, 0x70, 0x37,
+	0xc6, 0xa1, 0xd7, 0x27, 0x2a, 0x54, 0x5a, 0x6e, 0xbe, 0x17, 0x37, 0x81, 0xe3, 0x9e, 0x08, 0x49,
+	0x01, 0x97, 0x6b, 0xfb, 0xaf, 0xe3, 0x4a, 0xd3, 0x4d, 0xc6, 0x92, 0xef, 0x7e, 0xec, 0xab, 0x6f,
+	0x44, 0x27, 0x46, 0x1b, 0xd1, 0x8a, 0xca, 0xdf, 0xa6, 0x11, 0x7d, 0x4d, 0x9d, 0x8f, 0x9d, 0xc2,
+	0xcc, 0x26, 0x63, 0x42, 0x11, 0xb4, 0x0e, 0x93, 0x98, 0xb1, 0xec, 0x6e, 0x9e, 0xab, 0x44, 0x8c,
+	0x40, 0x11, 0xff, 0x6b, 0x95, 0x24, 0x6a, 0xfb, 0x2a, 0xb4, 0x72, 0xd0, 0xcb, 0xc4, 0xb6, 0x4c,
+	0xb1, 0x6b, 0x00, 0x6a, 0xd2, 0xba, 0x13, 0xee, 0x45, 0xf9, 0x24, 0xdf, 0x30, 0x26, 0xf9, 0x6b,
+	0x19, 0x86, 0xd4, 0xed, 0x5d, 0x98, 0xa2, 0x9c, 0x04, 0x99, 0x72, 0x2b, 0xa6, 0x72, 0x05, 0x23,
+	0x57, 0x21, 0xd9, 0x7f, 0x6f, 0xc2, 0x19, 0x71, 0x62, 0x8f, 0x65, 0x3e, 0xd8, 0x64, 0xec, 0x26,
+	0xe1, 0x98, 0xfa, 0xc9, 0xa7, 0x29, 0x89, 0x87, 0x6f, 0x38, 0x30, 0x7a, 0x30, 0xad, 0xd2, 0x89,
+	0xce, 0x99, 0xaf, 0x7d, 0xe8, 0xd6, 0xec, 0x8b, 0x49, 0x7b, 0xe2, 0xcd, 0x4c, 0xda, 0x75, 0x93,
+	0xef, 0xe4, 0x31, 0x4d, 0xbe, 0x07, 0x3f, 0x7e, 0x18, 0x4f, 0x2a, 0xd3, 0xe5, 0x27, 0x95, 0x9a,
+	0x81, 0x72, 0xe6, 0x55, 0x07, 0xca, 0x66, 0xed, 0x40, 0x19, 0xd4, 0xde, 0xe3, 0x96, 0x74, 0xf7,
+	0x8f, 0xcc, 0x08, 0x3c, 0x30, 0xd6, 0x8e, 0x32, 0x5a, 0xc2, 0x1b, 0x1d, 0x2d, 0x7f, 0x52, 0x1a,
+	0x15, 0xd5, 0x63, 0xcd, 0xfb, 0xaf, 0x66, 0xd3, 0x21, 0x43, 0xe3, 0xff, 0xdd, 0x3c, 0xf6, 0x7b,
+	0xd9, 0x86, 0xb3, 0xa8, 0xf0, 0x41, 0xde, 0xcf, 0x88, 0x3a, 0x24, 0x7a, 0x08, 0x9d, 0xb4, 0xc4,
+	0x1a, 0x5d, 0x86, 0x49, 0xe1, 0x64, 0x3d, 0x27, 0x9d, 0x36, 0xfd, 0x29, 0x4e, 0x62, 0x93, 0xb1,
+	0xc7, 0x8c, 0x78, 0xae, 0x44, 0x42, 0xd7, 0xa0, 0x95, 0x07, 0xbe, 0xbe, 0x59, 0x67, 0x4d, 0x8a,
+	0xfc, 0x9e, 0x64, 0x64, 0x05, 0xba, 0xa0, 0xed, 0xd2, 0x98, 0x78, 0x72, 0x8a, 0x98, 0x1a, 0xa5,
+	0xbd, 0x99, 0x7d, 0xcc, 0x69, 0x73, 0x74, 0xb4, 0x0e, 0xd3, 0xea, 0x75, 0x4b, 0xde, 0xa0, 0xd9,
+	0x8d, 0x33, 0xa3, 0xc9, 0x34, 0xa3, 0xd2, 0x88, 0xf6, 0xd7, 0x0d, 0x78, 0xbb, 0x08, 0x88, 0xec,
+	0x36, 0x65, 0x83, 0xdc, 0x77, 0x5f, 0x71, 0x2f, 0xc0, 0x09, 0x39, 0x39, 0x16, 0x8f, 0x5c, 0xea,
+	0xbd, 0xb5, 0x02, 0xb5, 0xff, 0xd2, 0x80, 0xf3, 0xa3, 0x76, 0xdc, 0xe8, 0xe3, 0x98, 0xe7, 0xc7,
+	0x7b, 0x1c, 0xb6, 0x64, 0x05, 0x6f, 0xbc, 0x28, 0x78, 0x25, 0xfb, 0x26, 0xca, 0xf6, 0xd9, 0x7f,
+	0x1b, 0x87, 0x59, 0x23, 0x80, 0xea, 0x0a, 0xa6, 0xe8, 0x6c, 0x65, 0xdc, 0xca, 0xb7, 0x02, 0x59,
+	0x14, 0x5a, 0xae, 0x01, 0x41, 0x03, 0x00, 0x86, 0x63, 0x1c, 0x10, 0x4e, 0x62, 0x91, 0xc9, 0xc5,
+	0x8d, 0xbf, 0x77, 0xf4, 0xec, 0xf2, 0x28, 0xe3, 0xe9, 0x1a, 0xec, 0x45, 0x6b, 0x2e, 0x45, 0x27,
+	0x3a, 0x7f, 0xeb, 0x1d, 0x7a, 0x06, 0x27, 0xf6, 0xa8, 0x4f, 0x1e, 0x15, 0x8a, 0x4c, 0x4b, 0x45,
+	0x1e, 0x1e, 0x5d, 0x91, 0xdb, 0x26, 0x5f, 0xb7, 0x22, 0xc6, 0xbe, 0x04, 0x8b, 0xd5, 0xfb, 0x24,
+	0x94, 0xa4, 0x01, 0xee, 0xe5, 0xde, 0xd2, 0x3b, 0x1b, 0xc1, 0x62, 0xf5, 0xfe, 0xd8, 0xff, 0x1a,
+	0x87, 0x53, 0x39, 0xbb, 0xcd, 0x30, 0x8c, 0xd2, 0xd0, 0x93, 0x23, 0x56, 0xed, 0x59, 0x2c, 0xc3,
+	0x14, 0xa7, 0xdc, 0xcf, 0x1b, 0x1f, 0xb9, 0x11, 0xb5, 0x8b, 0x47, 0x91, 0xcf, 0x29, 0xd3, 0x07,
+	0x9c, 0x6d, 0xd5, 0xd9, 0xcb, 0xa9, 0xad, 0x2b, 0x33, 0x41, 0xd3, 0xcd, 0xf7, 0xe2, 0x9b, 0xe8,
+	0x6a, 0xe4, 0xbc, 0xa2, 0x9c, 0x99, 0xef, 0x65, 0xdc, 0x47, 0xbe, 0x4f, 0x3c, 0xe1, 0x0e, 0x63,
+	0xa2, 0xa9, 0x40, 0xe5, 0xa4, 0xc4, 0x63, 0x1a, 0xf6, 0xf4, 0x3c, 0xa3, 0x77, 0x42, 0x4f, 0x1c,
+	0xc7, 0x78, 0x68, 0x35, 0xa5, 0x03, 0xd4, 0x06, 0x5d, 0x87, 0x89, 0x00, 0x33, 0x5d, 0xe8, 0x2e,
+	0x95, 0xb2, 0x43, 0x9d, 0x07, 0x9c, 0x1d, 0xcc, 0x54, 0x25, 0x10, 0x64, 0xed, 0x0f, 0xc4, 0x3c,
+	0xcd, 0xbe, 0x7d, 0x4b, 0xf8, 0x05, 0xcc, 0x97, 0x92, 0x0f, 0xfa, 0x0c, 0x56, 0x8a, 0x88, 0x32,
+	0x05, 0xea, 0x26, 0xf0, 0xed, 0x97, 0x6a, 0xe6, 0x1e, 0xc0, 0xc0, 0xfe, 0x12, 0x96, 0x44, 0xc8,
+	0xc8, 0x8b, 0x7f, 0x4c, 0xa3, 0xcd, 0x47, 0xd0, 0xca, 0x45, 0xd6, 0xc6, 0x4c, 0x1b, 0x9a, 0xfb,
+	0xd9, 0xd0, 0xa6, 0x66, 0x9b, 0x7c, 0x6f, 0x6f, 0x02, 0x32, 0xf5, 0xd5, 0x15, 0xe8, 0x72, 0xb9,
+	0x29, 0x3e, 0x55, 0x2d, 0x37, 0x12, 0x3d, 0xeb, 0x89, 0xff, 0x38, 0x0e, 0x0b, 0x5b, 0x54, 0x3e,
+	0x9c, 0x1d, 0x53, 0x92, 0xbb, 0x04, 0x8b, 0x49, 0xba, 0x1b, 0x44, 0xdd, 0xd4, 0x27, 0xba, 0x29,
+	0xd0, 0x95, 0x7e, 0x04, 0x7e, 0x58, 0xf2, 0xcb, 0x9f, 0x51, 0x26, 0x8d, 0x67, 0x94, 0xeb, 0x70,
+	0xe6, 0x01, 0x79, 0xa6, 0xed, 0xd9, 0xf2, 0xa3, 0xdd, 0x5d, 0x1a, 0xf6, 0x32, 0x21, 0x53, 0x52,
+	0xc8, 0xc1, 0x08, 0xf6, 0xef, 0x1a, 0xb0, 0x58, 0xf8, 0x42, 0x7b, 0xf3, 0xaa, 0x8a, 0x7a, 0xe5,
+	0xcb, 0xf3, 0xa6, 0x2f, 0xab, 0xa8, 0xff, 0x7d, 0xc0, 0xcf, 0x99, 0x01, 0xff, 0x55, 0x03, 0x4e,
+	0x6d, 0x51, 0x9e, 0xa5, 0x1a, 0xfa, 0x3f, 0x76, 0x2e, 0xb6, 0x03, 0x2b, 0x55, 0xf5, 0xb5, 0x2b,
+	0x97, 0x61, 0x4a, 0x9c, 0x52, 0x36, 0xbb, 0xab, 0xcd, 0xc6, 0x37, 0x2d, 0x58, 0x2a, 0x8a, 0xaf,
+	0xf8, 0x97, 0x7a, 0x04, 0x3d, 0x84, 0xc5, 0x2d, 0xfd, 0x47, 0xe4, 0xfc, 0xe1, 0xec, 0xb0, 0x77,
+	0xed, 0xf6, 0xd9, 0xfa, 0x8f, 0x4a, 0xb4, 0x3d, 0x86, 0x3c, 0x38, 0x53, 0x65, 0x58, 0x3c, 0xa1,
+	0xbf, 0x73, 0x08, 0xe7, 0x1c, 0xeb, 0x65, 0x22, 0x2e, 0x36, 0xd0, 0x67, 0x70, 0xa2, 0xfc, 0xd0,
+	0x8b, 0x4a, 0xd9, 0xa8, 0xf6, 0xed, 0xb9, 0x6d, 0x1f, 0x86, 0x92, 0xeb, 0xff, 0x54, 0xb4, 0xbe,
+	0xa5, 0x57, 0x4f, 0x64, 0x97, 0x1b, 0xf3, 0xba, 0x57, 0xe1, 0xf6, 0xf7, 0x0f, 0xc5, 0xc9, 0xb9,
+	0x7f, 0x04, 0xcd, 0xec, 0x49, 0xa7, 0xec, 0xe6, 0xca, 0x43, 0x4f, 0x7b, 0xb1, 0xcc, 0x6f, 0x2f,
+	0xb1, 0xc7, 0xd0, 0xc7, 0x8a, 0x58, 0x8c, 0xfc, 0xa3, 0xc4, 0xc6, 0x43, 0x46, 0xfb, 0x64, 0xcd,
+	0xe3, 0x81, 0x3d, 0x86, 0x7e, 0x0c, 0xb3, 0x62, 0xf5, 0x48, 0xff, 0x6d, 0x75, 0xc5, 0x51, 0xbf,
+	0x16, 0x70, 0xb2, 0x5f, 0x0b, 0x38, 0xb7, 0x02, 0xc6, 0x87, 0xed, 0x9a, 0xe9, 0x5e, 0x33, 0x78,
+	0x0a, 0xf3, 0x5b, 0x84, 0x17, 0xcd, 0x38, 0x3a, 0xff, 0x4a, 0x23, 0x4b, 0xdb, 0xae, 0xa2, 0x8d,
+	0xf6, 0xf3, 0xf6, 0x18, 0xfa, 0x53, 0x03, 0x4e, 0x6e, 0x11, 0x5e, 0x6d, 0x6f, 0xd1, 0x7b, 0xf5,
+	0x42, 0x0e, 0x68, 0x83, 0xdb, 0x0f, 0x8e, 0x7a, 0x5f, 0xcb, 0x6c, 0xed, 0x31, 0xf4, 0xe7, 0x06,
+	0x9c, 0x36, 0x14, 0x33, 0xfb, 0x55, 0xb4, 0x7e, 0xb8, 0x72, 0x35, 0xbd, 0x6d, 0xfb, 0xee, 0x11,
+	0xff, 0x64, 0x6e, 0xb0, 0xb4, 0xc7, 0xd0, 0x23, 0x79, 0x26, 0x45, 0x79, 0x42, 0xe7, 0x6a, 0xeb,
+	0x50, 0x2e, 0x7d, 0xf5, 0xa0, 0xcf, 0xf9, 0x39, 0xdc, 0x85, 0xd9, 0x2d, 0xc2, 0xb3, 0xac, 0x5b,
+	0x8e, 0xb4, 0x4a, 0x09, 0x2b, 0x5f, 0xd5, 0x6a, 0xa2, 0x96, 0x11, 0xb3, 0xa4, 0x78, 0x19, 0x79,
+	0xaa, 0x7c, 0x57, 0x6b, 0x53, 0x70, 0x39, 0x62, 0xea, 0xd3, 0x9c, 0x3d, 0xf6, 0xc9, 0xe6, 0x3f,
+	0x5e, 0xac, 0x36, 0xbe, 0x79, 0xb1, 0xda, 0xf8, 0xf7, 0x8b, 0xd5, 0xc6, 0xe7, 0x57, 0x5e, 0xf2,
+	0x53, 0x1a, 0xe3, 0x77, 0x3f, 0x98, 0x51, 0xcf, 0xa7, 0x24, 0xe4, 0xbb, 0xd3, 0x32, 0xf8, 0xaf,
+	0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x50, 0x57, 0x5f, 0x65, 0x16, 0x24, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3261,27 +3252,20 @@ func (m *ApplicationIdentity) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		copy(dAtA[i:], m.Name)
 		i = encodeVarintRepository(dAtA, i, uint64(len(m.Name)))
 		i--
-		dAtA[i] = 0x22
+		dAtA[i] = 0x1a
 	}
 	if len(m.Namespace) > 0 {
 		i -= len(m.Namespace)
 		copy(dAtA[i:], m.Namespace)
 		i = encodeVarintRepository(dAtA, i, uint64(len(m.Namespace)))
 		i--
-		dAtA[i] = 0x1a
+		dAtA[i] = 0x12
 	}
 	if len(m.Cluster) > 0 {
 		i -= len(m.Cluster)
 		copy(dAtA[i:], m.Cluster)
 		i = encodeVarintRepository(dAtA, i, uint64(len(m.Cluster)))
 		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.Runtime) > 0 {
-		i -= len(m.Runtime)
-		copy(dAtA[i:], m.Runtime)
-		i = encodeVarintRepository(dAtA, i, uint64(len(m.Runtime)))
-		i--
 		dAtA[i] = 0xa
 	}
 	return len(dAtA) - i, nil
@@ -5478,10 +5462,6 @@ func (m *ApplicationIdentity) Size() (n int) {
 	}
 	var l int
 	_ = l
-	l = len(m.Runtime)
-	if l > 0 {
-		n += 1 + l + sovRepository(uint64(l))
-	}
 	l = len(m.Cluster)
 	if l > 0 {
 		n += 1 + l + sovRepository(uint64(l))
@@ -6505,38 +6485,6 @@ func (m *ApplicationIdentity) Unmarshal(dAtA []byte) error {
 		}
 		switch fieldNum {
 		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Runtime", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowRepository
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthRepository
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthRepository
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Runtime = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Cluster", wireType)
 			}
@@ -6568,7 +6516,7 @@ func (m *ApplicationIdentity) Unmarshal(dAtA []byte) error {
 			}
 			m.Cluster = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 3:
+		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Namespace", wireType)
 			}
@@ -6600,7 +6548,7 @@ func (m *ApplicationIdentity) Unmarshal(dAtA []byte) error {
 			}
 			m.Namespace = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 4:
+		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
 			}
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
index 486a5f4dbf3b0..b2934287ab122 100644
--- a/reposerver/repository/repository.go
+++ b/reposerver/repository/repository.go
@@ -637,7 +637,6 @@ func (s *Service) GenerateManifest(ctx context.Context, q *apiclient.ManifestReq
 		}
 
 		versionConfig := s.GetVersionConfig(&codefresh.ApplicationIdentity{
-			Runtime:   q.ApplicationIdentity.Runtime,
 			Cluster:   q.ApplicationIdentity.Cluster,
 			Namespace: q.ApplicationIdentity.Namespace,
 			Name:      q.ApplicationIdentity.Name,
diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto
index fc681bb027e16..78b60863e6d49 100644
--- a/reposerver/repository/repository.proto
+++ b/reposerver/repository/repository.proto
@@ -9,10 +9,9 @@ import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.p
 import "google/protobuf/empty.proto";
 
 message ApplicationIdentity {
-    string runtime = 1;
-    string cluster = 2;
-    string namespace = 3;
-    string name = 4;
+    string cluster = 1;
+    string namespace = 2;
+    string name = 3;
 }
 
 // ManifestRequest is a query for manifest generation.
diff --git a/server/application/application.go b/server/application/application.go
index 94ed890ffebc7..d0c5dec7fab75 100644
--- a/server/application/application.go
+++ b/server/application/application.go
@@ -508,8 +508,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan
 			ProjectName:        proj.Name,
 			ProjectSourceRepos: proj.Spec.SourceRepos,
 			ApplicationIdentity: &apiclient.ApplicationIdentity{
-				Runtime:   "runtime",
-				Cluster:   "cluster",
+				Cluster:   a.Spec.Destination.Server,
 				Namespace: a.Spec.Destination.Namespace,
 				Name:      a.InstanceName(s.ns),
 			},
diff --git a/util/argo/argo.go b/util/argo/argo.go
index 4cfc679161474..67aef755489e1 100644
--- a/util/argo/argo.go
+++ b/util/argo/argo.go
@@ -774,8 +774,7 @@ func verifyGenerateManifests(
 			HasMultipleSources: hasMultipleSources,
 			RefSources:         refSources,
 			ApplicationIdentity: &apiclient.ApplicationIdentity{
-				Runtime:   "runtime",
-				Cluster:   "cluster",
+				Cluster:   dest.Server,
 				Namespace: dest.Namespace,
 				Name:      name,
 			},