diff --git a/.azure/pipelines/azure-pipelines-servermanagers-build.yml b/.azure/pipelines/azure-pipelines-servermanagers-build.yml
index 92f47244..87722935 100644
--- a/.azure/pipelines/azure-pipelines-servermanagers-build.yml
+++ b/.azure/pipelines/azure-pipelines-servermanagers-build.yml
@@ -49,6 +49,32 @@ stages:
         script: '(gci env:*).GetEnumerator() | Sort-Object Name | Out-String'
         pwsh: true
 
+    - task: PowerShell@2
+      displayName: Tag Files
+      env:
+        DEPLOY_BUILDNUMBER: $(Build.BuildNumber)
+      inputs:
+        targetType: inline
+        script: |
+          $appVersion = $env:DEPLOY_BUILDNUMBER
+          $tag = "v$appVersion"
+
+          #Write-Host "Setting up the global configuration"
+          #git config --global user.email "${{parameters.GitEmail}}"
+          #git config --global user.name "${{parameters.GitUsername}}"
+
+          Write-Host "Performing Git Tag Delete"
+          git tag -d $tag
+          git push origin :refs/tags/$tag
+
+          Write-Host "Performing Git Tag"
+          git tag $tag
+
+          Write-Host "Performing Git Tag Push"
+          git push --tags
+        pwsh: true
+        workingDirectory: '$(Build.SourcesDirectory)'
+
     - task: NuGetToolInstaller@1
       displayName: Install NuGet 4.4.1
       inputs: