diff --git a/templates/want/2.6.1/data.want.arm.bisheng.hmpi.config b/templates/want/2.6.1/data.want.arm.bisheng.hmpi.config
index 8add7d7f0c7a575c4591d2040f8f125b21e0e1f3..f9336467a2319e5bb278137160705f9c5575cd80 100644
--- a/templates/want/2.6.1/data.want.arm.bisheng.hmpi.config
+++ b/templates/want/2.6.1/data.want.arm.bisheng.hmpi.config
@@ -8,45 +8,42 @@ want/2.6.1 https://github.com/QEF/want/archive/want-2.6.1.tar.gz want-2.6.1.tar.
 set -e
 set -x
 
+./jarvis -install hpckit/${HPCKIT_VERSION} any
+source ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/setvars.sh --force --use-bisheng
+
 
-./jarvis -install bisheng/2.1.0 com
-module purge
-module use ./software/modulefiles
-module load bisheng/2.1.0
 export CC=`which clang`
 export CXX=`which clang++`
 export FC=`which flang`
-./jarvis -install hmpi/1.1.1 bisheng
-module use ./software/moduledeps/bisheng2.1.0
-module load hmpi/1.1.1
 ./jarvis -install openblas/0.3.18 bisheng
+
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
 module load openblas/0.3.18
-./jarvis -install kml/2.4.0/bisheng bisheng
-module load kml-bisheng/2.4.0
 yum install lapack* blas* -y
-tar -vzxf ${JARVIS_DOWNLOAD}/want-2.6.1.tar.gz
+mkdir -p ${JARVIS_ROOT}/software/apps
+tar -vzxf ${JARVIS_DOWNLOAD}/want-2.6.1.tar.gz -C ${JARVIS_ROOT}/software/apps
 
 [ENV]
 
 module purge
-module use ./software/modulefiles
-module load bisheng/2.1.0
+source ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/setvars.sh --force --use-bisheng
+
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load openblas/0.3.18
+
 export CC=`which clang`
 export CXX=`which clang++`
 export FC=`which flang`
-module use ./software/moduledeps/bisheng2.1.0
-module load hmpi/1.1.1
-module load openblas/0.3.18
-module load kml-bisheng/2.4.0
+export PATH=${JARVIS_ROOT}/software/apps/want-want-2.6.1/bin:$PATH
 
 [APP]
 app_name = want
-build_dir = ${JARVIS_ROOT}/want-want-2.6.1/
-binary_dir = ${JARVIS_ROOT}/want-want-2.6.1/bin/
-case_dir = ${JARVIS_ROOT}/want-want-2.6.1/bin/
+build_dir = ${JARVIS_ROOT}/software/apps/want-want-2.6.1/
+binary_dir = ${JARVIS_ROOT}/software/apps/want-want-2.6.1/bin/
+case_dir = ${JARVIS_ROOT}/software/apps/want-want-2.6.1/bin/
 
 [BUILD]
-./configure CC=gcc CFLAGS="-O3 -march=armv8.2-a -mcpu=tsv110" --build=aarch64-unknown-linux-gnu
+./configure CC=clang CFLAGS="-O3 -march=armv8.2-a -mcpu=tsv110 -Wno-implicit-function-declaration -Wno-implicit-int" --build=aarch64-unknown-linux-gnu
 make all
 
 [CLEAN]