diff --git a/DevOpsPipelineDefinitions/publish-pipeline.yaml b/DevOpsPipelineDefinitions/publish-pipeline.yaml
index 7a5c7958ec88e..9911cbed11d77 100644
--- a/DevOpsPipelineDefinitions/publish-pipeline.yaml
+++ b/DevOpsPipelineDefinitions/publish-pipeline.yaml
@@ -118,13 +118,14 @@ extends:
               "buildId": "$(Build.BuildId)",
               "planUrl": "$(system.CollectionUri)",
               "hubName": "$(system.HostType)",
-              "pipelineType": "CommitPipeline",
               "projectId": "$(system.TeamProjectId)",
               "planId": "$(system.PlanId)", 
               "jobId": "$(system.JobId)", 
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
-              "authToken": "$(system.AccessToken)"
+              "authToken": "$(system.AccessToken)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "CommitPipeline",
               }
             waitForCompletion: "true"
 
diff --git a/DevOpsPipelineDefinitions/rebuild-pipeline.yaml b/DevOpsPipelineDefinitions/rebuild-pipeline.yaml
index 3eb71b02860d8..4339aec618986 100644
--- a/DevOpsPipelineDefinitions/rebuild-pipeline.yaml
+++ b/DevOpsPipelineDefinitions/rebuild-pipeline.yaml
@@ -117,14 +117,14 @@ extends:
               "buildId": "$(Build.BuildId)",
               "planUrl": "$(system.CollectionUri)",
               "hubName": "$(system.HostType)",
-              "pipelineType": "RebuildPipeline",
               "projectId": "$(system.TeamProjectId)",
               "planId": "$(system.PlanId)", 
               "jobId": "$(system.JobId)", 
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
-              "buildRepositoryId": "$(build.repository.id)"
+              "repository": "$(build.repository.id)",
+              "pipelineType": "RebuildPipeline",
               }
             waitForCompletion: "true"
 
@@ -153,14 +153,14 @@ extends:
               "buildId": "$(Build.BuildId)",
               "planUrl": "$(system.CollectionUri)",
               "hubName": "$(system.HostType)",
-              "pipelineType": "RebuildPipeline",
               "projectId": "$(system.TeamProjectId)",
               "planId": "$(system.PlanId)", 
               "jobId": "$(system.JobId)", 
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
-              "buildRepositoryId": "$(build.repository.id)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "RebuildPipeline",
               "containerName": "$(CacheContainerName)",
               "commitTablePartitionKey": "$(CommitTablePartitionKey)",
               "commitTableRowKey": "$(CommitTableRowKey)",
@@ -197,13 +197,13 @@ extends:
               "buildId": "$(Build.BuildId)",
               "planUrl": "$(system.CollectionUri)",
               "hubName": "$(system.HostType)",
-              "pipelineType": "RebuildPipeline",
               "projectId": "$(system.TeamProjectId)",
               "planId": "$(system.PlanId)", 
               "jobId": "$(system.JobId)", 
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
-              "buildRepositoryId": "$(build.repository.id)"
+              "repository": "$(build.repository.id)",
+              "pipelineType": "RebuildPipeline",
               }
             waitForCompletion: "true"
diff --git a/DevOpsPipelineDefinitions/validation-pipeline.yaml b/DevOpsPipelineDefinitions/validation-pipeline.yaml
index 09241f2736dc8..21527ec3a1062 100644
--- a/DevOpsPipelineDefinitions/validation-pipeline.yaml
+++ b/DevOpsPipelineDefinitions/validation-pipeline.yaml
@@ -146,6 +146,8 @@ extends:
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "ValidationPipeline",
               "pullRequestNumber": "$(System.PullRequest.PullRequestNumber)"
               }
             waitForCompletion: "true"
@@ -168,6 +170,8 @@ extends:
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "ValidationPipeline",
               "pullRequestNumber": "$(System.PullRequest.PullRequestNumber)"
               }
             waitForCompletion: "true"
@@ -190,6 +194,8 @@ extends:
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "ValidationPipeline",
               "pullRequestNumber": "$(System.PullRequest.PullRequestNumber)"
               }
             waitForCompletion: "true"
@@ -226,6 +232,8 @@ extends:
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "ValidationPipeline",
               "pullRequestNumber": "$(System.PullRequest.PullRequestNumber)"
               }
             waitForCompletion: "true"
@@ -248,6 +256,8 @@ extends:
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "ValidationPipeline",
               "pullRequestNumber": "$(System.PullRequest.PullRequestNumber)"
               }
             waitForCompletion: "true"
@@ -284,6 +294,8 @@ extends:
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "ValidationPipeline",
               "pullRequestNumber": "$(System.PullRequest.PullRequestNumber)"
               }
             waitForCompletion: "true"
@@ -302,7 +314,6 @@ extends:
           HostKeySecret: $[ dependencies.FileValidation.outputs['wingetsetup.hostkey']]
           LabelKeySecret : $[ dependencies.FileValidation.outputs['wingetsetup.labelkey']]
           LabelEndpointSecret: $[ dependencies.FileValidation.outputs['wingetsetup.labelEndpoint']]
-          RepositoryId: $[ dependencies.FileValidation.outputs['wingetsetup.repoId']]
           CleanupEndpointSecret: $[ dependencies.filevalidation.outputs['wingetsetup.cleanupEndpoint']]
         steps:
 
@@ -316,8 +327,8 @@ extends:
             body: |
               {
               "operationId": "$(Build.BuildNumber)",
-              "planUrl": "$(system.CollectionUri)",
               "buildId": "$(Build.BuildId)",
+              "planUrl": "$(system.CollectionUri)",
               "hubName": "$(system.HostType)",
               "projectId": "$(system.TeamProjectId)",
               "planId": "$(system.PlanId)", 
@@ -325,7 +336,8 @@ extends:
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
-              "buildRepositoryId": "$(RepositoryId)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "ValidationPipeline",
               "pullRequestNumber": "$(System.PullRequest.PullRequestNumber)"
               }
             waitForCompletion: "true"
@@ -339,8 +351,8 @@ extends:
             body: |
               {
               "operationId": "$(Build.BuildNumber)",
-              "planUrl": "$(system.CollectionUri)",
               "buildId": "$(Build.BuildId)",
+              "planUrl": "$(system.CollectionUri)",
               "hubName": "$(system.HostType)",
               "projectId": "$(system.TeamProjectId)",
               "planId": "$(system.PlanId)", 
@@ -348,6 +360,8 @@ extends:
               "timelineId": "$(system.TimelineId)", 
               "taskInstanceId": "$(system.TaskInstanceId)",
               "authToken": "$(system.AccessToken)",
+              "repository": "$(build.repository.id)",
+              "pipelineType": "ValidationPipeline",
               "pullRequestNumber": "$(System.PullRequest.PullRequestNumber)",
               }
             waitForCompletion: "true"