diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index 6ce2a54d66b..06de7ee4a91 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -80,7 +80,7 @@ jobs:
 
   assemble:
     # running (and uploading artifact) from windows since only that build includes etw
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Support long paths
         run: git config --system core.longpaths true
@@ -103,6 +103,17 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
+      - name: Add MSBuild to PATH
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Setup Visual Studio and Windows SDK environment
+        shell: cmd
+        run: |
+          "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath > vs.txt
+          set /p VSPATH=<vs.txt
+          echo APPINSIGHTS_VS_PATH=%VSPATH%>>%GITHUB_ENV%
+          echo APPINSIGHTS_WIN10_SDK_PATH=C:\Program Files (x86)\Windows Kits\10>>%GITHUB_ENV%
+
       - name: Assemble
         # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
         run: >
@@ -131,13 +142,13 @@ jobs:
           # TODO (trask) enable once profiler supports OpenJ9
           # - openj9
         os:
-          - windows-2019
+          - windows-2022
           - ubuntu-latest
       fail-fast: false
     steps:
       - name: Support long paths
         run: git config --system core.longpaths true
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-2022'
 
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml
index f94fe15b5aa..4e1307beb6b 100644
--- a/.github/workflows/codeql-daily.yml
+++ b/.github/workflows/codeql-daily.yml
@@ -49,7 +49,7 @@ jobs:
     permissions:
       actions: read
       security-events: write
-    runs-on: windows-latest
+    runs-on: windows-2022
     
     steps:
       - uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89ab624a944..5b8614b0b33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # CHANGELOG
+
 ## Version 3.7.3 GA (05/28/2025)
 
 ### Enhancements
diff --git a/etw/README.md b/etw/README.md
index 1e273388204..5ffc8d7de0c 100644
--- a/etw/README.md
+++ b/etw/README.md
@@ -18,7 +18,7 @@ The build should find the tools and Windows SDK, but if needed these environment
   * Default: `"%ProgramFiles(x86)%/Windows Kits/10"`
 * `APPINSIGHTS_VS_PATH`
   * Location of Visual Studio Build Tools
-  * Default: `%ProgramFiles(x86)%/Microsoft Visual Studio 14.0`
+  * Default: `%ProgramFiles(x86)%/Microsoft Visual Studio/2022/Enterprise`
 * `APPINSIGHTS_WIN_SDK_LIB_PATH`
   * Location of Windows 10 SDK library folder (for linker requirements)
   * Default: `%APPINSIGHTS_WIN10_SDK_PATH%/Lib/10.0.18362.0/um`
diff --git a/etw/native/build.gradle b/etw/native/build.gradle
index d8815058213..aa02ae5c16c 100644
--- a/etw/native/build.gradle
+++ b/etw/native/build.gradle
@@ -13,10 +13,12 @@ if (System.env.APPINSIGHTS_WIN10_SDK_PATH) {
   winSdkDir = System.env.APPINSIGHTS_WIN10_SDK_PATH
   logger.info "Windows SDK path set with environment variable, APPINSIGHTS_WIN10_SDK_PATH"
 }
-def vsToolsDir = "$programFilesX86/Microsoft Visual Studio 14.0"
+// Visual Studio Build Tools path - use environment variable if available, fallback to standard path
+def vsToolsDir = System.env.APPINSIGHTS_VS_PATH ?: "$programFilesX86/Microsoft Visual Studio/2022/BuildTools"
 if (System.env.APPINSIGHTS_VS_PATH) {
-  vsToolsDir = System.env.APPINSIGHTS_VS_PATH
-  logger.info "Visual Studio Build Tools path set with environment variable, APPINSIGHTS_VS_PATH"
+  logger.info "Visual Studio Build Tools path set with environment variable: $vsToolsDir"
+} else {
+  logger.info "Using default Visual Studio Build Tools path: $vsToolsDir"
 }
 
 logger.info "Windows SDK:  $winSdkDir"