diff --git a/cfg/gaston/oneApi.bashrc b/cfg/gaston/oneApi.bashrc
index 0e8e36f622535c9f747cfe71949a6f9aa049e1df..b012e1cf016574a79a004081e7e1014f8b8c4d4f 100644
--- a/cfg/gaston/oneApi.bashrc
+++ b/cfg/gaston/oneApi.bashrc
@@ -3,7 +3,8 @@
 # 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/intel/oneapi/compiler/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 0272e8b34d7501a47c2e1bf541a027193046c85c..8379b0a9a8c5f656946bf864a83ae5db5f76cf41 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/setvars.sh intel64
-     . /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.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
new file mode 100644
index 0000000000000000000000000000000000000000..8560647907b75eac876295a514a4180e53d41373
--- /dev/null
+++ b/cfg/warson/intel.bashrc
@@ -0,0 +1,9 @@
+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+    . /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
new file mode 100644
index 0000000000000000000000000000000000000000..9862a22596eccb6f66140ff1a836d72f97fa7723
--- /dev/null
+++ b/cfg/warson/intel.profile
@@ -0,0 +1,11 @@
+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+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/intel2019/intel.bashrc b/cfg/warson/intel2019/intel.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..8560647907b75eac876295a514a4180e53d41373
--- /dev/null
+++ b/cfg/warson/intel2019/intel.bashrc
@@ -0,0 +1,9 @@
+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+    . /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/intel2019/intel.profile b/cfg/warson/intel2019/intel.profile
new file mode 100644
index 0000000000000000000000000000000000000000..9862a22596eccb6f66140ff1a836d72f97fa7723
--- /dev/null
+++ b/cfg/warson/intel2019/intel.profile
@@ -0,0 +1,11 @@
+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+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/intel2019/mumps.profile b/cfg/warson/intel2019/mumps.profile
new file mode 100644
index 0000000000000000000000000000000000000000..add06f65076ac54782c9d092cd63351345b99367
--- /dev/null
+++ b/cfg/warson/intel2019/mumps.profile
@@ -0,0 +1,3 @@
+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"
diff --git a/cfg/warson/intel2023/intel.bashrc b/cfg/warson/intel2023/intel.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..0c51365894a0ce78bc678d0316d0c4a27041e702
--- /dev/null
+++ b/cfg/warson/intel2023/intel.bashrc
@@ -0,0 +1,8 @@
+# Intel compiler and/or TBB/MKL 
+#
+# 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
+fi
diff --git a/cfg/warson/intel2023/intel.profile b/cfg/warson/intel2023/intel.profile
new file mode 100644
index 0000000000000000000000000000000000000000..7325e0c6ef3cbf207da1cc4bbbfcdc9346f42451
--- /dev/null
+++ b/cfg/warson/intel2023/intel.profile
@@ -0,0 +1,8 @@
+# Intel compiler and/or TBB/MKL 
+#
+# 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
+fi
diff --git a/cfg/warson/intel2023/mumps.profile b/cfg/warson/intel2023/mumps.profile
new file mode 100644
index 0000000000000000000000000000000000000000..2e804bb9f82fb1ae0f7370e89dd2812d09ffa170
--- /dev/null
+++ b/cfg/warson/intel2023/mumps.profile
@@ -0,0 +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"
diff --git a/cfg/warson/oneApi.bashrc b/cfg/warson/intel2024/intel.bashrc
similarity index 78%
rename from cfg/warson/oneApi.bashrc
rename to cfg/warson/intel2024/intel.bashrc
index 0e8e36f622535c9f747cfe71949a6f9aa049e1df..d9b8d9fe00afca577c2c4fd17236e23f324d85de 100644
--- a/cfg/warson/oneApi.bashrc
+++ b/cfg/warson/intel2024/intel.bashrc
@@ -5,5 +5,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/warson/oneApi.profile b/cfg/warson/intel2024/intel.profile
similarity index 68%
rename from cfg/warson/oneApi.profile
rename to cfg/warson/intel2024/intel.profile
index 0272e8b34d7501a47c2e1bf541a027193046c85c..5ae6ec08287093508e3038ddfbd3a1441075c0a6 100644
--- a/cfg/warson/oneApi.profile
+++ b/cfg/warson/intel2024/intel.profile
@@ -3,8 +3,6 @@
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
 if [ -d /opt/intel ] ; then
-     #. /opt/intel/oneapi/setvars.sh intel64
      . /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/warson/intel2024/mumps.profile b/cfg/warson/intel2024/mumps.profile
new file mode 100644
index 0000000000000000000000000000000000000000..2e804bb9f82fb1ae0f7370e89dd2812d09ffa170
--- /dev/null
+++ b/cfg/warson/intel2024/mumps.profile
@@ -0,0 +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"
diff --git a/cfg/warson/mumps.profile b/cfg/warson/mumps.profile
index 57e0adabd33cd60503f6133f2c8fa4acd4e77105..add06f65076ac54782c9d092cd63351345b99367 100644
--- a/cfg/warson/mumps.profile
+++ b/cfg/warson/mumps.profile
@@ -1,3 +1,3 @@
-add2env LD_LIBRARY_PATH "/opt/mumps/lib"
-add2env LIB "/opt/mumps/lib"
-add2env INCLUDE "/opt/mumps/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"