diff --git a/templates/Code_Saturne/7.0.6/data.Code_Saturne.arm.bs-sve.cpu.config b/templates/Code_Saturne/7.0.6/data.Code_Saturne.arm.bs-sve.cpu.config
index 7c5b155cc894016a43676821d556cd3b2f409582..cf0cc555c83d8bdb0e86e94cb429171e37f0637d 100644
--- a/templates/Code_Saturne/7.0.6/data.Code_Saturne.arm.bs-sve.cpu.config
+++ b/templates/Code_Saturne/7.0.6/data.Code_Saturne.arm.bs-sve.cpu.config
@@ -7,38 +7,44 @@ Code_Saturne/7.0.6 https://github.com/code-saturne/code_saturne/archive/refs/tag
 
 [DEPENDENCY]
 yum install automake libtool xz -y
+yum install python3-qt5 cmake patch -y
+module purge
+module use ./software/modulefiles
+./jarvis -install bisheng/2.1.0 com
+module load bisheng/2.1.0
 export CC=clang FC=flang CXX=clang++
-yum install python3-qt5  patch -y
-
-sed -i '10c  ./configure --prefix=$1 --enable-fortran --enable-static=yes --enable-parallel --enable-shared CFLAGS="-O3 -fPIC -Wno-incompatible-pointer-types-discards-qualifiers  -Wno-non-literal-null-conversion -Wno-implicit-function-declaration -Wno-implicit-int -Wno-incompatible-function-pointer-types " FCFLAGS="-O3 -fPIC" LDFLAGS="-Wl,--build-id"' package/hdf5/1.10.3/clang/install.sh
+./jarvis -install hmpi/1.1.1 bisheng
+module use ./software/moduledeps/bisheng2.1.0
+module load hmpi/1.1.1
 ./jarvis -install package/hdf5/1.10.3/clang/ bisheng+mpi
-module use /hpcrunner/software/moduledeps
-module add bisheng4.0.0-hmpi2.4.1/hdf5-clang/1.10.3
+module use ./software/moduledeps/bisheng2.1.0-hmpi1.1.1
+module load hdf5-clang/1.10.3
 export HDF5_DIR=${HDF5_CLANG_PATH}
-
 export CC=mpicc FC=mpifort CXX=mpicxx
 ./jarvis -install package/med/4.0.0/ bisheng+mpi
-module add bisheng4.0.0-hmpi2.4.1/med/4.0.0
-
-sed -i '9a sed -i "6c AR              = clang" ./Make.inc/Makefile.inc.x86-64_pc_linux2.shlib' package/scotch/6.0.9/install.sh
-sed -i '10a sed -i "9c CCS             = clang" ./Make.inc/Makefile.inc.x86-64_pc_linux2.shlib' package/scotch/6.0.9/install.sh
-sed -i '11a sed -i "11c CCD             = clang" ./Make.inc/Makefile.inc.x86-64_pc_linux2.shlib' package/scotch/6.0.9/install.sh
+module load med/4.0.0
 ./jarvis -install package/scotch/6.0.9 bisheng+mpi
-module add bisheng4.0.0-hmpi2.4.1/scotch/6.0.9
-
-./jarvis -install package/metis/5.1.0 bisheng
-module add bisheng4.0.0/metis/5.1.0
-
+module load scotch/6.0.9
+./jarvis -install package/metis/5.1.0 bisheng+mpi
+module load metis/5.1.0
+./jarvis -install kml/2.4.0/bisheng bisheng
+module load kml-bisheng/2.4.0
 
 [ENV]
-module use /hpcrunner/software/moduledeps
-module add bisheng4.0.0-hmpi2.4.1/hdf5-clang/1.10.3
+module purge
+module use ./software/modulefiles
+module load bisheng/2.1.0
+export CC=clang FC=flang CXX=clang++
+module use ./software/moduledeps/bisheng2.1.0
+module load hmpi/1.1.1
+module load kml-bisheng/2.4.0
+module use ./software/moduledeps/bisheng2.1.0-hmpi1.1.1
+module load hdf5-clang/1.10.3
 export HDF5_DIR=${HDF5_CLANG_PATH}
