diff --git a/templates/relion/3.1.2/data.relion.mini.all.arm.cpu.config b/templates/relion/3.1.2/data.relion.mini.all.arm.cpu.config
index 89f3b750eba911f879f4713d474141ef605f6519..917982dd8240fd3077f4560d14ada9b3f4aef979 100644
--- a/templates/relion/3.1.2/data.relion.mini.all.arm.cpu.config
+++ b/templates/relion/3.1.2/data.relion.mini.all.arm.cpu.config
@@ -5,26 +5,28 @@
 relion/3.1.2 https://github.com/3dem/relion/archive/refs/tags/3.1.2.tar.gz relion-3.1.2.tar.gz 
 
 [DEPENDENCY]
-module use ./software/modulefiles
+yum install -y cmake
 module purge
-./jarvis -install bisheng/3.2.0-mini com
-module add 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
+module load bisheng/hmpi${HPCKIT_VERSION}/release
 export CC=clang CXX=clang++ FC=flang
 ./jarvis -install wxWidgets/3.0.5 clang
-module use ./software/moduledeps/bisheng3.2.0
-module add wxWidgets/3.0.5
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
 ./jarvis -install ctffind/4.1.14/clang clang
-./jarvis -install hmpi/2.3.0 clang
+module load ctffind-clang/4.1.14
 
 [ENV]
 module purge
-module use software/modulefiles
-module use software/moduledeps/bisheng3.2.0
-module add bisheng/3.2.0-mini
-module add wxWidgets/3.0.5
-module add ctffind-clang/4.1.14
-module add hmpi/2.3.0
+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=clang CXX=clang++ FC=flang
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
+module load ctffind-clang/4.1.14
 
 [APP]
 app_name = relion
@@ -57,3 +59,4 @@ make install
 run = 
 binary = 
 nodes = 1
+
diff --git a/templates/relion/3.1.2/data.relion.mini.all.sve.arm.cpu.config b/templates/relion/3.1.2/data.relion.mini.all.sve.arm.cpu.config
index ed55a679a3077ead6765d59fc794f61a8c64d5aa..7e5cd8166ed571e33ac129fbf123b02b05cf2820 100644
--- a/templates/relion/3.1.2/data.relion.mini.all.sve.arm.cpu.config
+++ b/templates/relion/3.1.2/data.relion.mini.all.sve.arm.cpu.config
@@ -5,26 +5,28 @@
 relion/3.1.2 https://github.com/3dem/relion/archive/refs/tags/3.1.2.tar.gz relion-3.1.2.tar.gz 
 
 [DEPENDENCY]
-module use ./software/modulefiles
+yum install -y cmake
 module purge
-./jarvis -install bisheng/3.2.0-mini com
-module add 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
+module load bisheng/hmpi${HPCKIT_VERSION}/release
 export CC=clang CXX=clang++ FC=flang
 ./jarvis -install wxWidgets/3.0.5 clang
-module use ./software/moduledeps/bisheng3.2.0
-module add wxWidgets/3.0.5
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
 ./jarvis -install ctffind/4.1.14/clang clang
-./jarvis -install hmpi/2.3.0 clang
+module load ctffind-clang/4.1.14
 
 [ENV]
 module purge
-module use software/modulefiles
-module use software/moduledeps/bisheng3.2.0
-module add bisheng/3.2.0-mini
-module add wxWidgets/3.0.5
-module add ctffind-clang/4.1.14
-module add hmpi/2.3.0
+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=clang CXX=clang++ FC=flang
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
+module load ctffind-clang/4.1.14
 
 [APP]
 app_name = relion
@@ -53,3 +55,4 @@ make install
 run = 
 binary = 
 nodes = 1
+
diff --git a/templates/relion/3.1.2/data.relion.mini.altcpu.arm.cpu.config b/templates/relion/3.1.2/data.relion.mini.altcpu.arm.cpu.config
index 99d40da83f02c6c251a4d57e9f1db6a37b4e6352..3b2c5b9f40f69bd1421d27e137f1ffcab7135505 100644
--- a/templates/relion/3.1.2/data.relion.mini.altcpu.arm.cpu.config
+++ b/templates/relion/3.1.2/data.relion.mini.altcpu.arm.cpu.config
@@ -5,26 +5,28 @@
 relion/3.1.2 https://github.com/3dem/relion/archive/refs/tags/3.1.2.tar.gz relion-3.1.2.tar.gz 
 
 [DEPENDENCY]
-module use ./software/modulefiles
+yum install -y cmake
 module purge
-./jarvis -install bisheng/3.2.0-mini com
-module add 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
+module load bisheng/hmpi${HPCKIT_VERSION}/release
 export CC=clang CXX=clang++ FC=flang
 ./jarvis -install wxWidgets/3.0.5 clang
-module use ./software/moduledeps/bisheng3.2.0
-module add wxWidgets/3.0.5
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
 ./jarvis -install ctffind/4.1.14/clang clang
-./jarvis -install hmpi/2.3.0 clang
+module load ctffind-clang/4.1.14
 
 [ENV]
 module purge
-module use software/modulefiles
-module use software/moduledeps/bisheng3.2.0
-module add bisheng/3.2.0-mini
-module add wxWidgets/3.0.5
-module add ctffind-clang/4.1.14
-module add hmpi/2.3.0
+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=clang CXX=clang++ FC=flang
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
+module load ctffind-clang/4.1.14
 
 [APP]
 app_name = relion
@@ -57,3 +59,4 @@ make install
 run = 
 binary = 
 nodes = 1
