diff --git a/templates/CESM/2.1.3/data.cesm.arm.cpu.singularity.config b/templates/CESM/2.1.3/data.cesm.arm.cpu.singularity.config
index 57cc9a32c817d527f88baa375f1c3468159de37a..123788618ec00c715de2edb4a8ff6c651601b95c 100644
--- a/templates/CESM/2.1.3/data.cesm.arm.cpu.singularity.config
+++ b/templates/CESM/2.1.3/data.cesm.arm.cpu.singularity.config
@@ -1,42 +1,47 @@
 [SERVER]
 11.11.11.11
+[DOWNLOAD]
+CESM/2.1.3 $JARVIS_PROXY/ESCOMP/CESM/archive/refs/tags/release-cesm2.1.3.tar.gz
 
 [DEPENDENCY]
 set -x
 set -e
 . $CHECK_ROOT && yum install -y perl-XML-LibXML time.aarch64 patch
 module purge
-module use ./software/modulefiles
-./jarvis -install bisheng/3.2.0-mini com
-module load bisheng/3.2.0-mini
+./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
 export CC=clang CXX=clang++ FC=flang
 ./jarvis -install openblas/0.3.18 clang
-./jarvis -install hmpi/2.3.0 bisheng
-module use ./software/moduledeps/bisheng3.2.0
-module load hmpi/2.3.0
 export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
 ./jarvis -install hdf5/1.12.0/clang clang+mpi
+module use software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}
 module load hdf5-clang/1.12.0
 ./jarvis -install pnetcdf/1.12.1 clang+mpi
 module load pnetcdf/1.12.1
 ./jarvis -install netcdf/4.8.1/clang clang+mpi
-./jarvis -install kml/2.2.0/bisheng bisheng
-ln -sf /usr/bin/python3 /usr/bin/python
+module load bisheng/kml${HPCKIT_VERSION}
+#ln -sf /usr/bin/python3 /usr/bin/python
+if [ ! -d "CESM-release-cesm2.1.3" ]; then
+    tar -xzvf $JARVIS_DOWNLOAD/release-cesm2.1.3.tar.gz
+fi
 
 [ENV]
 module purge
-module use /hpcrunner/software/modulefiles
-module load bisheng/3.2.0-mini
-module use /hpcrunner/software/moduledeps/bisheng3.2.0
-module load hmpi/2.3.0
+module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
+module load bisheng/compiler${BISHENG_VERSION}/bishengmodule bisheng/hmpi${HMPI_VERSION}/release
+module use software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}
+module load bisheng/kml${HPCKIT_VERSION} bisheng/kml${HPCKIT_VERSION}/kblas/multi
 module load hdf5-clang/1.12.0
 module load pnetcdf/1.12.1
 module load netcdf-clang/4.8.1
+module use software/moduledeps/bisheng${BISHENG_VERSION}
 module load openblas/0.3.18
-module load kml-bisheng/2.2.0
-export LD_LIBRARY_PATH=$KML_BISHENG_PATH/lib/kblas/omp:$LD_LIBRARY_PATH
+export KML_LIB=$JARVIS_UTILS/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/bisheng/lib
+
+export LD_LIBRARY_PATH=$KML_LIB/${kp}/kblas/multi:$LD_LIBRARY_PATH
 export NETCDF_PATH=${NETCDF_CLANG_PATH}
-export CESM_PATH=/hpcrunner/CESM-release-cesm2.1.3
+export CESM_PATH=$JARVIS_ROOT/CESM-release-cesm2.1.3
 export CIMEROOT=$CESM_PATH/cime
 export PYTHONPATH=$CIMEROOT/scripts/lib:$CIMEROOT/scripts/Tools:$PYTHONPATH
 export case_name_1=f19_g16_1node
@@ -45,19 +50,16 @@ export case_name_2=f19_g16_2nodes
 [APP]
 app_name = CESM
 build_dir = $CESM_PATH
-binary_dir = 
+binary_dir =
 case_dir = $CESM_PATH/cime/scripts/$case_name_1
 
 [BUILD]
 set -e
 set -x
-cd $JARVIS_ROOT
-./jarvis -e
-source ./env.sh
-tar -zxvf /mnt/CESM-release-cesm2.1.3.src.tgz -C /hpcrunner
-tar -zxvf /mnt/cesm.inputdata.tgz -C $CESM_PATH/
-cd ${CESM_PATH}
-patch -p1 < /hpcrunner/templates/CESM/2.1.3/CESM-2.1.3.patch
+#tar -zxvf /mnt/CESM-release-cesm2.1.3.src.tgz -C /hpcrunner
+#tar -zxvf /mnt/cesm.inputdata.tgz -C $CESM_PATH/
+#cd ${CESM_PATH}
+#patch -p1 < /hpcrunner/templates/CESM/2.1.3/CESM-2.1.3.patch
 cd $CIMEROOT/scripts
 if [ ! -d $case_name_1 ]; then
     ./create_newcase --case $case_name_1 --compset X --res f19_g16 --mach openeuler --compiler gnu
@@ -91,4 +93,4 @@ binary =
 nodes = 1
 
 [BATCH]
-#! /bin/bash
\ No newline at end of file
+#! /bin/bash