-module add bisheng4.0.0-hmpi2.4.1/med/4.0.0
-module add bisheng4.0.0-hmpi2.4.1/scotch/6.0.9
-module add bisheng4.0.0/metis/5.1.0
-module unload bisheng/kml/kblas/serial-nolocking
-module add bisheng/kml/kblas/omp
+export CC=mpicc FC=mpifort CXX=mpicxx
+module load med/4.0.0
+module load scotch/6.0.9
+module load metis/5.1.0
 export PATH=/hpcrunner/software/apps/bisheng4.0.0-hmpi2.4.1/Code_Saturne/7.0.6/bin:$PATH
 
 [APP]
@@ -52,11 +58,11 @@ rm code_saturne-7.0.6 -rf
 tar -xvf ${JARVIS_DOWNLOAD}/v7.0.6.tar.gz
 cd code_saturne-7.0.6
 cd src/comb/
-patch -p0 < /hpcrunner/templates/Code_Saturne/7.0.6/cplym1.patch 
+patch -p0 < ${JARVIS_ROOT}/templates/Code_Saturne/7.0.6/cplym1.patch 
 sed -i "s/#/\!#/g" cppdfr.f90
 cd -
 ./sbin/bootstrap
-CC=mpicc FC=mpifort CXX=mpicxx ./configure  --prefix=${JARVIS_ROOT}/software/apps/bisheng4.0.0-hmpi2.4.1/Code_Saturne/7.0.6 --with-blas-lib=/hpcrunner/HPCKit/latest/kml/bisheng/lib/kblas/omp --with-hdf5=${HDF5_CLANG_PATH} --with-scotch=${SCOTCH_PATH} --with-metis=${METIS_PATH} --with-med=${MED_PATH} --enable-shared --with-mpi CXXFLAGS="-O3 -std=c++11 -march=armv8.2-a -mtune=tsv110 -mcpu=linxicore9100  -mllvm -force-customized-pipeline=true" 
+CC=mpicc FC=mpifort CXX=mpicxx ./configure  --prefix=${JARVIS_ROOT}/software/apps/bisheng4.0.0-hmpi2.4.1/Code_Saturne/7.0.6 --with-blas-lib=$KML_BISHENG_PATH/lib/kblas/omp --with-hdf5=${HDF5_CLANG_PATH} --with-scotch=${SCOTCH_PATH} --with-metis=${METIS_PATH} --with-med=${MED_PATH} --enable-shared --with-mpi CXXFLAGS="-O3 -std=c++11 -march=armv8.2-a"
 make -j 32
 make install
 
diff --git a/templates/Code_Saturne/7.0.6/data.Code_Saturne.arm.bs.cpu.config b/templates/Code_Saturne/7.0.6/data.Code_Saturne.arm.bs.cpu.config
index a0bd3a87d6dcc6e87a32d74ec7e376a54107c32b..9958902d22fb42422fefe66960a6a32ea6dbc8c6 100644
--- a/templates/Code_Saturne/7.0.6/data.Code_Saturne.arm.bs.cpu.config
+++ b/templates/Code_Saturne/7.0.6/data.Code_Saturne.arm.bs.cpu.config
@@ -7,36 +7,44 @@ Code_Saturne/7.0.6 https://github.com/code-saturne/code_saturne/archive/refs/tag
 
 [DEPENDENCY]
 yum install automake libtool xz -y
+yum install python3-qt5 cmake patch -y
+module purge
+module use ./software/modulefiles
+./jarvis -install bisheng/2.1.0 com
+module load bisheng/2.1.0
 export CC=clang FC=flang CXX=clang++
-yum install python3-qt5  patch -y
-
-sed -i '10c  ./configure --prefix=$1 --enable-fortran --enable-static=yes --enable-parallel --enable-shared CFLAGS="-O3 -fPIC -Wno-incompatible-pointer-types-discards-qualifiers  -Wno-non-literal-null-conversion -Wno-implicit-function-declaration -Wno-implicit-int -Wno-incompatible-function-pointer-types " FCFLAGS="-O3 -fPIC" LDFLAGS="-Wl,--build-id"' package/hdf5/1.10.3/clang/install.sh
+./jarvis -install hmpi/1.1.1 bisheng
+module use ./software/moduledeps/bisheng2.1.0
+module load hmpi/1.1.1
 ./jarvis -install package/hdf5/1.10.3/clang/ bisheng+mpi
-module use /hpcrunner/software/moduledeps
-module add bisheng4.0.0-hmpi2.4.1/hdf5-clang/1.10.3
+module use ./software/moduledeps/bisheng2.1.0-hmpi1.1.1
+module load hdf5-clang/1.10.3
 export HDF5_DIR=${HDF5_CLANG_PATH}
