diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
index 087349a4c32a..ccc6bd79637d 100644
--- a/.github/workflows/build_package.yml
+++ b/.github/workflows/build_package.yml
@@ -60,11 +60,11 @@ jobs:
 
           # Windows packages.
           - runs-on:
-              - ${{ github.repository == 'openxla/iree' && 'windows-2022-64core' || 'windows-2022'}}
+              - ${{ github.repository == 'openxla/iree' && 'windows-2022-64core' || '7950X'}}
             build-family: windows
             build-package: py-compiler-pkg
             experimental: true
-          - runs-on: windows-2022
+          - runs-on: 7950X
             build-family: windows
             build-package: py-runtime-pkg
             experimental: true
@@ -104,19 +104,22 @@ jobs:
       # OS specific setup
       ##########################################################################
 
-      - name: Install dependencies (Windows)
-        if: "matrix.build-family == 'windows'"
-        shell: powershell
-        run: ./c/build_tools/python_deploy/install_windows_deps.ps1
+      #- name: Install dependencies (Windows)
+      #  if: "matrix.build-family == 'windows'"
+      #  shell: powershell
+      #  run: ./c/build_tools/python_deploy/install_windows_deps.ps1
       - name: "Configure MSVC (Windows)"
         if: "matrix.build-family == 'windows'"
-        uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d # v1.12.0
+        uses: egor-tensin/vs-shell@v2
+        with:
+          arch: x64
 
       ##########################################################################
       # Write version_info.json
       # Various tools will read this in order to embed release information.
       ##########################################################################
       - name: Write version info (release)
+        if: "matrix.build-family != 'windows'"
         shell: bash
         run: |
           cat << EOF > ./c/version_info.json
@@ -128,6 +131,21 @@ jobs:
           EOF
           cat ./c/version_info.json
 
+      - name: Write version info Windows (release)
+        if: "matrix.build-family == 'windows'"
+        shell: powershell
+        run: |
+          cd c
+          $verinfoprop = @{
+            'package-suffix'= "${{ github.event.inputs.package_suffix }}"
+            'package-version'= "${{ github.event.inputs.package_version }}"
+            'iree-revision'= $(git rev-parse HEAD)
+          }
+
+          $info = New-Object -TypeName PSObject -Prop $verinfoprop
+          $info = $info | ConvertTo-JSON
+          $info | Out-File "version_info.json" -Encoding "ASCII"
+
       ##########################################################################
       # Build the main distribution tarball.
       # The main distribution consists of the project being built, installed