diff --git a/.azure-pipelines/templates/build/checkout-and-credscan.yml b/.azure-pipelines/templates/build/checkout-and-credscan.yml
index a04eb92eb..a6b9c4b9d 100644
--- a/.azure-pipelines/templates/build/checkout-and-credscan.yml
+++ b/.azure-pipelines/templates/build/checkout-and-credscan.yml
@@ -3,8 +3,7 @@ steps:
   clean: true
   fetchDepth: 1
 
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
+- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
   displayName: 'Run CredScan'
   inputs:
     debugMode: false
-    toolMajorVersion: V2
\ No newline at end of file
diff --git a/.azure-pipelines/templates/version-and-release.yml b/.azure-pipelines/templates/version-and-release.yml
index 4eed424af..e85ac2a9e 100644
--- a/.azure-pipelines/templates/version-and-release.yml
+++ b/.azure-pipelines/templates/version-and-release.yml
@@ -8,6 +8,7 @@ steps:
   inputs:
     filePath: '$(DROP_PATH)/Scripts/getLatestVersion.ps1'
     arguments: '-propertiesPath "$(PROPERTIES_PATH)"'
+    pwsh: true
 
 - task: GitHubRelease@1
   inputs: