diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 85013e3b62b8..c1489038f3a5 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -163,28 +163,57 @@ jobs:
         testResultsFiles: 'artifacts/logs/**/*.trx'
         mergeTestResults: true
   - ${{ if and(eq(parameters.artifacts.publish, 'true'), eq(variables['system.pullrequest.isfork'], false)) }}:
-    - task: 1ES.PublishPipelineArtifact@1
-      displayName: Upload artifacts
-      continueOnError: true
-      inputs:
-        ${{ if eq(parameters.buildDirectory, '') }}:
-          path: ${{ parameters.artifacts.path }}
-        ${{ if ne(parameters.buildDirectory, '') }}:
-          path: ${{ parameters.buildDirectory }}\${{ parameters.artifacts.path }}
-        ${{ if eq(parameters.artifacts.name, '') }}:
-          artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
-        ${{ if ne(parameters.artifacts.name, '') }}:
-          artifactName: ${{ parameters.artifacts.name }}
+    - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+      - task: 1ES.PublishPipelineArtifact@1
+        displayName: Upload artifacts
+        continueOnError: true
+        inputs:
+          ${{ if eq(parameters.buildDirectory, '') }}:
+            path: ${{ parameters.artifacts.path }}
+          ${{ if ne(parameters.buildDirectory, '') }}:
+            path: ${{ parameters.buildDirectory }}\${{ parameters.artifacts.path }}
+          ${{ if eq(parameters.artifacts.name, '') }}:
+            artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
+          ${{ if ne(parameters.artifacts.name, '') }}:
+            artifactName: ${{ parameters.artifacts.name }}
+    - ${{ else }}:
+      - task: PublishBuildArtifacts@1
+        displayName: Upload artifacts
+        continueOnError: true
+        inputs:
+          ${{ if eq(parameters.buildDirectory, '') }}:
+            pathToPublish: ${{ parameters.artifacts.path }}
+          ${{ if ne(parameters.buildDirectory, '') }}:
+            pathToPublish: ${{ parameters.buildDirectory }}\${{ parameters.artifacts.path }}
+          ${{ if eq(parameters.artifacts.name, '') }}:
+            artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
+          ${{ if ne(parameters.artifacts.name, '') }}:
+            artifactName: ${{ parameters.artifacts.name }}
+          artifactType: Container
+          parallel: true
   - ${{ if and(eq(parameters.artifacts.publish, 'true'), ne(variables['system.pullrequest.isfork'], false)) }}:
-    - task: 1ES.PublishPipelineArtifact@1
-      displayName: Upload logs
-      continueOnError: true
-      inputs:
-        ${{ if eq(parameters.buildDirectory, '') }}:
-          path: artifacts/logs/
-        ${{ if ne(parameters.buildDirectory, '') }}:
-          path: ${{ parameters.buildDirectory }}/artifacts/logs
-        artifactName: logs-$(AgentOsName)-$(BuildConfiguration)
+    - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+      - task: 1ES.PublishPipelineArtifact@1
+        displayName: Upload logs
+        continueOnError: true
+        inputs:
+          ${{ if eq(parameters.buildDirectory, '') }}:
+            path: artifacts/logs/
+          ${{ if ne(parameters.buildDirectory, '') }}:
+            path: ${{ parameters.buildDirectory }}/artifacts/logs
+          artifactName: logs-$(AgentOsName)-$(BuildConfiguration)
+    - ${{ else }}:
+      - task: PublishBuildArtifacts@1
+        displayName: Upload logs
+        continueOnError: true
+        inputs:
+          ${{ if eq(parameters.buildDirectory, '') }}:
+            pathToPublish: artifacts/logs/
+          ${{ if ne(parameters.buildDirectory, '') }}:
+            pathToPublish: ${{ parameters.buildDirectory }}/artifacts/logs
+          artifactName: logs-$(AgentOsName)-$(BuildConfiguration)
+          artifactType: Container
+          parallel: true
   - ${{ parameters.afterBuild }}
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
     - task: MicroBuildCleanup@1
diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
new file mode 100644
index 000000000000..e6da50ccc844
--- /dev/null
+++ b/.config/tsaoptions.json
@@ -0,0 +1,12 @@
+{
+  "areaPath": "DevDiv\\ASP.NET Core\\Policy Violations",
+  "codebaseName": "AspNetCore",
+  "instanceUrl": "https://devdiv.visualstudio.com/",
+  "iterationPath": "DevDiv",
+  "notificationAliases": [
+    "aspnetcore-build@microsoft.com"
+  ],
+  "projectName": "DEVDIV",
+  "repositoryName": "AspNetCore",
+  "template": "TFSDEVDIV"
+}