diff --git a/build/azure-pipelines/build-product.yml b/build/azure-pipelines/build-product.yml
index 6913a742..c028c4ae 100644
--- a/build/azure-pipelines/build-product.yml
+++ b/build/azure-pipelines/build-product.yml
@@ -51,21 +51,15 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-        - task: PowerShell@2
-          displayName: Set last tag to variable
-          name: getVersion
-          inputs:
-            targetType: 'inline'
-            script: |
-              $VERSION_TAG = git describe --tags (git rev-list --tags --max-count=1)
-              Write-Host("##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG")
-              Write-Host($VERSION_TAG)
+        - template: build-tag.yml
+        - script: |
+            echo $(getVersion.VERSION_TAG)
         - template: build-common.yml
           parameters:
             OS: $(os)
             Arch: $(arch)
             ArtifactName: $(artifact)
-            VersionTag: $(VERSION_TAG)
+            VersionTag: $(getVersion.VERSION_TAG)
 
   - stage: CreatePackages
     displayName: Create packages to publish
@@ -73,9 +67,8 @@ stages:
     - job: Sign_and_pack
       pool:
         vmImage: 'windows-latest'
-      variables:
-        versionTag: $[ stageDependencies.Compile.Sqlcmd.outputs['getVersion.VERSION_TAG'] ]
       steps:
+      - template: build-tag.yml
       - task: DownloadPipelineArtifact@2
         inputs:
           buildType: 'current'
@@ -139,7 +132,7 @@ stages:
           rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsAmd64\Sqlcmd.exe'
           includeRootFolder: false
           archiveType: 'zip'
-          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-windows-x64.zip'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-windows-x64.zip'
 
       - task: ArchiveFiles@2
         displayName: Zip Windows arm binary
@@ -147,7 +140,7 @@ stages:
           rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsArm\Sqlcmd.exe'
           includeRootFolder: false
           archiveType: 'zip'
-          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-windows-arm.zip'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-windows-arm.zip'
   
       - task: ArchiveFiles@2
         displayName: Tar Linux amd64 binary
@@ -156,7 +149,7 @@ stages:
           includeRootFolder: false
           archiveType: 'tar'
           tarCompression: 'bz2'
-          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-linux-x64.tar.bz2'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-linux-x64.tar.bz2'
 
       - task: ArchiveFiles@2
         displayName: Tar Darwin binary
@@ -165,7 +158,7 @@ stages:
           includeRootFolder: false
           archiveType: 'tar'
           tarCompression: 'bz2'
-          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-darwin-x64.tar.bz2'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-darwin-x64.tar.bz2'
 
       - task: ArchiveFiles@2
         displayName: Tar Linux arm64 binary
@@ -174,7 +167,7 @@ stages:
           includeRootFolder: false
           archiveType: 'tar'
           tarCompression: 'bz2'
-          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-linux-arm64.tar.bz2'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-linux-arm64.tar.bz2'
   
       - task: ArchiveFiles@2
         displayName: Tar Linux s390x binary
@@ -183,7 +176,7 @@ stages:
           includeRootFolder: false
           archiveType: 'tar'
           tarCompression: 'bz2'
-          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-linux-s390x.tar.bz2'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-linux-s390x.tar.bz2'
   
       - task: PublishPipelineArtifact@1
         displayName: 'Publish release archives'
@@ -199,6 +192,6 @@ stages:
           action: 'create'
           target: '$(Build.SourceVersion)'
           tagSource: 'userSpecifiedTag'
-          tag: '$(versionTag)'
+          tag: '$(getVersion.VERSION_TAG)'
           changeLogCompareToRelease: 'lastFullRelease'
           changeLogType: 'commitBased'
diff --git a/build/azure-pipelines/build-tag.yml b/build/azure-pipelines/build-tag.yml
new file mode 100644
index 00000000..38796860
--- /dev/null
+++ b/build/azure-pipelines/build-tag.yml
@@ -0,0 +1,11 @@
+
+steps:
+- task: PowerShell@2
+  displayName: Set last tag to variable
+  name: getVersion
+  inputs:
+    targetType: 'inline'
+    script: |
+      $VERSION_TAG = git describe --tags (git rev-list --tags --max-count=1)
+      Write-Host("##vso[task.setvariable variable=VERSION_TAG;isoutput=true]$VERSION_TAG")
+      Write-Host($VERSION_TAG)