diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 384ea4ae2c..40ed84463f 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -77,16 +77,7 @@ jobs:
     displayName: Set TEMP to AGENT_TEMPDIRECTORY
     condition: succeededOrFailed()
 
-  - powershell: |
-      Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
-
-      if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
-      {
-          throw "nuget.config is not created"
-      }
-    displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
-    condition: and(succeededOrFailed(), ne(variables['AzDevOpsFeed'], ''))
+  - template: ../tools/releaseBuild/azureDevOps/templates/insert-nuget-config.yml
 
   - powershell: |
       tools/travis.ps1 -Stage Bootstrap
diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index b60f523e85..9a77e936b3 100644
--- a/.vsts-ci/mac.yml
+++ b/.vsts-ci/mac.yml
@@ -52,16 +52,7 @@ jobs:
     displayName: Set Build Name for Non-PR
     condition: ne(variables['Build.Reason'], 'PullRequest')
 
-  - powershell: |
-      Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
-
-      if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
-      {
-          throw "nuget.config is not created"
-      }
-    displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
-    condition: and(succeededOrFailed(), ne(variables['AzDevOpsFeed'], ''))
+  - template: ../tools/releaseBuild/azureDevOps/templates/insert-nuget-config.yml
 
   - powershell: |
       tools/travis.ps1 -Stage Bootstrap
diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml
index 93a7b9bd50..e36dd6ade9 100644
--- a/.vsts-ci/windows.yml
+++ b/.vsts-ci/windows.yml
@@ -54,16 +54,7 @@ steps:
     displayName: Set Build Name for Non-PR
     condition: ne(variables['Build.Reason'], 'PullRequest')
 
