diff --git a/images/wechat-group-qr.png b/images/wechat-group-qr.png
index 940fe63ef48f4efa45a82205c591d90ef6967519..87339ea67ae69ba94382257d822c3971039e071f 100644
Binary files a/images/wechat-group-qr.png and b/images/wechat-group-qr.png differ
diff --git a/package/lapack/3.8.0/install.sh b/package/lapack/3.8.0/install.sh
index 1a5869ee192028931cad3c1edc802e4ac1686a2b..2dde522ee434d37c2060c7707d0bd8ce97a623fb 100644
--- a/package/lapack/3.8.0/install.sh
+++ b/package/lapack/3.8.0/install.sh
@@ -3,7 +3,7 @@ set -x
 set -e
 . $DOWNLOAD_TOOL -u https://www.cp2k.org/static/downloads/lapack-3.8.0.tgz
 cd ${JARVIS_TMP}
-rm -rf lapack-3.0
+rm -rf lapack-3.8.0
 tar -xvf ${JARVIS_DOWNLOAD}/lapack-3.8.0.tgz
 cd lapack-3.8.0
 cp make.inc.example make.inc
diff --git a/package/scalapack/2.1.0/install.sh b/package/scalapack/2.1.0/install.sh
index ee61abb87d18ec05bb45d04d58df3047cb3e9d20..0438bd459704e08254520bb27e225322ac4ab364 100644
--- a/package/scalapack/2.1.0/install.sh
+++ b/package/scalapack/2.1.0/install.sh
@@ -8,10 +8,7 @@ tar  -xvf ${JARVIS_DOWNLOAD}/scalapack-2.1.0.tgz
 cd scalapack-2.1.0
 cp SLmake.inc.example SLmake.inc
 
-LAPACK_PATH=$1
-LAPACK_PATH=${LAPACK_PATH%/*/*/*}
-LAPACK_PATH=${LAPACK_PATH}/lapack/3.8.0/lib
-
+LAPACK_PATH=${LAPACK_PATH}
 sed -i "58s%-lblas%${LAPACK_PATH}/librefblas.a%g" ./SLmake.inc
 sed -i "59s%-llapack%${LAPACK_PATH}/liblapack.a%g" ./SLmake.inc
 make 
diff --git a/templates/CMAQ/5.3.1/data.CMAQ.arm_clang.cpu.config b/templates/CMAQ/5.3.1/data.CMAQ.arm_clang.cpu.config
index 9b967d4fe6939ac06fac02d1695954f9e834b1b2..75b24945cc5e09e4d522b4997ece3d258378b53e 100644
--- a/templates/CMAQ/5.3.1/data.CMAQ.arm_clang.cpu.config
+++ b/templates/CMAQ/5.3.1/data.CMAQ.arm_clang.cpu.config
@@ -5,6 +5,8 @@
 CMAQ/5.3.1 https://codeload.github.com/USEPA/CMAQ/tar.gz/CMAQv5.3.1_19Dec2019 CMAQ-CMAQv5.3.1_19Dec2019.tar.gz
 
 [DEPENDENCY]
+set -x
+set -e
 module use ${JARVIS_ROOT}/software/modulefiles
 module purge
 ./jarvis -install bisheng2/2.1.0 com
diff --git a/templates/qe/6.4/data.qe.container.opt.config b/templates/qe/6.4/data.qe.container.opt.config
index 09b9dcd0cf5305ca105896427a65857ce6aade17..4b617b187f1035fb4468b199ff7f2538ed809141 100644
--- a/templates/qe/6.4/data.qe.container.opt.config
+++ b/templates/qe/6.4/data.qe.container.opt.config
@@ -35,9 +35,9 @@ export LAPACK_LIBS="-L${JARVIS_LIBS}/bisheng2/openblas/0.3.18/lib -lopenblas"
 
 [APP]
 app_name = QE
-build_dir = /hpcrunner/q-e-qe-6.4.1/
-binary_dir = /hpcrunner/q-e-qe-6.4.1/bin/
-case_dir = /hpcrunner/workloads/QE/qe-test
+build_dir = $JARVIS_ROOT/q-e-qe-6.4.1/
+binary_dir = $JARVIS_ROOT/q-e-qe-6.4.1/bin/
+case_dir = $JARVIS_ROOT/workloads/QE/qe-test
 
 [BUILD]
 ./configure F90=flang F77=flang MPIF90=mpifort MPIF77=mpifort CC=mpicc FCFLAGS="-O3" CFLAGS="-O3" --with-scalapack=no --enable-openmp
