diff --git a/templates/CP2K/2023.2/data.CP2K.gcc.cpu.config b/templates/CP2K/2023.2/data.CP2K.gcc.cpu.config
index 65f9880c7ce3ec75afcd0fee386fdb6eefb905c5..2709ab390325ed1538551a6fd3f95a28878a727d 100644
--- a/templates/CP2K/2023.2/data.CP2K.gcc.cpu.config
+++ b/templates/CP2K/2023.2/data.CP2K.gcc.cpu.config
@@ -28,23 +28,21 @@ Tiled-MM/v2.2 https://www.cp2k.org/static/downloads/Tiled-MM-v2.2.tar.gz
 [DEPENDENCY]
 module purge
 ./jarvis -install hpckit/${HPCKIT_VERSION} any
-
-
 module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
 module load gcc/compiler12.3.1/gccmodule
-module load gcc/hmpi2.4.3/hmpi
-module load gcc/kml2.5.0/kml
-module unload gcc/kml2.5.0/kblas/pthread 
-module load gcc/kml2.5.0/kblas/omp 
+module load gcc/hmpi${HMPI_VERSION}/release
+module load gcc/kml${HPCKIT_VERSION}/kml
+module unload gcc/kml${HPCKIT_VERSION}/kblas/pthread 
+module load gcc/kml${HPCKIT_VERSION}/kblas/multi
 
 [ENV]
 module purge
 module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
 module load gcc/compiler12.3.1/gccmodule
-module load gcc/hmpi2.4.3/hmpi
-module load gcc/kml2.5.0/kml
-module unload gcc/kml2.5.0/kblas/pthread
-module load gcc/kml2.5.0/kblas/omp
+module load gcc/hmpi${HMPI_VERSION}/release
+module load gcc/kml${HPCKIT_VERSION}/kml
+module unload gcc/kml${HPCKIT_VERSION}/kblas/pthread
+module load gcc/kml${HPCKIT_VERSION}/kblas/multi
 export PATH=${JARVIS_ROOT}/cp2k-2023.2/exe/local:$PATH
 export LD_LIBRARY_PATH=${JARVIS_ROOT}/cp2k-2023.2/tools/toolchain/install/openblas-0.3.23/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${JARVIS_ROOT}/cp2k-2023.2/tools/toolchain/install/fftw-3.3.10/lib:$LD_LIBRARY_PATH
@@ -71,6 +69,7 @@ binary_dir = ${JARVIS_ROOT}/cp2k-2023.2/exe/local
 case_dir = ${JARVIS_ROOT}/cp2k-2023.2/benchmarks/QS_mp2_rpa/32-H2O
 
 [BUILD]
+set -e
 cd ${JARVIS_ROOT}
 rm -rf cp2k-2023.2
 tar xf ${JARVIS_DOWNLOAD}/cp2k-2023.2.tar.bz2
@@ -103,15 +102,15 @@ cp ${JARVIS_ROOT}/cp2k-2023.2/tools/toolchain/install/arch/* ${JARVIS_ROOT}/cp2k
 cd ${JARVIS_ROOT}/cp2k-2023.2
 source tools/toolchain/install/setup
 sed -i "s%-g%%g" arch/local.psmp
-sed -i "s%PROFOPT)%PROFOPT) -L${JARVIS_ROOT}/cp2k-2023.2/tools/toolchain/install/fftw-3.3.10/lib -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/sve -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/noarch -lkm -lkm_l9 -lklapack_full -lkscalapack_full -lkfft -lkfft_omp -lkfft_omp_mpi -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/${kp}/kblas/omp -lkblas%g" arch/local.psmp
-sed -i "s%\$(FCFLAGS)%\$(FCFLAGS) -L${JARVIS_ROOT}/cp2k-2023.2/tools/toolchain/install/fftw-3.3.10/lib -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/sve -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/noarch -lkm -lkm_l9 -lklapack_full -lkscalapack_full -lkfft -lkfft_omp -lkfft_omp_mpi -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/${kp}/kblas/omp -lkblas%g" arch/local.psmp
-make -j 128 ARCH=local VERSION=psmp
+sed -i "s%PROFOPT)%PROFOPT) -L${JARVIS_ROOT}/cp2k-2023.2/tools/toolchain/install/fftw-3.3.10/lib -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/sve -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/noarch -lkm -lkm_l9 -lklapack_full -lkscalapack_full -lfftw3 -lkfft -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/${kp}/kblas/multi -lkblas%g" arch/local.psmp
+sed -i "s%\$(FCFLAGS)%\$(FCFLAGS) -L${JARVIS_ROOT}/cp2k-2023.2/tools/toolchain/install/fftw-3.3.10/lib -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/${kp} -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/noarch -lkm -lkm_l9 -lklapack_full -lkscalapack_full -lfftw3 -lkfft -L${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/gcc/lib/${kp}/kblas/multi -lkblas%g" arch/local.psmp
+make -j $(nproc) ARCH=local VERSION=psmp
 
 [CLEAN]
 rm -rf ${JARVIS_ROOT}/cp2k-2023.2
 
 [RUN]
-run = mpirun --allow-run-as-root -np 128 -map-by ppr:128:node:pe=1 -bind-to core -x OMP_NUM_THREADS=1
+run = mpirun --allow-run-as-root -np $(nproc) -map-by ppr:$(nproc):node:pe=1 -bind-to core -x OMP_NUM_THREADS=1
 binary = cp2k.psmp RI-MP2.inp
 nodes = 1
 
@@ -123,4 +122,4 @@ cd ${JARVIS_ROOT}/cp2k-2023.2/benchmarks/QS_mp2_rpa/32-H2O
 
 echo 3 > /proc/sys/vm/drop_caches
 
-time -p mpirun --allow-run-as-root -np 128 -map-by ppr:128:node:pe=1 -bind-to core -x OMP_NUM_THREADS=1 cp2k.psmp RI-MP2.inp
+time -p mpirun --allow-run-as-root -np $(nproc) -map-by ppr:$(nproc):node:pe=1 -bind-to core -x OMP_NUM_THREADS=1 cp2k.psmp RI-MP2.inp