diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index bb209984..786e2213 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -29,9 +29,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows-latest
+          - os: windows-2019
             target: x86_64-pc-windows-msvc
-          - os: windows-latest
+          - os: windows-2019
             target: aarch64-pc-windows-msvc
             #extraargs: --exclude livekit-api --exclude livekit-ffi # waiting for v0.17 of ring
           - os: macos-latest
diff --git a/.github/workflows/ffi-builds.yml b/.github/workflows/ffi-builds.yml
index ed4a11c2..faea2147 100644
--- a/.github/workflows/ffi-builds.yml
+++ b/.github/workflows/ffi-builds.yml
@@ -29,17 +29,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          #- os: windows-latest
-          #  platform: windows
-          #  dylib: livekit_ffi.dll
-          #  target: x86_64-pc-windows-msvc
-          #  name: ffi-windows-x86_64
-          #- os: windows-latest
-          #  platform: windows
-          #  dylib: livekit_ffi.dll
-          #  buildargs: --no-default-features --features "native-tls" # ring 0.16 is incompatible with win aarch64
-          #  target: aarch64-pc-windows-msvc
-          #  name: ffi-windows-arm64
+          - os: windows-2019
+            platform: windows
+            dylib: livekit_ffi.dll
+            target: x86_64-pc-windows-msvc
+            name: ffi-windows-x86_64
+          - os: windows-2019
+            platform: windows
+            dylib: livekit_ffi.dll
+            buildargs: --no-default-features --features "native-tls" # ring 0.16 is incompatible with win aarch64
+            target: aarch64-pc-windows-msvc
+            name: ffi-windows-arm64
           - os: macos-latest
             platform: macos
             dylib: liblivekit_ffi.dylib
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 15902cde..07f85c9a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,7 +31,7 @@ jobs:
       matrix:
         include:
           # Platform supports is limited for tests (no aarch64)
-          - os: windows-latest
+          - os: windows-2019
             target: x86_64-pc-windows-msvc
           - os: macos-latest
             target: x86_64-apple-darwin
diff --git a/webrtc-sys/build/src/lib.rs b/webrtc-sys/build/src/lib.rs
index c32fa23e..6b4cb1ee 100644
--- a/webrtc-sys/build/src/lib.rs
+++ b/webrtc-sys/build/src/lib.rs
@@ -26,7 +26,7 @@ use regex::Regex;
 use reqwest::StatusCode;
 
 pub const SCRATH_PATH: &str = "livekit_webrtc";
-pub const WEBRTC_TAG: &str = "webrtc-d5afc4b";
+pub const WEBRTC_TAG: &str = "webrtc-d5afc4b-2";
 pub const IGNORE_DEFINES: [&str; 2] = ["CR_CLANG_REVISION", "CR_XCODE_VERSION"];
 
 pub fn target_os() -> String {
diff --git a/webrtc-sys/libwebrtc/build_windows.cmd b/webrtc-sys/libwebrtc/build_windows.cmd
index a1ecc33a..47ca9845 100644
--- a/webrtc-sys/libwebrtc/build_windows.cmd
+++ b/webrtc-sys/libwebrtc/build_windows.cmd
@@ -65,7 +65,7 @@ if "!profile!" == "debug" (
 
 rem generate ninja for release
 call gn.bat gen %OUTPUT_DIR% --root="src" ^
-  --args="is_debug=!debug! is_clang=true target_cpu=\"!arch!\" use_custom_libcxx=false rtc_libvpx_build_vp9=true enable_libaom=true rtc_disable_check_msg=true rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false"
+  --args="is_debug=!debug! is_clang=true target_cpu=\"!arch!\" use_custom_libcxx=false rtc_libvpx_build_vp9=true enable_libaom=true rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false"
 
 rem build
 ninja.exe -C %OUTPUT_DIR% :default