diff --git a/templates/wrfda/3.9.1/data.wrfda-sve.arm.cpu.config b/templates/wrfda/3.9.1/data.wrfda-sve.arm.cpu.config
index 44f79fcfd3bb15118bc01c51f3c7cbe1f72865b9..3eeb9230966a637e65100e78fc6b75dfab2f8f3c 100644
--- a/templates/wrfda/3.9.1/data.wrfda-sve.arm.cpu.config
+++ b/templates/wrfda/3.9.1/data.wrfda-sve.arm.cpu.config
@@ -11,15 +11,16 @@ set -e
 yum install tcsh -y
 yum install libtirpc-devel -y
 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/hmpi${HPCKIT_VERSION}/release
+module add bisheng/compiler${BISHENG_VERSION}/bishengmodule
 export CC=`which mpicc`
 export CXX=`which mpicxx`
 export FC=`which mpifort`
 export F77=`which mpifort`
 ./jarvis -install hdf5/1.12.0/clang bisheng+mpi
-module use ./software/moduledeps/bisheng4.2.0-hmpi25.0.0
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HPCKIT_VERSION}
 module load hdf5-clang/1.12.0
 ./jarvis -install pnetcdf/1.12.3 bisheng+mpi
 module load pnetcdf/1.12.3
@@ -30,13 +31,14 @@ module load jasper/1.900.2
 
 [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/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
+module load bisheng/hmpi${HPCKIT_VERSION}/release
+module add bisheng/compiler${BISHENG_VERSION}/bishengmodule
 export CC=`which mpicc`
 export CXX=`which mpicxx`
 export FC=`which mpifort`
 export F77=`which mpifort`
-module use ./software/moduledeps/bisheng4.2.0-hmpi25.0.0
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HPCKIT_VERSION}
 module load hdf5-clang/1.12.0
 module load pnetcdf/1.12.3
 module load netcdf-clang/4.7.4
@@ -106,3 +108,4 @@ export -p
 run = da_wrfvar.exe --help || true
 binary =
 nodes = 1
+