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 9958902d22fb42422fefe66960a6a32ea6dbc8c6..4110f07d9b4d450d3d7f668f8c8881afefdfa473 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
@@ -6,18 +6,16 @@ Code_Saturne/7.0.6 https://github.com/code-saturne/code_saturne/archive/refs/tag
 
 
 [DEPENDENCY]
+set -e
 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++
-./jarvis -install hmpi/1.1.1 bisheng
-module use ./software/moduledeps/bisheng2.1.0
-module load hmpi/1.1.1
+./jarvis -install hpckit/${HPCKIT_VERSION} any
+module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
+module load bisheng/compiler${BISHENG_VERSION}/bishengmodule  bisheng/hmpi${HMPI_VERSION}/release
 ./jarvis -install package/hdf5/1.10.3/clang/ bisheng+mpi
-module use ./software/moduledeps/bisheng2.1.0-hmpi1.1.1
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}
 module load hdf5-clang/1.10.3
 export HDF5_DIR=${HDF5_CLANG_PATH}
 export CC=mpicc FC=mpifort CXX=mpicxx
@@ -25,36 +23,34 @@ export CC=mpicc FC=mpifort CXX=mpicxx
 module load med/4.0.0
 ./jarvis -install package/scotch/6.0.9 bisheng+mpi
 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
+./jarvis -install package/metis/4.0.3 bisheng+mpi
+module load metis/4.0.3
+
 
 [ENV]
 module purge
 module use ./software/modulefiles
-module load bisheng/2.1.0
+module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
+module add bisheng/compiler${BISHENG_VERSION}/bishengmodule  bisheng/hmpi${HMPI_VERSION}/release
 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 use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}
 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
+module load metis/4.0.3
+module load bisheng/kml${HMPI_VERSION}/kblas/multi
+export PATH=/hpcrunner/software/apps/bisheng{BISHENG_VERSION}-hmpi${HMPI_VERSION}/Code_Saturne/7.0.6/bin:$PATH
+export KML_BLAS_THREAD_TYPE=OMP
 
 [APP]
 app_name = Code_Saturne
 build_dir = ${JARVIS_TMP}
-binary_dir = ${JARVIS_ROOT}/software/apps/bisheng4.0.0-hmpi2.4.1/Code_Saturne/7.0.6
+binary_dir = ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/Code_Saturne/7.0.6
 case_dir =
 
 [BUILD]
-
 echo "======"
 echo $HDF5_CLANG_PATH
 echo $SCOTCH_PATH
@@ -69,10 +65,11 @@ 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=$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"
+CC=mpicc FC=mpifort CXX=mpicxx ./configure  --prefix=${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/Code_Saturne/7.0.6 --with-blas-lib=${JARVIS_UTILS}/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/bisheng/lib/${kp}/kblas/multi --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
 
+
 [RUN]
 run =
 binary =