diff --git a/templates/swan/41.31/swan.singularity.arm.bisheng.SVE.cpu.config b/templates/swan/41.31/swan.singularity.arm.bisheng.SVE.cpu.config
index 281b5dbbfb21054e87760ce80e7e6b4f2e9fdeb7..042e2b95533442736a0c53f9f73f7db0ede909c5 100644
--- a/templates/swan/41.31/swan.singularity.arm.bisheng.SVE.cpu.config
+++ b/templates/swan/41.31/swan.singularity.arm.bisheng.SVE.cpu.config
@@ -8,28 +8,36 @@
 set -x
 set -e
 
-#./jarvis -install package/bisheng/4.0 com
-#module purge
-#module use ./software/modulefiles
-#module load bisheng/4.0.0
-#./jarvis -install package/hmpi/2.4.1 bisheng
-#module load hmpi/2.4.1
+module purge
+./jarvis -install package/hpckit/24.0.0 any
+module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles
+module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi
 export CC=`which clang`
 export CXX=`which clang++`
-unset FC F77
-module use ./software/moduledeps/bisheng4.0.0-hmpi2.4.1/
-./jarvis -install package/hdf5/1.12.0/clang bisheng+mpi
+export FC=`which flang`
+export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
+./jarvis -install hdf5/1.12.0/clang clang+mpi
+module use ./software/moduledeps/bisheng4.1.0-hmpi24.12.30
 module load hdf5-clang/1.12.0
-./jarvis -install package/pnetcdf/1.12.3 bisheng+mpi
-module load pnetcdf/1.12.3
+./jarvis -install pnetcdf/1.14.0 clang+mpi
+module load pnetcdf/1.14.0
 ./jarvis -install package/netcdf/4.7.4/clang bisheng+mpi
 module load netcdf-clang/4.7.4
 export NETCDFROOT=$NETCDF_CLANG_PATH
 
 [ENV]
-#module purge
-module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.0.0-hmpi2.4.1
-module load hdf5-clang/1.12.0 pnetcdf/1.12.3 netcdf-clang/4.7.4
+module purge
+module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles
+module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi
+export CC=`which clang`
+export CXX=`which clang++`
+export FC=`which flang`
+export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
+module use ./software/moduledeps/bisheng4.1.0-hmpi24.12.30
+module load hdf5-clang/1.12.0
+module load pnetcdf/1.14.0
+module load netcdf-clang/4.7.4
+export NETCDFROOT=$NETCDF_CLANG_PATH
 
 [APP]
 app_name = swan
@@ -46,18 +54,17 @@ module list
 
 cd ${JARVIS_TMP}
 rm -rf swan
-git clone https://github.com/abby-1225/swan.git 
+git clone https://github.com/abby-1225/swan.git
 cd ${JARVIS_ROOT}
 tar -xf ${JARVIS_TMP}/swan/swan4131.tar.gz
 cd swan4131
 sed -i '788s/\$_/"gfortran"/' platform.pl
-make config
+export FC=gfortran && make config
 sed -i "4s/gfortran/flang/" macros.inc
 sed -i "8s/-w/-w -mcpu=linxicore9100 -mllvm -force-customized-pipeline=true/" macros.inc
 sed -i "14s/=/= \$(NETCDF_CLANG_PATH)/" macros.inc
 make mpi
 
-
 [RUN]
 run = 
 binary = 
diff --git a/templates/swan/41.31/swan.singularity.arm.bisheng.cpu.config b/templates/swan/41.31/swan.singularity.arm.bisheng.cpu.config
index accee9a72c7dd1dda9f4f7c4855804459f0594fa..8dfe9e2b8e339a2a9691e3b8cc49a57b67a18d3f 100644
--- a/templates/swan/41.31/swan.singularity.arm.bisheng.cpu.config
+++ b/templates/swan/41.31/swan.singularity.arm.bisheng.cpu.config
@@ -8,34 +8,43 @@
 set -x
 set -e
 
-#./jarvis -install package/bisheng/4.0 com
-#module purge
-#module use ./software/modulefiles
-#module load bisheng/4.0.0
-#./jarvis -install package/hmpi/2.4.1 bisheng
-#module load hmpi/2.4.1
+module purge
+./jarvis -install package/hpckit/24.0.0 any
+module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles
+module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi
 export CC=`which clang`
 export CXX=`which clang++`
-unset FC F77
-module use ./software/moduledeps/bisheng4.0.0-hmpi2.4.1/
-./jarvis -install package/hdf5/1.12.0/clang bisheng+mpi
+export FC=`which flang`
+export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
+./jarvis -install hdf5/1.12.0/clang clang+mpi
+module use ./software/moduledeps/bisheng4.1.0-hmpi24.12.30
 module load hdf5-clang/1.12.0
-./jarvis -install package/pnetcdf/1.12.3 bisheng+mpi
-module load pnetcdf/1.12.3
+./jarvis -install pnetcdf/1.14.0 clang+mpi
+module load pnetcdf/1.14.0
 ./jarvis -install package/netcdf/4.7.4/clang bisheng+mpi
 module load netcdf-clang/4.7.4
 export NETCDFROOT=$NETCDF_CLANG_PATH
 
 [ENV]
-#module purge
-module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.0.0-hmpi2.4.1
-module load hdf5-clang/1.12.0 pnetcdf/1.12.3 netcdf-clang/4.7.4
+module purge
+module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles
+module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi
+export CC=`which clang`
+export CXX=`which clang++`
+export FC=`which flang`
+export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
+module use ./software/moduledeps/bisheng4.1.0-hmpi24.12.30
+module load hdf5-clang/1.12.0
+module load pnetcdf/1.14.0
+module load netcdf-clang/4.7.4
+export NETCDFROOT=$NETCDF_CLANG_PATH
+
 
 [APP]
 app_name = swan
 build_dir = ${JARVIS_ROOT}/swan4131/
 binary_dir = ${JARVIS_ROOT}/swan4131/
-case_dir = 
+case_dir =
 
 [BUILD]
 set -e
@@ -46,21 +55,21 @@ module list
 
 cd ${JARVIS_TMP}
 rm -rf swan
-git clone https://github.com/abby-1225/swan.git 
+git clone https://github.com/abby-1225/swan.git
 cd ${JARVIS_ROOT}
 tar -xf ${JARVIS_TMP}/swan/swan4131.tar.gz
 cd swan4131
 sed -i '788s/\$_/"gfortran"/' platform.pl
-make config
+export FC=gfortran && make config
 sed -i "4s/gfortran/flang/" macros.inc
 sed -i "14s/=/= \$(NETCDF_CLANG_PATH)/" macros.inc
 make mpi
 
-
 [RUN]
-run = 
-binary = 
-nodes = 1 
+run =
+binary =
+nodes = 1
 
 [BATCH]
 #! /bin/bash
+