diff --git a/templates/petsc/3.16/data.petsc.arm.cpu.config b/templates/petsc/3.16/data.petsc.arm.cpu.config
index 943df56bd14a74a21364072dd153b8162030ac37..70178482977c68a66926abd748f71a720a35a65d 100644
--- a/templates/petsc/3.16/data.petsc.arm.cpu.config
+++ b/templates/petsc/3.16/data.petsc.arm.cpu.config
@@ -8,9 +8,10 @@ refs/3.16 https://github.com/petsc/petsc/archive/refs/heads/release-3.16.zip
 set -e
 set -x
 module purge
-./jarvis -install hpckit/25.0.0 com
-module use ./software/compiler/hpckit/25.0.0/HPCKit/25.0.0/modulefiles
-module add bisheng/compiler4.2.0/bishengmodule bisheng/hmpi25.0.0/hmpi
+./jarvis -install hpckit/${HPCKIT_VERSION} any
+module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
+module load bisheng/compiler${BISHENG_VERSION}/bishengmodule
+module load bisheng/hmpi${HPCKIT_VERSION}/release
 export CC=`which clang`
 export CXX=`which clang++`
 export FC=`which flang`
@@ -19,8 +20,9 @@ unzip ${JARVIS_DOWNLOAD}/release-3.16.zip
 
 [ENV]
 module purge
-module use ./software/compiler/hpckit/25.0.0/HPCKit/25.0.0/modulefiles
-module add bisheng/compiler4.2.0/bishengmodule bisheng/hmpi25.0.0/hmpi
+module use ./software/compiler/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
+module load bisheng/compiler${BISHENG_VERSION}/bishengmodule
+module load bisheng/hmpi${HPCKIT_VERSION}/release
 export CC=`which clang`
 export CXX=`which clang++`
 export FC=`which flang`
@@ -42,3 +44,4 @@ run = make check
 binary =
 nodes = 1
 
+