diff --git a/templates/qe/6.4/data.qe.test.opt.config b/templates/qe/6.4/data.qe.test.opt.config
index ea85cfac33ba6b981de97a01a45db732801e8ce5..131e212b2134ebd41ddfbc26bad7f45615bf6bf2 100644
--- a/templates/qe/6.4/data.qe.test.opt.config
+++ b/templates/qe/6.4/data.qe.test.opt.config
@@ -35,9 +35,9 @@ export LAPACK_LIBS="-L${JARVIS_LIBS}/bisheng2/openblas/0.3.18/lib -lopenblas"
 
 [APP]
 app_name = QE
-build_dir = /tmp/q-e-qe-6.4.1/
-binary_dir = /tmp/q-e-qe-6.4.1/bin/
-case_dir = /tmp/qe-test/
+build_dir = $JARVIS_ROOT/q-e-qe-6.4.1/
+binary_dir = $JARVIS_ROOT/q-e-qe-6.4.1/bin/
+case_dir = $JARVIS_ROOT/workloads/QE/qe-test/
 
 [BUILD]
 ./configure F90=flang F77=flang MPIF90=mpifort MPIF77=mpifort CC=mpicc FCFLAGS="-O3" CFLAGS="-O3" --with-scalapack=no --enable-openmp
diff --git a/templates/qe/6.5/data.qe.X86.cpu.config b/templates/qe/6.5/data.qe.X86.cpu.config
index 22bf2f482097b971310769a8d46204d8ff20f88b..f4211dec0194c5bc59caae0d17837ccf193a3669 100644
--- a/templates/qe/6.5/data.qe.X86.cpu.config
+++ b/templates/qe/6.5/data.qe.X86.cpu.config
@@ -1,20 +1,28 @@
 [SERVER]
 11.11.11.11
 
+[DOWNLOAD]
+qe/6.5 https://github.com/QEF/q-e/archive/refs/tags/qe-6.5.tar.gz q-e-qe-6.5.tar.gz
+
+[DEPENDENCY]
+./jarvis -install cmake/3.23.1 any
+tar -xzvf ${JARVIS_DOWNLOAD}/q-e-qe-6.5.tar.gz
+
 [ENV]
 #add oneapi(include icc/mpi)
-source /workspace/cc/env/intel2021.4/setvars.sh
+source /opt/intel/intel2021.4/setvars.sh
 # add cmake
-module use ./modules
-module add icc/cmake
+module purge
+module use ./software/modulefiles
+module add cmake/3.23.1
 export LAPACK_LIBS="$MKLROOT/lib/intel64/libmkl_intel_lp64.a $MKLROOT/lib/intel64/libmkl_core.a"
 export BLAS_LIBS="$MKLROOT/lib/intel64/libmkl_sequential.a $MKLROOT/lib/intel64/libmkl_blacs_intelmpi_lp64.a -Wl,--end-group"
 
 [APP]
 app_name = QE
-build_dir = /home/csouser/HPCRunner/q-e-qe-6.5/
-binary_dir = /home/csouser/HPCRunner/q-e-qe-6.5/bin/
-case_dir = /home/csouser/HPCRunner/qe_large/
+build_dir = $JARVIS_ROOT/q-e-qe-6.5/
+binary_dir = $JARVIS_ROOT/q-e-qe-6.5/bin/
+case_dir = $JARVIS_ROOT/workloads/QE/qe_large/
 
 [BUILD]
 ./configure F90=ifort F77=ifort MPIF90=mpiifort MPIF77=mpiifort CC=mpicc FCFLAGS="-O3" CFLAGS="-O3" --with-scalapack=no
diff --git a/templates/qe/6.5/data.qe.arm.cpu.config b/templates/qe/6.5/data.qe.arm.cpu.config
index 918aabcbd06b381d96b1fb623b4d88e85a4cd22f..7d00ef6b6dfc4c7c126f77bae5d51d1fccce8e5b 100644
--- a/templates/qe/6.5/data.qe.arm.cpu.config
+++ b/templates/qe/6.5/data.qe.arm.cpu.config
@@ -1,19 +1,33 @@
 [SERVER]
 11.11.11.11
 
+[DOWNLOAD]
+qe/6.5 https://github.com/QEF/q-e/archive/refs/tags/qe-6.5.tar.gz q-e-qe-6.5.tar.gz
+
+[DEPENDENCY]
+./jarvis -install bisheng/2.1.0 com
+module purge
+module use ./software/modulefiles
+module load bisheng2/2.1.0
+export CC=`which clang`
+export CXX=`which clang++`
+export FC=`which flang`
+./jarvis -install hmpi/1.1.1 bisheng
+module load hmpi1/1.1.1
+tar -xzvf ${JARVIS_DOWNLOAD}/q-e-qe-6.5.tar.gz
+
 [ENV]
