diff --git a/.github/workflows/rimage.yml b/.github/workflows/rimage.yml
index 302a39ed..9c3913ab 100644
--- a/.github/workflows/rimage.yml
+++ b/.github/workflows/rimage.yml
@@ -102,7 +102,9 @@ jobs:
         shell: cmd
         run: |
           call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
-          cargo build --features avif,webp --release
+          set CC=C:/Program Files/LLVM/bin/clang.exe
+          set CXX=C:/Program Files/LLVM/bin/clang++.exe
+          cargo build --all-features --release
 
       - name: Test 🧪
         if: matrix.target == 'x86_64-unknown-linux-gnu' || matrix.target == 'x86_64-apple-darwin'
diff --git a/Cargo.toml b/Cargo.toml
index 08341325..79a00168 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,14 +71,14 @@ features = ["codec-aom"]
 default-features = false
 optional = true
 
-# Because libjxl cant be build on x86_64 macos and msvc targets
-[target.'cfg(not(any(all(target_os = "macos", target_arch = "x86_64"), target_env = "msvc")))'.dependencies.jpegxl-rs]
+# Because libjxl cant be build on x86_64 macos
+[target.'cfg(not(all(target_os = "macos", target_arch = "x86_64")))'.dependencies.jpegxl-rs]
 version = "0.8.2+libjxl-0.8.2"
 default-features = false
 features = ["vendored"]
 optional = true
 
-[target.'cfg(any(all(target_os = "macos", target_arch = "x86_64"), target_env = "msvc"))'.dependencies.jpegxl-rs]
+[target.'cfg(all(target_os = "macos", target_arch = "x86_64"))'.dependencies.jpegxl-rs]
 version = "0.8.2+libjxl-0.8.2"
 default-features = false
 optional = true