+
diff --git a/templates/relion/3.1.2/data.relion.mini.arm.cpu.config b/templates/relion/3.1.2/data.relion.mini.arm.cpu.config
index f9b2bfcdfde2823b1ea911b0f4fe6a4a252a35c0..bf58d4d6342383b7f5f3329cc6063dc062c7d5b7 100644
--- a/templates/relion/3.1.2/data.relion.mini.arm.cpu.config
+++ b/templates/relion/3.1.2/data.relion.mini.arm.cpu.config
@@ -5,26 +5,28 @@
 relion/3.1.2 https://github.com/3dem/relion/archive/refs/tags/3.1.2.tar.gz relion-3.1.2.tar.gz 
 
 [DEPENDENCY]
-module use ./software/modulefiles
+yum install -y cmake
 module purge
-./jarvis -install bisheng/3.2.0-mini com
-module add 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
+module load bisheng/hmpi${HPCKIT_VERSION}/release
 export CC=clang CXX=clang++ FC=flang
 ./jarvis -install wxWidgets/3.0.5 clang
-module use ./software/moduledeps/bisheng3.2.0
-module add wxWidgets/3.0.5
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
 ./jarvis -install ctffind/4.1.14/clang clang
-./jarvis -install hmpi/2.3.0 clang
+module load ctffind-clang/4.1.14
 
 [ENV]
 module purge
-module use software/modulefiles
-module use software/moduledeps/bisheng3.2.0
-module add bisheng/3.2.0-mini
-module add wxWidgets/3.0.5
-module add ctffind-clang/4.1.14
-module add hmpi/2.3.0
+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=clang CXX=clang++ FC=flang
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
+module load ctffind-clang/4.1.14
 
 [APP]
 app_name = relion
@@ -53,3 +55,4 @@ make install
 run = 
 binary = 
 nodes = 1
+
diff --git a/templates/relion/3.1.2/data.relion.mini.loop.arm.cpu.config b/templates/relion/3.1.2/data.relion.mini.loop.arm.cpu.config
index ad8a650f83c5a93a08d04a3dd2ee55e6bceaadd9..02998ba0cb703aa9f6d6652fe6bfa3410e931e7a 100644
--- a/templates/relion/3.1.2/data.relion.mini.loop.arm.cpu.config
+++ b/templates/relion/3.1.2/data.relion.mini.loop.arm.cpu.config
@@ -5,26 +5,28 @@
 relion/3.1.2 https://github.com/3dem/relion/archive/refs/tags/3.1.2.tar.gz relion-3.1.2.tar.gz 
 
 [DEPENDENCY]
-module use ./software/modulefiles
+yum install -y cmake
 module purge
-./jarvis -install bisheng/3.2.0-mini com
-module add 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
+module load bisheng/hmpi${HPCKIT_VERSION}/release
 export CC=clang CXX=clang++ FC=flang
 ./jarvis -install wxWidgets/3.0.5 clang
-module use ./software/moduledeps/bisheng3.2.0
-module add wxWidgets/3.0.5
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
 ./jarvis -install ctffind/4.1.14/clang clang
-./jarvis -install hmpi/2.3.0 clang
+module load ctffind-clang/4.1.14
 
 [ENV]
 module purge
-module use software/modulefiles
-module use software/moduledeps/bisheng3.2.0
-module add bisheng/3.2.0-mini
-module add wxWidgets/3.0.5
-module add ctffind-clang/4.1.14
-module add hmpi/2.3.0
+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=clang CXX=clang++ FC=flang
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
+module load ctffind-clang/4.1.14
 
 [APP]
 app_name = relion
@@ -58,3 +60,4 @@ make install
 run = 
 binary = 
 nodes = 1
+
diff --git a/templates/relion/3.1.2/data.relion.mini.sve.arm.cpu.config b/templates/relion/3.1.2/data.relion.mini.sve.arm.cpu.config
index 689593aa6f300c3bd282d1eb535721f9316b217b..51b9d59e72e1a5a15d60f403350a152feea21b8d 100644
--- a/templates/relion/3.1.2/data.relion.mini.sve.arm.cpu.config
+++ b/templates/relion/3.1.2/data.relion.mini.sve.arm.cpu.config
@@ -5,26 +5,28 @@
 relion/3.1.2 https://github.com/3dem/relion/archive/refs/tags/3.1.2.tar.gz relion-3.1.2.tar.gz 
 
 [DEPENDENCY]
-module use ./software/modulefiles
+yum install -y cmake
 module purge
-./jarvis -install bisheng/3.2.0-mini com
-module add 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
+module load bisheng/hmpi${HPCKIT_VERSION}/release
 export CC=clang CXX=clang++ FC=flang
 ./jarvis -install wxWidgets/3.0.5 clang
-module use ./software/moduledeps/bisheng3.2.0
-module add wxWidgets/3.0.5
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
 ./jarvis -install ctffind/4.1.14/clang clang
-./jarvis -install hmpi/2.3.0 clang
+module load ctffind-clang/4.1.14
 
 [ENV]
 module purge
-module use software/modulefiles
-module use software/moduledeps/bisheng3.2.0
-module add bisheng/3.2.0-mini
-module add wxWidgets/3.0.5
-module add ctffind-clang/4.1.14
-module add hmpi/2.3.0
+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=clang CXX=clang++ FC=flang
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}
+module load wxWidgets/3.0.5
+module load ctffind-clang/4.1.14
 
 [APP]
 app_name = relion
@@ -52,3 +54,4 @@ make install
 run = 
 binary = 
 nodes = 1
+