-source /etc/profile
-module use /opt/modulefile/
-module load gcc-9.3.1
-module load openmpi-4.1.1
-export BLAS_LIBS="-L/usr/local/kml/lib/kblas/omp -lkblas"
-export LAPACK_LIBS="-L/usr/local/kml/lib/ -lklapack_full"
+./jarvis -install bisheng/2.1.0 com
+module purge
+module use ./software/modulefiles
+module load bisheng2/2.1.0
+module load hmpi1/1.1.1
 
 [APP]
 app_name = QE
-build_dir = /home/Jarvis3-4/HPCRunner/q-e-qe-6.5/
-binary_dir = /home/Jarvis3-4/HPCRunner/q-e-qe-6.5/bin/
-case_dir = /home/Jarvis3-4/HPCRunner/workload/QE/qe-large/
+build_dir = $JARVIS_ROOT/q-e-qe-6.5/
+binary_dir = $JARVIS_ROOT/q-e-qe-6.5/bin/
+case_dir = $JARVIS_ROOT/workloads/QE/qe-test/
 
 [BUILD]
 ./configure F90=gfortran F77=gfortran MPIF90=mpifort MPIF77=mpifort CC=mpicc FCFLAGS="-O3" CFLAGS="-O3" --with-scalapack=no --enable-openmp
diff --git a/templates/qe/6.5/data.qe.arm.cpu.opt.config b/templates/qe/6.5/data.qe.arm.cpu.opt.config
index bd5d524380d8fea1da70a70161c6603573aa2e95..535c98d0d352b64e02bff7d266a7fe14871c094d 100644
--- a/templates/qe/6.5/data.qe.arm.cpu.opt.config
+++ b/templates/qe/6.5/data.qe.arm.cpu.opt.config
@@ -1,6 +1,9 @@
 [SERVER]
 11.11.11.11
 
+[DOWNLOAD]
+qe/6.5 https://github.com/QEF/q-e/archive/refs/tags/qe-6.5.tar.gz q-e-qe-6.5.tar.gz
+
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 module purge
diff --git a/templates/qe/6.8/data.qe.arm.cpu.config b/templates/qe/6.8/data.qe.arm.cpu.config
index 6269205ac47d448246cd4ad25900e6956b95f421..e0d76afbcd24ceca4e555e6d78c434fec4b494c0 100644
--- a/templates/qe/6.8/data.qe.arm.cpu.config
+++ b/templates/qe/6.8/data.qe.arm.cpu.config
@@ -1,27 +1,31 @@
 [SERVER]
 11.11.11.11
 
+[DOWNLOAD]
+qe/6.8 https://github.com/QEF/q-e/archive/refs/tags/qe-6.8.tar.gz
+
 [DEPENDENCY]
 ./jarvis -install kgcc/9.3.1 com
 module use ./software/modulefiles
-module load kgcc9
-./jarvis -install hmpi/1.1.0/gcc gcc
-module load hmpi1/1.1.0
+module load kgcc9/9.3.1
+./jarvis -install hmpi/1.1.1 gcc
+module load hmpi1/1.1.1
 ./jarvis -install kml/1.4.0/gcc gcc
+tar -xzvf $JARVIS_DOWNLOAD/qe-6.8.tar.gz
 
 [ENV]
 source /etc/profile
 module use ./software/modulefiles
-module load kgcc9
-module load hmpi1/1.1.0
+module load kgcc9/9.3.1
+module load hmpi1/1.1.1
 export BLAS_LIBS="-L/usr/local/kml/lib/kblas/omp -lkblas"
 export LAPACK_LIBS="-L/usr/local/kml/lib/ -lklapack_full"
 
 [APP]
 app_name = QE
-build_dir = /tmp/q-e-qe-6.8/
-binary_dir = /tmp/q-e-qe-6.8/bin/
-case_dir = /tmp/qe-large/
+build_dir = $JARVIS_ROOT/q-e-qe-6.8/
+binary_dir = $JARVIS_ROOT/q-e-qe-6.8/bin/
+case_dir = $JARVIS_ROOT/workloads/QE/qe-test/
 
 [BUILD]
 ./configure F90=gfortran F77=gfortran MPIF90=mpifort MPIF77=mpifort CC=mpicc FCFLAGS="-O3" CFLAGS="-O3" --with-scalapack=no --enable-openmp
@@ -32,6 +36,6 @@ make install
 make clean
 
 [RUN]
