diff --git a/templates/amg/1.2/data.amg-sve.arm.cpu.config b/templates/amg/1.2/data.amg-sve.arm.cpu.config
index 47d216dd75658a558cd36430ce3eb325d2e71078..db70110c995beaab3d3583df0c931fced5bc4c55 100644
--- a/templates/amg/1.2/data.amg-sve.arm.cpu.config
+++ b/templates/amg/1.2/data.amg-sve.arm.cpu.config
@@ -2,47 +2,34 @@
 11.11.11.11
 
 [DOWNLOAD]
-amg/1.2 https://github.com/LLNL/AMG/archive/refs/tags/1.2.zip 1.2.zip
 
 
 [DEPENDENCY]
-export CC=mpicc CXX=mpicxx FC=mpifort
-
+set -e
+set -x
+./jarvis -install bisheng/4.1.0 com
+module purge
+module use ./software/modulefiles
+module load bisheng/4.1.0
+./jarvis -install hmpi/2.4.1 bisheng
+module load hmpi/2.4.1
 
 [ENV]
-export CC=mpicc CXX=mpicxx FC=mpifort
-module use /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1
-module add amg/1.2
-
+module use ./software/modulefiles
+module load bisheng/4.1.0
+module load hmpi/2.4.1
 
 [APP]
 app_name = amg
 build_dir = ${JARVIS_ROOT}
-binary_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin
+binary_dir =
 case_dir =
 
 [BUILD]
-ls ${JARVIS_DOWNLOAD}/
-unzip ${JARVIS_DOWNLOAD}/1.2.zip
-cd AMG-1.2
-sed -i "46c INCLUDE_CFLAGS =  -O2 -Wno-implicit-function-declaration -Wno-implicit-int -DTIMER_USE_MPI -DHYPRE_USING_OPENMP -fopenmp -DHYPRE_HOPSCOTCH -DHYPRE_USING_PERSISTENT_COMM -DHYPRE_BIGINT -mcpu=linxicore9100  -mllvm -force-customized-pipeline=true" Makefile.include
-make -j
-
-mkdir /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin -p
-cp ./test/* /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin
- 
-mkdir /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1/amg -p
-cat >> /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1/amg/1.2 << EOF
-#%Module1.0
-set prefix /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2
-set version 1.2
-setenv AMG_PATH \$prefix
-prepend-path PATH \$prefix/bin
-EOF
-
+./jarvis -install amg/1.2 bisheng+mpi
 
 
 [RUN]
-run =  
-binary =
+run = module load amg/1.2 &&
+binary = amg
 nodes = 1
diff --git a/templates/amg/1.2/data.amg.arm.cpu.config b/templates/amg/1.2/data.amg.arm.cpu.config
index 4b95f7dacf843c87d3c43be03b587810da63b16c..49fadabc40d31ab88fd5ffa2d8c9c15afd3f32f7 100644
--- a/templates/amg/1.2/data.amg.arm.cpu.config
+++ b/templates/amg/1.2/data.amg.arm.cpu.config
@@ -6,35 +6,40 @@ amg/1.2 https://github.com/LLNL/AMG/archive/refs/tags/1.2.zip 1.2.zip
 
 
 [DEPENDENCY]
-export CC=mpicc CXX=mpicxx FC=mpifort
-
+set -e
+set -x
+./jarvis -install bisheng/4.1.0 com
+module purge
+module use ./software/modulefiles
+module load bisheng/4.1.0
+./jarvis -install hmpi/2.4.1 bisheng
+module load hmpi/2.4.1
 
 [ENV]
-export CC=mpicc CXX=mpicxx FC=mpifort
-module use /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1
-module add amg/1.2
-
+module use ./software/modulefiles
+module load bisheng/4.1.0
+module load hmpi/2.4.1
 
 [APP]
 app_name = amg
 build_dir = ${JARVIS_ROOT}
-binary_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin
+binary_dir =
 case_dir =
 
 [BUILD]
-ls ${JARVIS_DOWNLOAD}/
+rm -rf AMG-1.2
 unzip ${JARVIS_DOWNLOAD}/1.2.zip
 cd AMG-1.2
 sed -i "46c INCLUDE_CFLAGS = -O2 -Wno-implicit-function-declaration -Wno-implicit-int -DTIMER_USE_MPI -DHYPRE_USING_OPENMP -fopenmp -DHYPRE_HOPSCOTCH -DHYPRE_USING_PERSISTENT_COMM -DHYPRE_BIGINT" Makefile.include
 make -j
 
-mkdir /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin -p
-cp ./test/* /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2/bin
+mkdir ${JARVIS_LIBS}/bisheng4.1.0/hmpi2.4.1/amg/1.2/bin -p
+cp ./test/* ${JARVIS_LIBS}/bisheng4.1.0/hmpi2.4.1/amg/1.2/bin
  
-mkdir /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1/amg -p
-cat >> /hpcrunner/software/moduledeps/bisheng4.0.0-hmpi2.4.1/amg/1.2 << EOF
+mkdir ${JARVIS_MODULEDEPS}/bisheng4.1.0-hmpi2.4.1/amg -p
+cat > ${JARVIS_MODULEDEPS}/bisheng4.1.0-hmpi2.4.1/amg/1.2 << EOF
 #%Module1.0
-set prefix /hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/amg/1.2
+set prefix ${JARVIS_ROOT}/software/libs/bisheng4.1.0/hmpi2.4.1/amg/1.2
 set version 1.2
 setenv AMG_PATH \$prefix
 prepend-path PATH \$prefix/bin
@@ -43,6 +48,6 @@ EOF
 
 
 [RUN]
-run =  
-binary =
+run = module load amg/1.2 &&
+binary = amg
 nodes = 1