-
 export CC=mpicc FC=mpifort CXX=mpicxx
 ./jarvis -install package/med/4.0.0/ bisheng+mpi
-module add bisheng4.0.0-hmpi2.4.1/med/4.0.0
-
-sed -i '9a sed -i "6c AR              = clang" ./Make.inc/Makefile.inc.x86-64_pc_linux2.shlib' package/scotch/6.0.9/install.sh
-sed -i '10a sed -i "9c CCS             = clang" ./Make.inc/Makefile.inc.x86-64_pc_linux2.shlib' package/scotch/6.0.9/install.sh
-sed -i '11a sed -i "11c CCD             = clang" ./Make.inc/Makefile.inc.x86-64_pc_linux2.shlib' package/scotch/6.0.9/install.sh
+module load med/4.0.0
 ./jarvis -install package/scotch/6.0.9 bisheng+mpi
-module add bisheng4.0.0-hmpi2.4.1/scotch/6.0.9
+module load scotch/6.0.9
 ./jarvis -install package/metis/5.1.0 bisheng+mpi
-module add bisheng4.0.0-hmpi2.4.1/metis/5.1.0
-
+module load metis/5.1.0
+./jarvis -install kml/2.4.0/bisheng bisheng
+module load kml-bisheng/2.4.0
 
 [ENV]
-module use /hpcrunner/software/moduledeps
-module add bisheng4.0.0-hmpi2.4.1/hdf5-clang/1.10.3
-module add bisheng4.0.0-hmpi2.4.1/med/4.0.0
-module add bisheng4.0.0-hmpi2.4.1/scotch/6.0.9
-module add bisheng4.0.0-hmpi2.4.1/metis/5.1.0
-module unload bisheng/kml/kblas/serial-nolocking
-module add bisheng/kml/kblas/omp
+module purge
+module use ./software/modulefiles
+module load bisheng/2.1.0
+export CC=clang FC=flang CXX=clang++
+module use ./software/moduledeps/bisheng2.1.0
+module load hmpi/1.1.1
+module load kml-bisheng/2.4.0
+module use ./software/moduledeps/bisheng2.1.0-hmpi1.1.1
+module load hdf5-clang/1.10.3
+export HDF5_DIR=${HDF5_CLANG_PATH}
+export CC=mpicc FC=mpifort CXX=mpicxx
+module load med/4.0.0
+module load scotch/6.0.9
+module load metis/5.1.0
 export PATH=/hpcrunner/software/apps/bisheng4.0.0-hmpi2.4.1/Code_Saturne/7.0.6/bin:$PATH
 
 [APP]
@@ -57,11 +65,11 @@ rm code_saturne-7.0.6 -rf
 tar -xvf ${JARVIS_DOWNLOAD}/v7.0.6.tar.gz
 cd code_saturne-7.0.6
 cd src/comb/
-patch -p0 < /hpcrunner/templates/Code_Saturne/7.0.6/cplym1.patch 
+patch -p0 < ${JARVIS_ROOT}/templates/Code_Saturne/7.0.6/cplym1.patch
 sed -i "s/#/\!#/g" cppdfr.f90
 cd -
 ./sbin/bootstrap
-CC=mpicc FC=mpifort CXX=mpicxx ./configure  --prefix=${JARVIS_ROOT}/software/apps/bisheng4.0.0-hmpi2.4.1/Code_Saturne/7.0.6 --with-blas-lib=/hpcrunner/HPCKit/latest/kml/bisheng/lib/kblas/omp --with-hdf5=${HDF5_CLANG_PATH} --with-scotch=${SCOTCH_PATH} --with-metis=${METIS_PATH} --with-med=${MED_PATH} --enable-shared --with-mpi CXXFLAGS="-O3 -std=c++11 -march=armv8.2-a" 
+CC=mpicc FC=mpifort CXX=mpicxx ./configure  --prefix=${JARVIS_ROOT}/software/apps/bisheng4.0.0-hmpi2.4.1/Code_Saturne/7.0.6 --with-blas-lib=$KML_BISHENG_PATH/lib/kblas/omp --with-hdf5=${HDF5_CLANG_PATH} --with-scotch=${SCOTCH_PATH} --with-metis=${METIS_PATH} --with-med=${MED_PATH} --enable-shared --with-mpi CXXFLAGS="-O3 -std=c++11 -march=armv8.2-a"
 make -j 32
 make install