diff --git a/data.config b/data.config
index 6933f6cc108747a0da70084fb74ed509ce80efde..a6fb1c297b0c8db60ad526ea8b8285f3ed4f74bc 100644
--- a/data.config
+++ b/data.config
@@ -7,17 +7,39 @@ qe/6.4 $JARVIS_PROXY/QEF/q-e/archive/refs/tags/qe-6.4.1.tar.gz qe-6.4.1.tar.gz
 [DEPENDENCY]
 set -e
 set -x
-./jarvis -install hpckit/25.1.0 any
+
+if [ ${UseLatest} -eq 0 ];then
+    HPCKIT_VERSION=25.1.0
+elif [ ${UseLatest} -eq 1 ];then
+    HPCKIT_VERSION=latest
+else
+    echo "[ERROR] UseLatest=${UseLatest}, unsupported value."
+    exit 1
+fi
+
+./jarvis -install hpckit/${HPCKIT_VERSION} any
 module purge
 module use ./software/modulefiles
 cd ${JARVIS_ROOT}/tmp
+rm -rf q-e-qe-6.4.1
 tar -xzvf ${JARVIS_DOWNLOAD}/qe-6.4.1.tar.gz
 
 [ENV]
+if [ ${UseLatest} -eq 0 ];then
+    HPCKIT_VERSION=25.1.0
+elif [ ${UseLatest} -eq 1 ];then
+    HPCKIT_VERSION=latest
+else
+    echo "[ERROR] UseLatest=${UseLatest}, unsupported value."
+    exit 1
+fi
+
+BISHENG_VERSION=`ls software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles/bisheng|grep compiler|awk -F "compiler" '{print $2}'`
+HMPI_VERSION=`ls software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles/bisheng|grep hmpi|awk -F "hmpi" '{print $2}'`
 module purge
 module use ./software/modulefiles
-module load hpckit25.1.0/bisheng/compiler4.2.0.2/bishengmodule
-module load hpckit25.1.0/bisheng/hmpi25.1.0/release
+module load hpckit${HMPI_VERSION}/bisheng/compiler${BISHENG_VERSION}/bishengmodule
+module load hpckit${HMPI_VERSION}/bisheng/hmpi${HMPI_VERSION}/release
 
 [APP]
 app_name = QE
@@ -36,4 +58,4 @@ make clean
 [RUN]
 run = mpirun --allow-run-as-root -x OMP_NUM_THREADS=1 -np 64
 binary = pw.x -input test_3.in
-nodes = 1
\ No newline at end of file
+nodes = 1