diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index e9449bb5b7135..04607b00b1394 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -144,12 +144,14 @@ jobs:
         shell: pwsh
         working-directory: ${{ github.workspace }}
         run: |
-          .\create-grpc-archive.ps1 -Source ${{ github.workspace }}/artifacts -Destination ${{ github.workspace }} -Version '12345' 
+          $version = "${{ github.sha }}".Substring(0,7)
+          .\create-grpc-archive.ps1 -Source "${{ github.workspace }}\\artifacts" -Destination "${{ github.workspace }}" -Version $version
  
       - name: Upload artifacts for gRPC
         uses: actions/upload-artifact@v3
         with:
           name: grpc
           path: |
-            ${{ github.workspace }}\*.zip.12345
+            ${{ github.workspace }}\*.zip.*
+