-run = mpirun --allow-run-as-root -mca btl ^vader,tcp,openib,uct -np 128
-binary = pw.x -nk 8 -input scf.in
+run = mpirun --allow-run-as-root -mca btl ^openib -np 128
+binary = pw.x -nk 8 -input test_3.in
 nodes = 1
\ No newline at end of file
diff --git a/templates/qe/6.8/data.qe.arm.gpu.config b/templates/qe/6.8/data.qe.arm.gpu.config
index af12c74f2a1a65f74f51d3369ea31cfd173e2a99..c82a4fc7ff05f160aae779004cbf41b445178c1a 100644
--- a/templates/qe/6.8/data.qe.arm.gpu.config
+++ b/templates/qe/6.8/data.qe.arm.gpu.config
@@ -2,7 +2,7 @@
 11.11.11.11
 
 [DOWNLOAD]
-kgcc/9.3.1 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/kunpeng_gcc/gcc-9.3.1-2021.03-aarch64-linux.tar.gz
+qe/6.8 https://github.com/QEF/q-e/archive/refs/tags/qe-6.8.tar.gz
 
 [DEPENDENCY]
 set -x
@@ -15,6 +15,7 @@ export CC=`which gcc`
 export CXX=`which g++`
 export FC=`which gfortran`
 ./jarvis -install openblas/0.3.18 gcc
+tar -xzvf $JARVIS_DOWNLOAD/qe-6.8.tar.gz -C q-e-qe-6.8-gpu --strip-component
 
 [ENV]
 module purge
diff --git a/templates/qe/6.8/data.qe.x86.gpu.config b/templates/qe/6.8/data.qe.x86.gpu.config
index 73aa0e7762d2da3fcc5074ca295e5221e343bc49..c2ce9f19bcfe97c951ba0d01a0cbadc7ef38de82 100644
--- a/templates/qe/6.8/data.qe.x86.gpu.config
+++ b/templates/qe/6.8/data.qe.x86.gpu.config
@@ -1,6 +1,14 @@
 [SERVER]
 11.11.11.11
 
+[DOWNLOAD]
+qe/6.8 https://github.com/QEF/q-e/archive/refs/tags/qe-6.8.tar.gz
+
+[DEPENDENCY]
+set -x
+set -e
+tar -xzvf $JARVIS_DOWNLOAD/qe-6.8.tar.gz
+
 [ENV]
 module purge
 module use /opt/nvidia/hpc_sdk/modulefiles/
@@ -8,9 +16,9 @@ module load nvhpc/21.9
 
 [APP]
 app_name = QE
-build_dir = /home/fang/HPCRunner-master/q-e-qe-6.8/
-binary_dir = /home/fang/HPCRunner-master/q-e-qe-6.8/bin/
-case_dir = /home/fang/HPCRunner-master/workloads/QE/qe-large/
+build_dir = ${JARVIS_ROOT}/q-e-qe-6.8/
+binary_dir = ${JARVIS_ROOT}/q-e-qe-6.8/bin/
+case_dir = ${JARVIS_ROOT}/workloads/QE/qe-large/
 
 [BUILD]
 set -x
diff --git a/templates/siesta/4.0.2/data.siesta.arm.kpgcc.cpu.config b/templates/siesta/4.0.2/data.siesta.arm.kpgcc.cpu.config
index c2ccb56f7712eaa655180e19f02580da865d9361..240c110c644dd96a7ae1e069cd861124962e74c5 100644
--- a/templates/siesta/4.0.2/data.siesta.arm.kpgcc.cpu.config
+++ b/templates/siesta/4.0.2/data.siesta.arm.kpgcc.cpu.config
@@ -5,6 +5,8 @@
 siesta/4.0.2 https://launchpadlibrarian.net/379220821/siesta-4.0.2.tar.gz
 
 [DEPENDENCY]
+set -x
+set -e
 module purge
 ./jarvis -install kgcc/9.3.1 com
 module use ./software/modulefiles
@@ -15,7 +17,11 @@ export FC=`which gfortran`
 ./jarvis -install hmpi/1.1.1 gcc
 module load hmpi1/1.1.1
 ./jarvis -install openblas/0.3.18 gcc
+./jarvis -install lapack/3.8.0 gcc
+export LAPACK_PATH=$JARVIS_LIBS/kgcc9/lapack/3.8.0/lib/
 ./jarvis -install scalapack/2.1.0 gcc
+cd ${JARVIS_TMP}
+tar xvf ${JARVIS_DOWNLOAD}/siesta-4.0.2.tar.gz
 
 [ENV]
 module use ./software/modulefiles
