diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index a316793ddbf37b1d0b94d5c757d25c006eab5c3a..eea5a7972ed32d5d035362ca8e4af2a52d005767 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -8,26 +8,18 @@ ThirdParty/v1906 https://sourceforge.net/projects/openfoam/files/v1906/ThirdPart
 [DEPENDENCY]
 set -x
 set -e
-module purge
-module use ./software/modulefiles
-./jarvis -install bisheng/3.2.0-mini com
-module load bisheng/3.2.0-mini
-export CC=clang CXX=clang++ FC=flang
-./jarvis -install hmpi/2.3.0 clang
-module load hmpi/2.3.0 
-#release zip files
-tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
-tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
+./jarvis -install hpckit/25.1.0 any
+
+source ${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/setvars.sh  --force --use-bisheng
+mkdir -p ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/
+tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz -C ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/
+tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz -C ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/
 
 
 [ENV]
-# add kgcc/mpi
 module purge
-module use ./software/modulefiles
-module load bisheng/3.2.0-mini
-module use ./software/moduledeps 
-module load bisheng3.2.0/hmpi/2.3.0
-#source /hpcrunner/OpenFOAM-v1906/etc/bashrc
+source ${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/setvars.sh  --force --use-bisheng
+export CC=mpicc CXX=mpicxx FC=mpifort
 
 export PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/bin:$PATH
 export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib:$LD_LIBRARY_PATH
@@ -45,7 +37,7 @@ export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang
 
 [APP]
 app_name = OpenFOAM
-build_dir = OpenFOAM-v1906/
+build_dir =  ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/OpenFOAM-v1906/
 binary_dir = 
 case_dir = OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/