diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index c1eaad9dc..b6b0eeb2a 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -2,6 +2,10 @@ name: Build and Test
 
 on:
   workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag Ref'
+        required: true
   pull_request:
     branches: [ master ]
   push:
@@ -24,6 +28,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
+        ref: ${{ github.events.inputs.tag }}
         fetch-depth: 0
 
     - name: Setup .NET Core
@@ -121,6 +126,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
+        ref: ${{ github.events.inputs.tag }}
         fetch-depth: 0
       
     - name: Setup .NET Core
@@ -139,19 +145,18 @@ jobs:
       if: ${{ github.event_name == 'pull_request' }}
       run: echo "PKG_SUFFIX=-PR" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-    # NOTE: Should be used in next step as well, but only used for debugging for now
     - name: Set package version
       continue-on-error: true
       run: |-
-        $PKG_GIT_VERSION="$(git describe --abbrev | % { $_.substring(1) })"
-        Write-Output "Git describe: $PKG_GIT_VERSION" 
-        Write-Output "Package suffix: $env:PKG_SUFFIX"
+        $PKG_GIT_VERSION="$(git describe --tags --abbrev | % { $_.substring(1) })"
+        Write-Output "::notice::Git describe: $PKG_GIT_VERSION" 
+        Write-Output "::notice::Package suffix: $env:PKG_SUFFIX"
         $PKG_VERSION = "${PKG_GIT_VERSION}${env:PKG_SUFFIX}"
-        Write-Output "Package version: $PKG_VERSION"
+        Write-Output "::notice::Package version: $PKG_VERSION"
         Write-Output "PKG_VERSION=$PKG_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: Create nuget package
-      run: dotnet pack ${{ env.PKG_PROJ }} -c Release --output dist ${{ env.PKG_PROPS }} /p:Version=$(git describe --abbrev | % { $_.substring(1) })${{ env.PKG_SUFFIX }}
+      run: dotnet pack ${{ env.PKG_PROJ }} -c Release --output dist ${{ env.PKG_PROPS }} /p:Version=${{ env.PKG_VERSION }}
 
     - name: Upload nuget package artifact
       uses: actions/upload-artifact@v2