diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 465ece3e91e97..c43cd156bfc8e 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -85,9 +85,9 @@ jobs:
         working-directory: ${{ github.workspace }}/build_windows_${{ matrix.arch }}
         shell: cmd
         run: |
-          echo 'ALEX' > ${{ github.workspace }}\build_windows_${{ matrix.arch }}\test_${{ matrix.arch }}_${{ matrix.configuration }}.lib
-          mkdir ${{ github.workspace }}\build_windows_${{ matrix.arch }}\${{ matrix.Configuration }}\test_${{ matrix.arch }}_${{ matrix.configuration }}.lib
-          echo 'ALEX' > ${{ github.workspace }}\build_windows_${{ matrix.arch }}\${{ matrix.configuration }}\test_${{ matrix.arch }}_${{ matrix.configuration }}.lib
+          echo 'ALEX' > ${{ github.workspace }}\build_windows_${{ matrix.arch }}\test_${{ matrix.arch }}_${{ matrix.configuration }}_1.lib
+          mkdir -p ${{ github.workspace }}\build_windows_${{ matrix.arch }}\${{ matrix.Configuration }}\
+          echo 'ALEX' > ${{ github.workspace }}\build_windows_${{ matrix.arch }}\${{ matrix.configuration }}\test_${{ matrix.arch }}_${{ matrix.configuration }}_2.lib
 
           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
 
@@ -103,61 +103,61 @@ jobs:
     runs-on: windows-latest
   
     steps:
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - name: Checkout ${{ github.ref }}
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive 
+
       - name: Create directories
         shell: pwsh
         run: |
-          mkdir -p ${{ github.workspace }}/artifacts/
-          mkdir -p ${{ github.workspace }}/artifacts/build_windows_32
-          mkdir -p ${{ github.workspace }}/artifacts/build_windows_64
+          mkdir -p ${{ github.workspace }}/temp/
+          mkdir -p ${{ github.workspace }}/temp/build_windows_32
+          mkdir -p ${{ github.workspace }}/temp/build_windows_64
 
       - name: Download artifacts for gRPC 32 (Release)
         uses: actions/download-artifact@v3
         with:
           name: build_32_Release
-          path: ${{ github.workspace }}\artifacts\build_windows_32
+          path: ${{ github.workspace }}/temp/build_windows_32
           if-no-files-found: error
 
       - name: Download artifacts for gRPC 32 (Debug)
         uses: actions/download-artifact@v3
         with:
           name: build_32_Debug
-          path: ${{ github.workspace }}\artifacts\build_windows_32
+          path: ${{ github.workspace }}/temp/build_windows_32
           if-no-files-found: error
 
       - name: Download artifacts for gRPC 64 (Release)
         uses: actions/download-artifact@v3
         with:
           name: build_64_Release
-          path: ${{ github.workspace }}\artifacts\build_windows_64
+          path: ${{ github.workspace }}/temp/build_windows_64
           if-no-files-found: error
 
       - name: Download artifacts for gRPC 64 (Debug)
         uses: actions/download-artifact@v3
         with:
           name: build_64_Debug
-          path: ${{ github.workspace }}\artifacts\build_windows_64
+          path: ${{ github.workspace }}/temp/build_windows_64
           if-no-files-found: error
 
       - name: List artifacts
         shell: pwsh
         run: |
-          ls -R ${{ github.workspace }}/artifacts
-
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-
-      - name: Checkout ${{ github.ref }}
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive 
+          ls -R ${{ github.workspace }}/temp
 
       - name: Create archive
         shell: pwsh
         working-directory: ${{ github.workspace }}
         run: |
-          $source = "${{ github.workspace }}\artifacts"
+          $source = "${{ github.workspace }}\temp"
           $destination = "${{ github.workspace }}"
           ls -R $source
           $version = "${{ github.sha }}".Substring(0,7)