diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml
index 1ee7a2c..eb9b34e 100644
--- a/.github/workflows/ubuntu-latest-icc.yml
+++ b/.github/workflows/ubuntu-latest-icc.yml
@@ -26,9 +26,6 @@ jobs:
       run:
         shell: bash
 
-    env:
-      CXX: dpcpp
-
     steps:
     - uses: actions/checkout@v2
 
@@ -44,6 +41,9 @@ jobs:
     - name: Install icc
       run: script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
 
+    - name: Setup icc
+      run: source script/ci_setup_icc.sh
+
     - name: Install dependencies
       run: script/ci_install_deps.sh
 
diff --git a/script/ci_setup_icc.sh b/script/ci_setup_icc.sh
new file mode 100755
index 0000000..d17d89b
--- /dev/null
+++ b/script/ci_setup_icc.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# SPDX-FileCopyrightText: 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+#shellcheck disable=SC2010
+LATEST_VERSION=$(ls -1 /opt/intel/oneapi/compiler/ | grep -v latest | sort | tail -1)
+# shellcheck source=/dev/null
+source /opt/intel/oneapi/compiler/"$LATEST_VERSION"/env/vars.sh
+CXX=dpcpp