diff --git a/.github/workflows/ubuntu-latest-icc2.yml b/.github/workflows/ubuntu-latest-icc2.yml
deleted file mode 100644
index be87a44..0000000
--- a/.github/workflows/ubuntu-latest-icc2.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: ubuntu-latest-icc-ci2
-
-on:
-  push:
-    branches:
-      - master
-      - feature/**
-      - improvement/**
-      - bugfix/**
-
-  pull_request:
-    branches:
-      - master
-      - feature/**
-      - improvement/**
-      - bugfix/**
-
-jobs:
-  build_linux_cpp:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-
-    runs-on: ubuntu-20.04
-    container: intel/oneapi-hpckit
-    steps:
-
-      - uses: actions/checkout@v2
-      - name: install_git
-        run: apt update && apt install -y git
-
-      - name: CMake
-        run: echo "/host_usr_local/bin" >> $GITHUB_PATH
-
-      - name: Install dependencies
-        run: script/ci_install_deps.sh
-
-      - name: Configure
-        run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
-
-      - name: Build
-        run: cmake --build build -j ${{ steps.cores.outputs.count }}
-
-      - name: Run
-        working-directory: build
-        run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
diff --git a/.github/workflows/win-icc.yml b/.github/workflows/win-icc.yml
new file mode 100644
index 0000000..e30fb27
--- /dev/null
+++ b/.github/workflows/win-icc.yml
@@ -0,0 +1,63 @@
+name: ubuntu-latest-icc-ci
+
+on:
+  push:
+    branches:
+      - master
+      - feature/**
+      - improvement/**
+      - bugfix/**
+
+  pull_request:
+    branches:
+      - master
+      - feature/**
+      - improvement/**
+      - bugfix/**
+
+env:
+   WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664_offline.exe
+  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
+
+jobs:
+  build_linux_cpp:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: bash
+
+   steps:
+    - uses: actions/checkout@v2
+    - name: cache install
+      id: cache-install
+      uses: actions/cache@v2
+      with:
+        path: C:\Program Files (x86)\Intel\oneAPI\compiler
+        key: install-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_CPP_COMPONENTS }}-compiler-${{ hashFiles('**/scripts/cache_exclude_windows.sh') }}
+
+    - name: Install icc
+      run: scripts/install_windows.bat $WINDOWS_HPCKIT_URL $WINDOWS_CPP_COMPONENTS
+
+    - name: CMake
+      run: echo "/host_usr_local/bin" >> $GITHUB_PATH
+
+    - name: Install dependencies
+      run: script/ci_install_deps.sh
+
+    - name: Configure
+      run: >-
+        source script/ci_setup_icc.sh &&
+        cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
+
+    - name: Build
+      run: >-
+        source script/ci_setup_icc.sh &&
+        cmake --build build -j ${{ steps.cores.outputs.count }}
+
+    - name: Run
+      working-directory: build
+      run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
diff --git a/script/ci_install_icc.bat b/script/ci_install_icc.bat
new file mode 100755
index 0000000..52654e8
--- /dev/null
+++ b/script/ci_install_icc.bat
@@ -0,0 +1,15 @@
+REM SPDX-FileCopyrightText: 2020 Intel Corporation
+REM
+REM SPDX-License-Identifier: MIT
+
+set URL=%1
+set COMPONENTS=%2
+
+curl.exe --output webimage.exe --url %URL% --retry 5 --retry-delay 5
+start /b /wait webimage.exe -s -x -f webimage_extracted --log extract.log
+del webimage.exe
+if "%COMPONENTS%"=="" (
+  webimage_extracted\bootstrapper.exe -s --action install --eula=accept --continue-with-optional-error=yes -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
+) else (
+  webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --continue-with-optional-error=yes -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
+)