diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 1abd298ef8eeb..601a5d50fcf16 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -86,7 +86,7 @@ jobs:
         shell: cmd
         run: |
           dir
-          #msbuild.exe -maxcpucount /t:Build /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ env.PLATFORM }} /fl /flp:logfile=build-${{ matrix.arch }}.${{ matrix.configuration }}.log;verbosity=diagnostic grpc.sln
+          rem msbuild.exe -maxcpucount /t:Build /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ env.PLATFORM }} /fl /flp:logfile=build-${{ matrix.arch }}.${{ matrix.configuration }}.log;verbosity=diagnostic grpc.sln
 
       - name: Upload artifacts for gRPC ${{ matrix.arch }} bit ( ${{ matrix.configuration }} )
         uses: actions/upload-artifact@v3
@@ -102,27 +102,38 @@ jobs:
     steps:
 
       - name: Download artifacts for gRPC 32 (Release)
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v3
         with:
           name: build_32_Release
-          path: ${{ github.workspace }}\build_32_Release
+          path: ${{ github.workspace }}\artifacts
 
       - name: Download artifacts for gRPC 64 (Release)
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v3
         with:
           name: build_64_Release
-          path: ${{ github.workspace }}\build_64_Release
+          path: ${{ github.workspace }}\artifacts
 
       - name: Download artifacts for gRPC 32 (Debug)
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v3
         with:
           name: build_32_Debug
-          path: ${{ github.workspace }}\build_32_Debug
+          path: ${{ github.workspace }}\artifacts
 
       - name: Download artifacts for gRPC 64 (Debug)
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v3
         with:
           name: build_64_Debug
-          path: ${{ github.workspace }}\build_64_Debug
+          path: ${{ github.workspace }}\artifacts
 
+      - name: List artifacts
+        shell: pwsh
+        run: |
+          ls -R ${{ github.workspace }}/artifacts
+
+      - name: Create archive
+        shell: pwsh
+        working-directory: ${{ github.workspace }}
+        run: |
+          .\create-grpc-archive.ps1 -Source ${{ github.workspace }}/artifacts -Destination ${{ github.workspace }} -Version '12345' 
+