diff --git a/build/azure-pipelines/config/tsaoptions.json b/build/azure-pipelines/config/tsaoptions.json
index fa8e182d8f..53c2a58035 100644
--- a/build/azure-pipelines/config/tsaoptions.json
+++ b/build/azure-pipelines/config/tsaoptions.json
@@ -1,16 +1,19 @@
 {
-	"codebaseName": "devdiv_vscode-client",
+	"codebaseName": "Azure Data Studio",
 	"ppe": false,
 	"notificationAliases": [
-			"sbatten@microsoft.com"
+		"kvhdir@microsoft.com",
+		"sakshis@microsoft.com"
 	],
 	"codebaseAdmins": [
-			"REDMOND\\stbatt",
-			"REDMOND\\monacotools"
+		"REDMOND\\karlb",
+		"REDMOND\\chgagnon",
+		"REDMOND\\kisantia",
+		"REDMOND\\sakshis"
 	],
-	"instanceUrl": "https://devdiv.visualstudio.com/defaultcollection",
-	"projectName": "DevDiv",
-	"areaPath": "DevDiv\\VS Code (compliance tracking only)\\Visual Studio Code Client",
+	"instanceUrl": "https://msdata.visualstudio.com",
+	"projectName": "Database Systems",
+	"areaPath": "Database Systems\\SQL Tools\\Azure Data Studio",
 	"notifyAlways": true,
 	"template": "TFSDEVDIV",
 	"tools": [
diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml
index c35a366a1e..8d4cb9f3f9 100644
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -41,6 +41,10 @@ steps:
       exec { git config --global https.postBuffer 524288000 }
     displayName: Prepare tooling
 
+  - task: CodeQL3000Init@0
+    displayName: CodeQL Initialize
+    condition: eq(variables['Codeql.enabled'], 'True')
+
   - powershell: |
       git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
       git fetch distro
@@ -344,6 +348,10 @@ steps:
     continueOnError: true
     condition: and(succeededOrFailed(), eq(variables['RUN_UNSTABLE_TESTS'], 'true'))
 
+  - task: CodeQL3000Finalize@0
+    displayName: CodeQL Finalize
+    condition: eq(variables['Codeql.enabled'], 'True')
+
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs: