diff --git a/build/azure-pipelines/pre-release.yml b/build/azure-pipelines/pre-release.yml
index a2ec69f5..83412b6d 100644
--- a/build/azure-pipelines/pre-release.yml
+++ b/build/azure-pipelines/pre-release.yml
@@ -33,4 +33,10 @@ extends:
     ghCreateTag: true
     ghTagPrefix: pre-release/
 
+    tsa:
+      config:
+        areaPath: 'Visual Studio Code Language Extensions'
+        serviceTreeID: 'c4cd3983-4977-4bcd-931f-a9822d2e950c'
+      enabled: true
+
     publishExtension: ${{ parameters.publishExtension }}
\ No newline at end of file
diff --git a/build/azure-pipelines/release.yml b/build/azure-pipelines/release.yml
index 941626c0..5f996daa 100644
--- a/build/azure-pipelines/release.yml
+++ b/build/azure-pipelines/release.yml
@@ -37,16 +37,9 @@ extends:
     ghTagPrefix: release/
 
     tsa:
-      enabled: true
-      options:
-        codebaseName: 'devdiv_$(Build.Repository.Name)'
+      config:
+        areaPath: 'Visual Studio Code Language Extensions'
         serviceTreeID: 'c4cd3983-4977-4bcd-931f-a9822d2e950c'
-        instanceUrl: 'https://devdiv.visualstudio.com/defaultcollection'
-        projectName: 'DevDiv'
-        areaPath: 'DevDiv\\VS Code (compliance tracking only)\\Visual Studio Code Language Extensions'
-        notificationAliases:
-          - 'stbatt@microsoft.com'
-          - 'lszomoru@microsoft.com'
-          - 'dirkb@microsoft.com'
+      enabled: true
 
     publishExtension: ${{ parameters.publishExtension }}
\ No newline at end of file