diff --git a/cfg/clifton/oneApi.bashrc b/cfg/clifton/oneApi.bashrc
index b87d57ad00fd18bb47079ec45e0c325bcc1d73ff..713bc531e1ea3c5aa7ce4fb91f2f4e0d3cc3009f 100644
--- a/cfg/clifton/oneApi.bashrc
+++ b/cfg/clifton/oneApi.bashrc
@@ -8,8 +8,4 @@ if [ -d /opt/intel ] ; then
      . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
      . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
      . /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
-     #. /opt/intel/oneapi/tbb/2021.6.0/env/vars.sh intel64     
-     #. /opt/intel/oneapi/mkl/2022.1.0/env/vars.sh intel64
-     #. /opt/intel/oneapi/compiler/2022.1.0/env/vars.sh intel64
-
 fi
diff --git a/cfg/clifton/oneApi.profile b/cfg/clifton/oneApi.profile
index a3b39398ee7ab4a2a72182bd6a379ce039b77ce6..0439c8e7979673edc11cb11e1ca0e24d39ae978f 100644
--- a/cfg/clifton/oneApi.profile
+++ b/cfg/clifton/oneApi.profile
@@ -7,5 +7,4 @@ if [ -d /opt/intel ] ; then
      . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
      . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
      . /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
-
 fi
diff --git a/cfg/gaston/oneApi.bashrc b/cfg/gaston/oneApi.bashrc
index b012e1cf016574a79a004081e7e1014f8b8c4d4f..bc562e44d40b6444d909092e3a3fe93bcf65f8d2 100644
--- a/cfg/gaston/oneApi.bashrc
+++ b/cfg/gaston/oneApi.bashrc
@@ -3,8 +3,8 @@
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
 if [ -d /opt/intel ] ; then
-     . /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64
-     . /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
-     #. /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
-     #. /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64
+     #. /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
 fi
diff --git a/cfg/gaston/oneApi.profile b/cfg/gaston/oneApi.profile
index 8379b0a9a8c5f656946bf864a83ae5db5f76cf41..e47ed411922c05915b013b9c041d0f9bb0178716 100644
--- a/cfg/gaston/oneApi.profile
+++ b/cfg/gaston/oneApi.profile
@@ -3,8 +3,8 @@
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
 if [ -d /opt/intel ] ; then
-     . /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64     
-     . /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
-     #. /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
-     #. /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64     
+     #. /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
 fi
diff --git a/cfg/warson/intel.bashrc b/cfg/warson/intel.bashrc
index d9b8d9fe00afca577c2c4fd17236e23f324d85de..8560647907b75eac876295a514a4180e53d41373 100644
--- a/cfg/warson/intel.bashrc
+++ b/cfg/warson/intel.bashrc
@@ -3,6 +3,7 @@
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
 if [ -d /opt/intel ] ; then
-     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
-     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+    . /opt/intel2019/mkl/bin/mklvars.sh intel64
+    . /opt/intel2019/tbb/bin/tbbvars.sh intel64
 fi
+export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intel.profile b/cfg/warson/intel.profile
index 5ae6ec08287093508e3038ddfbd3a1441075c0a6..9862a22596eccb6f66140ff1a836d72f97fa7723 100644
--- a/cfg/warson/intel.profile
+++ b/cfg/warson/intel.profile
@@ -2,7 +2,10 @@
 #
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
-if [ -d /opt/intel ] ; then
-     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
-     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+if [ -n "$BASH_VERSION" ]; then
+    if [ -d /opt/intel ] ; then
+        . /opt/intel2019/mkl/bin/mklvars.sh intel64
+        . /opt/intel2019/tbb/bin/tbbvars.sh intel64
+    fi
 fi
+export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/mumps.profile b/cfg/warson/mumps.profile
index 2e804bb9f82fb1ae0f7370e89dd2812d09ffa170..add06f65076ac54782c9d092cd63351345b99367 100644
--- a/cfg/warson/mumps.profile
+++ b/cfg/warson/mumps.profile
@@ -1,3 +1,3 @@
-add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0/lib"
-add2env LIB "/opt/mumps-4.10.0/lib"
-add2env INCLUDE "/opt/mumps-4.10.0/include"
+add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0-intel2019/lib"
+add2env LIB "/opt/mumps-4.10.0-intel2019/lib"
+add2env INCLUDE "/opt/mumps-4.10.0-intel2019/include"