diff --git a/DevOpsPipelineDefinitions/publish-pipeline.yaml b/DevOpsPipelineDefinitions/publish-pipeline.yaml
index c62075745fc..c54055b3ad0 100644
--- a/DevOpsPipelineDefinitions/publish-pipeline.yaml
+++ b/DevOpsPipelineDefinitions/publish-pipeline.yaml
@@ -44,7 +44,8 @@ jobs:
       HOST_KEY: $(AzureFunctionHostKey)
       SIGN_ENDPOINT: $(AzFuncSignEndpoint)
       CLEANUP_ENDPOINT: $(AzFuncPublishCleanupEndpoint)
-      MANIFEST_PUBLISH_COMPLETION_ENDPOINT: $(AzManifestPublishCompletionEndpoint)
+      MANIFEST_PUBLISH_COMPLETION_ENDPOINT: $(AzFuncManifestPublishCompletionEndpoint)
+      WAIVER_COMMIT_ENDPOINT: $(AzFuncWaiverCommitEndpoint)
 
   - task: CmdLine@2
     displayName: 'Validate Commits'
@@ -133,19 +134,43 @@ jobs:
       WinGet:AppConfig:Secondary: $(AppConfigSecondary)
 
 # Agentless phase. Depends on previous job. 
-- job: 'Cleanup'
+- job: 'PostPublish'
   pool: server
   timeoutInMinutes: 1500
-  displayName: 'Clean up'
+  displayName: 'Post publish'
   dependsOn:
     - 'CommitProcessing'
     - 'Publish'
+  condition: and(succeeded(), ne(variables['Source.SkipPostPublish'], 'true'))
   variables:
     HostKeySecret: $[ dependencies.CommitProcessing.outputs['wingetsetup.hostkey']]
     CleanEndpointSecret: $[ dependencies.CommitProcessing.outputs['wingetsetup.cleanupEndpoint']]
     ManifestPublishCompletionEndPoint: $[ dependencies.CommitProcessing.outputs['wingetsetup.manifestPublishCompletionEndPoint']]
+    WaiverCommitEndPoint: $[ dependencies.CommitProcessing.outputs['wingetsetup.waiverCommitEndPoint']]
   steps:
 
+  - task: AzureFunction@1
+    displayName: 'Waiver Commit'
+    inputs:
+      function: '$(WaiverCommitEndPoint)'
+      key: '$(HostKeySecret)'
+      body: |
+        {
+        "operationId": "$(Build.BuildNumber)",
+        "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)",
+        "BuildRepositoryId": "$(build.repository.id)"
+        }
+      waitForCompletion: "true"
+
   - task: AzureFunction@1
     displayName: 'Pull Request Notification'
     inputs:
diff --git a/DevOpsPipelineDefinitions/validation-pipeline.yaml b/DevOpsPipelineDefinitions/validation-pipeline.yaml
index ca2ac9a30eb..47be03fcce4 100644
--- a/DevOpsPipelineDefinitions/validation-pipeline.yaml
+++ b/DevOpsPipelineDefinitions/validation-pipeline.yaml
@@ -6,8 +6,8 @@ name: '$(Build.DefinitionName)-$(Build.DefinitionVersion)-$(System.PullRequest.P
 trigger: none
 pr:
   branches:
-   include:
-     - master
+    include:
+      - master
   paths:
     include:
       - manifests
@@ -61,6 +61,8 @@ jobs:
     condition: succeeded()
     env:
       ValidationConnectionString: $(ValidationStorageAccountConnectionString)
+      GithubRepository: $(GithubRepository)
+      GithubServiceAccountToken: $(GithubServiceAccountToken)
       ExecutionEnvironment: $(ExecutionEnvironment)
       DIApplicationInsightKey: $(DIApplicationInsightKey)
       WinGet:AppConfig:Primary: $(AppConfigPrimary)