-  - powershell: |
-      Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
-
-      if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
-      {
-          throw "nuget.config is not created"
-      }
-    displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
-    condition: and(succeededOrFailed(), ne(variables['AzDevOpsFeed'], ''))
+  - template: ../tools/releaseBuild/azureDevOps/templates/insert-nuget-config.yml
 
   - powershell: |
       [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 478d49d783..16ed17f92e 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -3117,7 +3117,7 @@ function New-DotnetSdkContainerFxdPackage {
     $destinationPackageFullName = Join-Path $DestinationPath $packageName
 
     ## Get fxdependent package path
-    $fxdPackage = Get-ChildItem $FxdPackagePath -Recurse -Filter $basePackagePattern.FullName | Select-Object -First 1 -ExpandProperty FullName
+    $fxdPackage = Get-ChildItem $FxdPackagePath -Recurse -Filter $basePackagePattern | Select-Object -First 1 -ExpandProperty FullName
 
     Write-Log "Fxd Package Path: $fxdPackage"
 
diff --git a/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml b/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml
new file mode 100644
index 0000000000..32b7c9ea9c
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml
@@ -0,0 +1,22 @@
+parameters:
+  ReleaseTagVar: v6.2.0
+  ReleaseTagVarName: ReleaseTagVar
+
+steps:
+- powershell: |
+    $releaseTag = tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag ${{ parameters.ReleaseTagVar }} -Variable "${{ parameters.ReleaseTagVarName }}"
+    $version = $releaseTag.Substring(1)
+    $vstsCommandString = "vso[task.setvariable variable=Version]$version"
+    Write-Host "sending " + $vstsCommandString
+    Write-Host "##$vstsCommandString"
+
+    $azureVersion = $releaseTag.ToLowerInvariant() -replace '\.', '-'
+    $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion"
+    Write-Host "sending " + $vstsCommandString
+    Write-Host "##$vstsCommandString"
+  displayName: 'Set ${{ parameters.ReleaseTagVarName }} and other version Variables'
+
+- powershell: |
+    Get-ChildItem -Path env:
+  displayName: Capture environment
+  condition: succeededOrFailed()
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index cc31dddcc9..9255c247bd 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -10,9 +10,9 @@ jobs:
     name: Package ES CodeHub Lab E
 
   steps:
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Set ReleaseTag Variable'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download artifacts'
@@ -26,33 +26,23 @@ jobs:
     displayName: 'Capture artifacts directory'
     continueOnError: true
 
-  - powershell: |
-       $version = '$(ReleaseTagVar)'.Substring(1)
-       $vstsCommandString = "vso[task.setvariable variable=Version]$version"
-       Write-Host "sending " + $vstsCommandString
-       Write-Host "##$vstsCommandString"
-
-       $azureVersion = '$(ReleaseTagVar)'.ToLowerInvariant() -replace '\.', '-'
-       $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion"
-       Write-Host "sending " + $vstsCommandString
-       Write-Host "##$vstsCommandString"
-
-    displayName: 'Set Version Variable'
-
   - template: expand-compliance.yml
     parameters:
       architecture: x86
+      version: $(version)
 
   - template: expand-compliance.yml
     parameters:
       architecture: x64
+      version: $(version)
 
   - template: expand-compliance.yml
     parameters:
       architecture: fxdependent
+      version: $(version)
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'Run MpCmdRun.exe'
+    displayName: 'Run Defender Scan'
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
     displayName: 'Run CredScan'
diff --git a/tools/releaseBuild/azureDevOps/templates/dotnetsdk-fxdependent.yml b/tools/releaseBuild/azureDevOps/templates/dotnetsdk-fxdependent.yml
index a8415395c2..1cbee70618 100644
--- a/tools/releaseBuild/azureDevOps/templates/dotnetsdk-fxdependent.yml
+++ b/tools/releaseBuild/azureDevOps/templates/dotnetsdk-fxdependent.yml
@@ -12,9 +12,9 @@ jobs:
   pool: ${{ parameters.poolName }}
   steps:
 
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Run setReleaseTag.ps1'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download Artifacts'
@@ -25,19 +25,16 @@ jobs:
         **/*.zip
       downloadPath: '$(System.ArtifactsDirectory)/finished'
 
+  - powershell: |
+      Get-ChildItem '$(System.ArtifactsDirectory)/finished' -recurse
+    displayName: Capture list of downloaded artifacts
+
   - powershell: |
       Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
       Import-Module $(Build.SourcesDirectory)/tools/packaging -Force
       New-DotnetSdkContainerFxdPackage -FxdPackagePath "$(System.ArtifactsDirectory)/finished" -ReleaseTag $(ReleaseTagVar) -DestinationPath "$(System.ArtifactsDirectory)/finished/release"
     displayName: 'Create fxdependent package for dotnet sdk docker image'
 
-  - powershell: |
-      $azureVersion = '$(ReleaseTagVar)'.ToLowerInvariant() -replace '\.', '-'
-      $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion-internal"
-      Write-Host "sending " + $vstsCommandString
-      Write-Host "##$vstsCommandString"
-    displayName: 'Set Version for Blob Storage'
-
 - job:
   displayName: Upload fxdependent package dotnet sdk - ${{ parameters.buildName }}
   dependsOn: dotnetfxd_${{ parameters.buildName }}
@@ -45,16 +42,9 @@ jobs:
   pool: Package ES CodeHub Lab E
   steps:
 
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Run setReleaseTag.ps1'
-
-  - powershell: |
-      $azureVersion = '$(ReleaseTagVar)'.ToLowerInvariant() -replace '\.', '-'
-      $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion-internal"
-      Write-Host "sending " + $vstsCommandString
-      Write-Host "##$vstsCommandString"
-    displayName: 'Set Version for Blob Storage'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download FxDependent dotnet sdx artifacts'
@@ -77,4 +67,4 @@ jobs:
       azureSubscription: '$(AzureFileCopySubscription)'
       Destination: AzureBlob
       storage: '$(StorageAccount)'
-      ContainerName: '$(AzureVersion)'
+      ContainerName: '$(AzureVersion)-internal'
diff --git a/tools/releaseBuild/azureDevOps/templates/expand-compliance.yml b/tools/releaseBuild/azureDevOps/templates/expand-compliance.yml
index b925ffbca9..4cc2543326 100644
--- a/tools/releaseBuild/azureDevOps/templates/expand-compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/expand-compliance.yml
@@ -1,9 +1,10 @@
 parameters:
   architecture: x86
+  version: 6.2.0
 
 steps:
   - powershell: |
-      Expand-Archive -Path "$(System.ArtifactsDirectory)\results\PowerShell-$(Version)-symbols-win-${{ parameters.architecture }}.zip" -Destination "$(Build.StagingDirectory)\symbols\${{ parameters.architecture }}"
+      Expand-Archive -Path "$(System.ArtifactsDirectory)\results\PowerShell-${{ parameters.version }}-symbols-win-${{ parameters.architecture }}.zip" -Destination "$(Build.StagingDirectory)\symbols\${{ parameters.architecture }}"
     displayName: Expand symbols zip - ${{ parameters.architecture }}
 
   - powershell: |
diff --git a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config.yml
new file mode 100644
index 0000000000..1b32bb0707
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config.yml
@@ -0,0 +1,11 @@
+steps:
+- powershell: |
+      Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
+      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
+
+      if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
+      {
+          throw "nuget.config is not created"
+      }
+  displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
+  condition: and(succeededOrFailed(), ne(variables['AzDevOpsFeed'], ''))
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index bf12a981df..3da9d24062 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -10,9 +10,9 @@ jobs:
     build: ${{ parameters.buildName }}
   steps:
 
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Run setReleaseTag.ps1'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - powershell: |
       Write-Verbose -Verbose "$(build)"
@@ -27,16 +27,8 @@ jobs:
       }
     displayName: 'Skip Alpine or fxdependent for PS v6.0.*'
 
-  - powershell: |
-      Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
+  - template: insert-nuget-config.yml
 
-      if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
-      {
-          throw "nuget.config is not created"
-      }
-    displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
-    condition: ne(Variables['SkipBuild'],'true')
 
   - powershell: |
       import-module ./build.psm1
@@ -58,16 +50,9 @@ jobs:
     buildName: ${{ parameters.buildName }}
   steps:
 
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Set ReleaseTag'
-
-  - powershell: |
-      $azureVersion = $env:ReleaseTagVar.ToLowerInvariant() -replace '\.', '-'
-      $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion"
-      Write-Host "sending " + $vstsCommandString
-      Write-Host "##$vstsCommandString"
-    displayName: 'Set Version for Blob Storage'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download Deb Artifacts'
@@ -92,6 +77,9 @@ jobs:
       downloadPath: '$(System.ArtifactsDirectory)\rpm'
     condition: and(eq(variables['buildName'], 'RPM'),succeeded())
 
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
+    displayName: 'Run Defender Scan'
+
   - task: AzureFileCopy@1
     displayName: 'Upload to azure deb and tar.gz'
     inputs:
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index 756ab4b693..68c536097e 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -11,22 +11,9 @@ jobs:
 
   steps:
 
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Set ReleaseTag Variable'
-
-  - powershell: |
-       $version = '$(ReleaseTagVar)'.Substring(1)
-       $vstsCommandString = "vso[task.setvariable variable=Version]$version"
-       Write-Host "sending " + $vstsCommandString
-       Write-Host "##$vstsCommandString"
-
-       $azureVersion = '$(ReleaseTagVar)'.ToLowerInvariant() -replace '\.', '-'
-       $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion"
-       Write-Host "sending " + $vstsCommandString
-       Write-Host "##$vstsCommandString"
-
-    displayName: 'Set Version Variable'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download artifacts'
@@ -98,4 +85,4 @@ jobs:
       ContainerName: '$(AzureVersion)'
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'Run MpCmdRun.exe'
+    displayName: 'Run Defender Scan'
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index 6f74033119..b70ded7bfb 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -11,9 +11,10 @@ jobs:
   #  inputs:
   #    <task specific inputs>
   #  displayName: '<display name of task>'
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Calculate Release Tag'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+
   - powershell: |
       # create folder
       sudo mkdir /PowerShell
@@ -21,13 +22,16 @@ jobs:
       # make the current user the owner
       sudo chown $env:USER /PowerShell
     displayName: 'Create /PowerShell'
+
   - powershell: |
       Write-Host "##vso[task.setvariable variable=PowerShellRoot]/PowerShell"
       git clone $env:BUILD_REPOSITORY_LOCALPATH /PowerShell
     displayName: Clone PowerShell Repo to /PowerShell
+
   - powershell: |
       tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
     displayName: 'Bootstrap VM'
+
   - powershell: |
       Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
       New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination "$(PowerShellRoot)/src/Modules"
@@ -37,6 +41,7 @@ jobs:
           throw "nuget.config is not created"
       }
     displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
+
   - powershell: |
       $env:AZDEVOPSFEEDPAT = '$(AzDevOpsFeedPAT)'
       $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -ExtraPackage "tar" -location $(PowerShellRoot) -Build
diff --git a/tools/releaseBuild/azureDevOps/templates/upload.yml b/tools/releaseBuild/azureDevOps/templates/upload.yml
index 092cfbf292..8003917d07 100644
--- a/tools/releaseBuild/azureDevOps/templates/upload.yml
+++ b/tools/releaseBuild/azureDevOps/templates/upload.yml
@@ -1,29 +1,30 @@
 parameters:
   architecture: x86
+  version: 6.2.0
   msi: yes
 
 steps:
 - powershell: |
-      $packagePath = "$(Build.StagingDirectory)\signedPackages\PowerShell-$(Version)-win-${{ parameters.architecture }}.msi"
+      $packagePath = "$(Build.StagingDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msi"
       if(Test-Path -Path $packagePath)
       {
           Write-Host "##vso[artifact.upload containerfolder=signedResults;artifactname=signedResults]$packagePath"
       }
   displayName: '[create script] upload signed msi - ${{ parameters.architecture }}'
-  condition: and(succeeded(), eq(variables['msi'], 'yes'))
+  condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
 
 - task: AzureFileCopy@1
   displayName: 'upload signed msi to Azure - ${{ parameters.architecture }}'
   inputs:
-    SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-$(Version)-win-${{ parameters.architecture }}.msi'
+    SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msi'
     azureSubscription: '$(AzureFileCopySubscription)'
     Destination: AzureBlob
     storage: '$(StorageAccount)'
     ContainerName: '$(AzureVersion)'
-  condition: and(succeeded(), eq(variables['msi'], 'yes'))
+  condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
 
 - powershell: |
-      $packagePath = "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-${{ parameters.architecture }}.zip"
+      $packagePath = "$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.zip"
       if(Test-Path -Path $packagePath)
       {
           Write-Host "##vso[artifact.upload containerfolder=signedResults;artifactname=signedResults]$packagePath"
@@ -33,7 +34,7 @@ steps:
 - task: AzureFileCopy@1
   displayName: 'upload signed zip to Azure - ${{ parameters.architecture }}'
   inputs:
-    SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-${{ parameters.architecture }}.zip'
+    SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.zip'
     azureSubscription: '$(AzureFileCopySubscription)'
     Destination: AzureBlob
     storage: '$(StorageAccount)'
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-build.yml
index 46241020e6..2aa279178d 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-build.yml
@@ -33,9 +33,9 @@ jobs:
       disableNugetPack: true
     condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))
 
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Set ReleaseTag Variable'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - powershell: |
        Write-Verbose -Verbose "$(Architecture)"
@@ -53,24 +53,7 @@ jobs:
        Write-Host -Object "##$vstsCommandString"
     displayName: 'Skip FxDependent for PS v6.0.*'
 
-  - powershell: |
-       Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
-       New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
-
-       if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
-       {
-           throw "nuget.config is not created"
-       }
-    displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
-    condition: ne(Variables['SkipFxDependent'], 'true')
-
-  - powershell: |
-       $version = '$(ReleaseTagVar)'.Substring(1)
-       $vstsCommandString = "vso[task.setvariable variable=Version]$version"
-       Write-Host "sending " + $vstsCommandString
-       Write-Host "##$vstsCommandString"
-    displayName: 'Set Version Varibale'
-    condition: and(succeeded(), ne(variables['SkipFxDependent'], 'true'))
+  - template: insert-nuget-config.yml
 
   - powershell: |
        docker container prune --force
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
index 244f554dad..c40cd08062 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
@@ -9,16 +9,9 @@ jobs:
 
   steps:
 
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Set ReleaseTag Variable'
-
-  - powershell: |
-       $version = '$(ReleaseTagVar)'.Substring(1)
-       $vstsCommandString = "vso[task.setvariable variable=Version]$version"
-       Write-Host "sending " + $vstsCommandString
-       Write-Host "##$vstsCommandString"
-    displayName: 'Set Version Variable'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - powershell: |
        docker container prune --force
@@ -56,15 +49,7 @@ jobs:
     # Diagnostics is not critical it passes every time it runs
     continueOnError: true
 
-  - powershell: |
-       Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
-       New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
-
-       if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
-       {
-           throw "nuget.config is not created"
-       }
-    displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
+  - template: insert-nuget-config.yml
 
   - powershell: |
        ./tools/releaseBuild/vstsbuild.ps1 -ReleaseTag $(ReleaseTagVar) -Name win-x64-component-registration
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index e3809a4e35..8edc51745b 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -15,22 +15,9 @@ jobs:
 
   steps:
 
-  - powershell: |
-      tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"
-    displayName: 'Set ReleaseTag Variable'
-
-  - powershell: |
-       $version = '$(ReleaseTagVar)'.Substring(1)
-       $vstsCommandString = "vso[task.setvariable variable=Version]$version"
-       Write-Host "sending " + $vstsCommandString
-       Write-Host "##$vstsCommandString"
-
-       $azureVersion = '$(ReleaseTagVar)'.ToLowerInvariant() -replace '\.', '-'
-       $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion"
-       Write-Host "sending " + $vstsCommandString
-       Write-Host "##$vstsCommandString"
-
-    displayName: 'Set Version Variable'
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download artifacts'
@@ -78,25 +65,30 @@ jobs:
   - template: upload.yml
     parameters:
       architecture: x86
+      version: $(version)
 
   - template: upload.yml
     parameters:
       architecture: x64
+      version: $(version)
 
   - template: upload.yml
     parameters:
       architecture: arm32
+      version: $(version)
       msi: no
 
   - template: upload.yml
     parameters:
       architecture: arm64
+      version: $(version)
       msi: no
 
   - template: upload.yml
     parameters:
       architecture: fxdependent
+      version: $(version)
       msi: no
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'Run MpCmdRun.exe'
+    displayName: 'Run Defender Scan'
diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1
index 4a86ef5644..7dbe626f08 100644
--- a/tools/releaseBuild/setReleaseTag.ps1
+++ b/tools/releaseBuild/setReleaseTag.ps1
@@ -46,3 +46,5 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
         Write-Host -Object "##$vstsCommandString"
     }
 }
+
+Write-Output $releaseTag