diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml
index c44f1069b..24df97fc7 100644
--- a/.azure-pipelines/buildAndPackage.yml
+++ b/.azure-pipelines/buildAndPackage.yml
@@ -44,12 +44,11 @@ stages:
         stageID: 'build'
     - template: templates/build/build-and-coverage.yml
     - template: templates/build/publish-artefacts.yml
-    - template: templates/alert-failure.yml
 
-- stage: Maven-Preview
+- stage: Maven_Preview
   condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
   jobs: 
-  - deployment: Maven-Preview
+  - deployment: Maven_Preview
     environment: 'MSGraph SDK Development - Java'
     pool:
       vmImage: windows-latest
@@ -61,13 +60,12 @@ stages:
         - template: templates/copy-and-build.yml
           parameters:
             task: 'publishSnapshotPublicationToSonatypeSnapshotRepository'
-        - template: templates/alert-failure.yml
 
-- stage: Maven-Release-And-Github-Release
+- stage: Maven_Release_And_Github_Release
   dependsOn: []
   condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
   jobs:
-  - deployment: Maven-Release
+  - deployment: Maven_Release
     environment: 'MSGraph SDK Development - Java'
     pool:
       vmImage: windows-latest
@@ -81,10 +79,9 @@ stages:
         - template: templates/copy-and-build.yml
           parameters:
             task: 'publishMavenCentralReleasePublicationToSonatypeRepository'
-        - template: templates/alert-failure.yml
 
-  - deployment: Github-Release
-    dependsOn: Maven-Release
+  - deployment: Github_Release
+    dependsOn: Maven_Release
     environment: 'MSGraph SDK Development - Java'
     pool:
       vmImage: windows-latest
@@ -94,5 +91,4 @@ stages:
         steps: 
         - template: templates/version-and-release.yml
           parameters:
-            gitConnection: 'ramsessanchez'
-        - template: templates/alert-failure.yml
+            gitConnection: 'microsoftgraphrelease'
diff --git a/.azure-pipelines/templates/alert-failure.yml b/.azure-pipelines/templates/alert-failure.yml
deleted file mode 100644
index 51f2043d0..000000000
--- a/.azure-pipelines/templates/alert-failure.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-steps:
-- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
-  displayName: 'Graph Client Tooling pipeline fail notification'
-  inputs:
-    addressType: serviceEndpoint
-    serviceEndpointName: 'microsoftgraph pipeline status'
-    title: '$(Build.DefinitionName) failure notification'
-    text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
-  condition: and(failed(), ne(variables['Build.Reason'], 'Manual'))
-  enabled: true
\ No newline at end of file
diff --git a/.azure-pipelines/templates/build/checkout-and-credscan.yml b/.azure-pipelines/templates/build/checkout-and-credscan.yml
index cc5c7c2f5..a04eb92eb 100644
--- a/.azure-pipelines/templates/build/checkout-and-credscan.yml
+++ b/.azure-pipelines/templates/build/checkout-and-credscan.yml
@@ -6,4 +6,5 @@ steps:
 - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
   displayName: 'Run CredScan'
   inputs:
-    debugMode: false
\ No newline at end of file
+    debugMode: false
+    toolMajorVersion: V2
\ No newline at end of file