diff --git a/build/azure-pipelines/darwin/sql-product-build-darwin.yml b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
index 329fbfd876..90f2a43d57 100644
--- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
@@ -49,7 +49,7 @@ steps:
       password $(github-distro-mixin-password)
       EOF
 
-      git config user.email "andresse@microsoft.com"
+      git config user.email "sqltools@service.microsoft.com"
       git config user.name "AzureDataStudio"
     displayName: Prepare tooling
 
diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml
index f26d5db267..9342f3b7c1 100644
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -28,7 +28,7 @@ steps:
     password $(github-distro-mixin-password)
     EOF
 
-    git config user.email "andresse@microsoft.com"
+    git config user.email "sqltools@service.microsoft.com"
     git config user.name "AzureDataStudio"
 
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
diff --git a/build/azure-pipelines/docker/sql-product-build-docker.yml b/build/azure-pipelines/docker/sql-product-build-docker.yml
index d33130ccad..9f24ee6c35 100644
--- a/build/azure-pipelines/docker/sql-product-build-docker.yml
+++ b/build/azure-pipelines/docker/sql-product-build-docker.yml
@@ -22,7 +22,7 @@ steps:
       password $(github-distro-mixin-password)
       EOF
 
-      git config user.email "andresse@microsoft.com"
+      git config user.email "sqltools@service.microsoft.com"
       git config user.name "AzureDataStudio"
     displayName: Prepare tooling
 
diff --git a/build/azure-pipelines/linux/sql-product-build-linux.yml b/build/azure-pipelines/linux/sql-product-build-linux.yml
index ea61c0ff4b..1ee77fa2ce 100644
--- a/build/azure-pipelines/linux/sql-product-build-linux.yml
+++ b/build/azure-pipelines/linux/sql-product-build-linux.yml
@@ -45,7 +45,7 @@ steps:
       password $(github-distro-mixin-password)
       EOF
 
-      git config user.email "andresse@microsoft.com"
+      git config user.email "sqltools@service.microsoft.com"
       git config user.name "AzureDataStudio"
     displayName: Prepare tooling
 
diff --git a/build/azure-pipelines/sql-product-compile.yml b/build/azure-pipelines/sql-product-compile.yml
index a66fac37f5..2af22471dc 100644
--- a/build/azure-pipelines/sql-product-compile.yml
+++ b/build/azure-pipelines/sql-product-compile.yml
@@ -36,7 +36,7 @@ steps:
     password $(github-distro-mixin-password)
     EOF
 
-    git config user.email "andresse@microsoft.com"
+    git config user.email "sqltools@service.microsoft.com"
     git config user.name "AzureDataStudio"
   displayName: Prepare tooling
   condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
diff --git a/build/azure-pipelines/web/sql-product-build-web.yml b/build/azure-pipelines/web/sql-product-build-web.yml
index 1c429e93e7..b95fff75a3 100644
--- a/build/azure-pipelines/web/sql-product-build-web.yml
+++ b/build/azure-pipelines/web/sql-product-build-web.yml
@@ -42,7 +42,7 @@ steps:
     password $(github-distro-mixin-password)
     EOF
 
-    git config user.email "andresse@microsoft.com"
+    git config user.email "sqltools@service.microsoft.com"
     git config user.name "AzureDataStudio"
   displayName: Prepare tooling
 
diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml
index bcfd719ef3..e7e9c0a17b 100644
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -44,7 +44,7 @@ steps:
       $ErrorActionPreference = "Stop"
       "machine github.com`nlogin azuredatastudio`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
 
-      exec { git config user.email "andresse@microsoft.com" }
+      exec { git config user.email "sqltools@service.microsoft.com" }
       exec { git config user.name "AzureDataStudio" }
     displayName: Prepare tooling