diff --git a/cfg/gaston/cmake.profile b/cfg/gaston/cmake.profile
deleted file mode 100644
index aa827bc444b3676e163d75670b55147543fe2e90..0000000000000000000000000000000000000000
--- a/cfg/gaston/cmake.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Trilinos requires cmake >= 3.10
-add2env PATH "/opt/cmake/bin" front
diff --git a/cfg/gaston/eigen.profile b/cfg/gaston/eigen.profile
deleted file mode 100644
index b0978f22aec4fcb1c32ce619c412ce5e719babba..0000000000000000000000000000000000000000
--- a/cfg/gaston/eigen.profile
+++ /dev/null
@@ -1 +0,0 @@
-add2env INCLUDE /opt/eigen/include/eigen3
diff --git a/cfg/gaston/gcc.profile b/cfg/gaston/gcc.profile
deleted file mode 100644
index 74e8226dec1f90211c190fc8e09bb61da76d7583..0000000000000000000000000000000000000000
--- a/cfg/gaston/gcc.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-add2env PATH "/opt/gcc-10.3.0/bin" front
-add2env LD_LIBRARY_PATH "/opt/gcc-10.3.0/lib64" front
-export CC=/opt/gcc-10.3.0/bin/gcc
-export CXX=/opt/gcc-10.3.0/bin/g++
-export FC=/opt/gcc-10.3.0/bin/gfortran
-
diff --git a/cfg/gaston/gmm.profile b/cfg/gaston/gmm.profile
deleted file mode 100644
index 45f02f9641edbaa0f28d9adc082f084ccd6b60b3..0000000000000000000000000000000000000000
--- a/cfg/gaston/gmm.profile
+++ /dev/null
@@ -1 +0,0 @@
-add2env INCLUDE /opt/gmm
diff --git a/cfg/gaston/intelCommunity.bashrc b/cfg/gaston/intelCommunity.bashrc
deleted file mode 100644
index 43482b633f9fbd79eb2dc15eb695d37e0e509762..0000000000000000000000000000000000000000
--- a/cfg/gaston/intelCommunity.bashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -z "$MKLROOT" ]; then
-    . /opt/intel/mkl/bin/mklvars.sh intel64
-fi
-if [ -z "$TBBROOT" ]; then
-    . /opt/intel/tbb/bin/tbbvars.sh intel64
-fi
diff --git a/cfg/gaston/intelCommunity.profile b/cfg/gaston/intelCommunity.profile
deleted file mode 100644
index e5d1ff529ac7757508667647255d5708529c0467..0000000000000000000000000000000000000000
--- a/cfg/gaston/intelCommunity.profile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -n "$BASH_VERSION" ]; then
-    if [ -d /opt/intel ] ; then
-        . /opt/intel/mkl/bin/mklvars.sh intel64
-        . /opt/intel/tbb/bin/tbbvars.sh intel64
-    fi
-fi
diff --git a/cfg/gaston/oneApi.bashrc b/cfg/gaston/oneApi.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..0e8e36f622535c9f747cfe71949a6f9aa049e1df
--- /dev/null
+++ b/cfg/gaston/oneApi.bashrc
@@ -0,0 +1,9 @@
+# Intel compiler and/or TBB/MKL 
+#
+# 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
+fi
diff --git a/cfg/gaston/oneApi.profile b/cfg/gaston/oneApi.profile
new file mode 100644
index 0000000000000000000000000000000000000000..0272e8b34d7501a47c2e1bf541a027193046c85c
--- /dev/null
+++ b/cfg/gaston/oneApi.profile
@@ -0,0 +1,10 @@
+# Intel compiler and/or TBB/MKL 
+#
+# 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/gaston/python.profile b/cfg/gaston/python.profile
deleted file mode 100644
index e191c0280d315ed2c6f372ac0baafa131223e715..0000000000000000000000000000000000000000
--- a/cfg/gaston/python.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-add2env PATH "/opt/python/bin" front
-# added in ld.conf.d (else no way to have it in batch/at)
-#add2env LD_LIBRARY_PATH "/opt/python/lib" front
diff --git a/cfg/gaston/swig.profile b/cfg/gaston/swig.profile
deleted file mode 100644
index 253b9d9a567d0b9c22fb291b12d39680c0775d8d..0000000000000000000000000000000000000000
--- a/cfg/gaston/swig.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Trilinos requires swig >= 3.0.11
-add2env PATH "/opt/swig/bin" front
diff --git a/cfg/gaston/trilinos.profile b/cfg/gaston/trilinos.profile
deleted file mode 100644
index 42177c7358f4fbcd57f4d9cbad99f12f26846e4b..0000000000000000000000000000000000000000
--- a/cfg/gaston/trilinos.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Trilinos custom compile localement
-# (permet le FIND_PACKAGE(Trilinos) dans CMake)
-add2env CMAKE_PREFIX_PATH "/opt/trilinos" front
-add2env PYTHONPATH "/opt/trilinos/lib/python3.7/site-packages" front
diff --git a/cfg/gaston/vtk.profile b/cfg/gaston/vtk.profile
deleted file mode 100644
index b1da9c9519c59b522763f67f82d2c5fab7c7d211..0000000000000000000000000000000000000000
--- a/cfg/gaston/vtk.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-add2env LD_LIBRARY_PATH "/opt/vtk/lib/" front 
-add2env LIB "/opt/vtk/lib/cmake/vtk-7.1" front
-add2env PYTHONPATH "/opt/vtk/lib/python3.7/site-packages" front
-#add2env INCLUDE "/opt/vtk/include/vtk-7.1" front