diff --git a/.github/workflows/ubuntu-intel.yml b/.github/workflows/ubuntu-intel.yml
index 5699917c..17ae4492 100644
--- a/.github/workflows/ubuntu-intel.yml
+++ b/.github/workflows/ubuntu-intel.yml
@@ -43,11 +43,6 @@ jobs:
         sh -c .github/workflows/oneapi_setup_apt_repo_linux.sh
         sudo apt install ${{ env.LINUX_CPP_COMPONENTS }} ${{ env.LINUX_FORTRAN_COMPONENTS }} ${{ env.LINUX_MKL_COMPONENTS }} ${{ env.LINUX_MPI_COMPONENTS }}
 
-    - name: Setup Intel oneAPI environment
-      run: |
-        source /opt/intel/oneapi/setvars.sh
-        printenv >> $GITHUB_ENV
-
     - name: Setup ninja
       uses: seanmiddleditch/gha-setup-ninja@master
 
@@ -56,7 +51,12 @@ jobs:
       run: cat build/CMakeFiles/CMakeConfigureLog.yaml
 
     - name: CMake build
-      run: |       
+      run: |
+        source /opt/intel/oneapi/setvars.sh
+        printenv >> $GITHUB_ENV
+        export FC=ifort
+        export CC=icc
+        export CXX=icpc
         cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
         cmake --build build -j
 
diff --git a/.github/workflows/ubuntu-intelLLVM.yml b/.github/workflows/ubuntu-intelLLVM.yml
index 7362bf21..6d6e44e7 100644
--- a/.github/workflows/ubuntu-intelLLVM.yml
+++ b/.github/workflows/ubuntu-intelLLVM.yml
@@ -56,7 +56,9 @@ jobs:
       run: cat build/CMakeFiles/CMakeConfigureLog.yaml
 
     - name: CMake build
-      run: |       
+      run: |
+        source /opt/intel/oneapi/setvars.sh
+        printenv >> $GITHUB_ENV
         export FC=ifx
         export CC=icx
         export CXX=icpx