@@ -37,8 +43,6 @@ case_dir =
 
 [BUILD]
 cd ${JARVIS_TMP}
-rm -rf siesta-4.0.2
-tar xvf ${JARVIS_DOWNLOAD}/siesta-4.0.2.tar.gz
 cd siesta-4.0.2
 mkdir kpgcc_hmpi_compiler
 cd kpgcc_hmpi_compiler
diff --git a/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config b/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config
index e357ad4ab7d166c4815ba6445e71b1d1018da0d5..6a10aea6eafa0b5b058a347397d58e37886a3c33 100644
--- a/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config
+++ b/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config
@@ -18,7 +18,9 @@ export CC=mpicc CXX=mpicxx FC=mpifort
 ./jarvis -install package/pnetcdf/1.11.2 clang+mpi
 ./jarvis -install package/netcdf/4.7.0 clang+mpi
 ./jarvis -install optimized-routines/20.02/clang clang+mpi
-
+cd ${JARVIS_TMP}
+rm -rf WRF-4.2
+tar -zxvf $JARVIS_DOWNLOAD/wrf-4.2.tar.gz
 
 [ENV]
 module purge
@@ -39,8 +41,6 @@ case_dir = ${JARVIS_ROOT}/software/apps/bisheng2/hmpi1/wrf
 
 [BUILD]
 cd ${JARVIS_TMP}
-rm -rf WRF-4.2
-tar -zxvf $JARVIS_DOWNLOAD/wrf-4.2.tar.gz
 cd WRF-4.2
 
 export HDF5=`which h5diff`
@@ -48,7 +48,6 @@ export HDF5=${HDF5%/*/*}
 export NETCDF=`nc-config --prefix`
 export PNETCDF=`pnetcdf-config --prefix`
 
-
 export CPPFLAGS="-I$HDF5/include -I$PNETCDF/include -I$NETCDF/include"
 export LDFLAGS="-L$HDF5/lib -L$PNETCDF/lib -L$NETCDF/lib -lnetcdf -lnetcdff -lpnetcdf -lhdf5_hl -lhdf5 -lz"
 export WRFIO_NCD_LARGE_FILE_SUPPORT=1
@@ -103,9 +102,8 @@ sed -ri "1537s/derf/erf/g" ./phys/module_mp_SBM_polar_radar.F
 
 ./compile em_real 2>&1 | tee -a compile.log 
 
-
-
 [CLEAN]
+make clean
 
 [RUN]
 run = 
diff --git a/templates/wrf/4.2/data.wrf.arm.cpu.config b/templates/wrf/4.2/data.wrf.arm.cpu.config
index 03b096e10bb5e022ce736190a074d4d0d10da5af..9f628ea77a658c009897a008ac3b0f79c0cc0bc6 100644
--- a/templates/wrf/4.2/data.wrf.arm.cpu.config
+++ b/templates/wrf/4.2/data.wrf.arm.cpu.config
@@ -18,7 +18,8 @@ export CC=mpicc CXX=mpicxx FC=mpifort
 ./jarvis -install package/pnetcdf/1.11.2 gcc+mpi
 ./jarvis -install package/netcdf/4.7.0 gcc+mpi
 ./jarvis -install optimized-routines/20.02 gcc+mpi
-
+cd ${JARVIS_TMP}
+tar -zxvf $JARVIS_DOWNLOAD/wrf-4.2.tar.gz
 
 [ENV]
 module purge
@@ -38,8 +39,6 @@ case_dir = ${JARVIS_ROOT}/software/apps/bisheng2/hmpi1/wrf
 
 [BUILD]
 cd ${JARVIS_TMP}
-rm -rf WRF-4.2
-tar -zxvf $JARVIS_DOWNLOAD/wrf-4.2.tar.gz
 cd WRF-4.2
 
 export HDF5=`which h5diff`
@@ -47,7 +46,6 @@ export HDF5=${HDF5%/*/*}
 export NETCDF=`nc-config --prefix`
 export PNETCDF=`pnetcdf-config --prefix`
 
-
 export CPPFLAGS="-I$HDF5/include -I$PNETCDF/include -I$NETCDF/include"
 export LDFLAGS="-L$HDF5/lib -L$PNETCDF/lib -L$NETCDF/lib -lnetcdf -lnetcdff -lpnetcdf -lhdf5_hl -lhdf5 -lz"
 export WRFIO_NCD_LARGE_FILE_SUPPORT=1
@@ -106,9 +104,8 @@ echo 4 | ./configure
 
 ./compile em_real 2>&1 | tee -a compile.log 
 
-
-
 [CLEAN]
+make clean
 
 [RUN]
 run =