diff --git a/scripts/ci/extends/vs2019-environment.yml b/scripts/ci/extends/vs2019-environment.yml
index fdcda29d0e70401eedf1ce88982bc916c867645b..6b6160282b573d9c55155160dee824fdad4f5335 100644
--- a/scripts/ci/extends/vs2019-environment.yml
+++ b/scripts/ci/extends/vs2019-environment.yml
@@ -1,6 +1,6 @@
 .load_vs2019_env: &load_vs2019_env
   - |
-    pushd $env:VS160COMNTOOLS
+    pushd $env:VS170COMNTOOLS
     cmd /c "VsDevCmd.bat -arch=amd64 -host_arch=amd64&set" |
     foreach {
       if ($_ -match "=") {
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 4af819824d8742fcbacd53e4300a18fb65d4ed2f..0a55707966405a340031355aa9cc43aeaded796a 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -77,6 +77,10 @@ if(OGS_USE_MKL)
     if(APPLE)
         set(_mac_ld_prefix "DY")
     endif()
+    # newer MKLs define ONEAPI_ROOT
+    if(NOT DEFINED ENV{MKLROOT} AND DEFINED ENV{ONEAPI_ROOT})
+        set(ENV{MKLROOT} "$ENV{ONEAPI_ROOT}")
+    endif()
     if(NOT GUIX_BUILD
        AND (NOT DEFINED ENV{MKLROOT}
             OR (NOT "$ENV{${_mac_ld_prefix}LD_LIBRARY_PATH}" MATCHES "intel"