diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index 94c7e62905f53c72b2d1bab8b208f16fd98ebae4..eeb8de859921662aec39c2d50e27af8a6c5052ad 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -8,12 +8,12 @@ ThirdParty/v1906 https://sourceforge.net/projects/openfoam/files/v1906/ThirdPart
 [DEPENDENCY]
 set -x
 set -e
-./jarvis -install hpckit/25.1.0 any
+./jarvis -install hpckit/${HPCKIT_VERSION} 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}/
+tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz -C ${JARVIS_ROOT}/software/apps
+tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz -C ${JARVIS_ROOT}/software/apps
 
 [ENV]
 module purge
@@ -21,25 +21,25 @@ source ${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VE
 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
-export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/dummy:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/openmpi-system:$LD_LIBRARY_PATH
+export PATH=${JARVIS_ROOT}/software/apps/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/bin:$PATH
+export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/dummy:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/openmpi-system:$LD_LIBRARY_PATH
 
 
-export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang/fftw-3.3.7/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang/boost_1_64_0/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/ThirdParty-v1906/platforms/linuxARM64Clang/fftw-3.3.7/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/ThirdParty-v1906/platforms/linuxARM64Clang/boost_1_64_0/lib64:$LD_LIBRARY_PATH
 
-export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib:$LD_LIBRARY_PATH
 
-export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib/openmpi-system:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib/openmpi-system:$LD_LIBRARY_PATH
 
 
 [APP]
 app_name = OpenFOAM
-build_dir = OpenFOAM-v1906/
+build_dir = software/apps/OpenFOAM-v1906/
 binary_dir = 
-case_dir = OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
+case_dir = software/apps/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
 
 [BUILD]
 sed -i "s|export WM_COMPILER=Gcc|export WM_COMPILER=Clang|g" ./etc/bashrc