diff --git a/tools/toolchain/.gitignore b/tools/toolchain/.gitignore
index c5a00960d0..178bb5ce51 100644
--- a/tools/toolchain/.gitignore
+++ b/tools/toolchain/.gitignore
@@ -1,3 +1,4 @@
 /install/
 /build/
 !/scripts/
+toolchain_settings
diff --git a/tools/toolchain/build_cp2k.sh b/tools/toolchain/build_cp2k.sh
index c09b13fd1d..c4c1303098 100755
--- a/tools/toolchain/build_cp2k.sh
+++ b/tools/toolchain/build_cp2k.sh
@@ -202,11 +202,11 @@ else
   done
 fi
 # If GPU acceleration is used, add the option about GPU acceleration
-if [ "${enable_cuda}" = "__TRUE__" ]; then
-  CMAKE_OPTIONS+=" -DCP2K_USE_ACCEL=CUDA -DCP2K_WITH_GPU=${gpu_ver}"
-elif [ "${enable_hip}" = "__TRUE__" ]; then
-  CMAKE_OPTIONS+=" -DCP2K_USE_ACCEL=HIP -DCP2K_WITH_GPU=${gpu_ver}"
-elif [ "${enable_opencl}" = "__TRUE__" ]; then
+if [ "${ENABLE_CUDA}" = "__TRUE__" ]; then
+  CMAKE_OPTIONS+=" -DCP2K_USE_ACCEL=CUDA -DCP2K_WITH_GPU=${GPU_VER}"
+elif [ "${ENABLE_HIP}" = "__TRUE__" ]; then
+  CMAKE_OPTIONS+=" -DCP2K_USE_ACCEL=HIP -DCP2K_WITH_GPU=${GPU_VER}"
+elif [ "${ENABLE_OPENCL}" = "__TRUE__" ]; then
   CMAKE_OPTIONS+=" -DCP2K_USE_ACCEL=OPENCL"
 fi
 
diff --git a/tools/toolchain/install_cp2k_toolchain.sh b/tools/toolchain/install_cp2k_toolchain.sh
index 83047cafde..4bdce9e8d3 100755
--- a/tools/toolchain/install_cp2k_toolchain.sh
+++ b/tools/toolchain/install_cp2k_toolchain.sh
@@ -161,10 +161,6 @@ OPTIONS:
                           settings after resolving known conflicts, then exit
                           without actually downloading tarballs or building
                           packages.
-  --list-cmake-options    If yes, generate a list of CMake options for building
-                          CP2K with the toolchain configuration as well as some
-                          further instructions at the end of toolchain.
-                          Default = yes
 
 The --enable-FEATURE options follow the rules:
   --enable-FEATURE=yes    Enable this particular feature.
@@ -1121,6 +1117,7 @@ elif [ "${with_sirius}" = "__DONTUSE__" ]; then
   with_pugixml="__DONTUSE__"
   with_spfft="__DONTUSE__"
   with_libvdwxc="__DONTUSE__"
+  with_fmt="__DONTUSE__"
   [ "${GPUVER}" = "no" ] && with_spla="__DONTUSE__"
 fi
 
@@ -1293,11 +1290,11 @@ write_toolchain_env "${INSTALLDIR}"
 # Write toolchain config
 echo "tool_list=\"${tool_list}\"" > "${INSTALLDIR}"/toolchain.conf
 echo "mpi_mode=\"${MPI_MODE}\"" >> "${INSTALLDIR}"/toolchain.conf
-echo "enable_cuda=\"${ENABLE_CUDA}\"" >> "${INSTALLDIR}"/toolchain.conf
-echo "enable_hip=\"${ENABLE_HIP}\"" >> "${INSTALLDIR}"/toolchain.conf
-echo "enable_opencl=\"${ENABLE_OPENCL}\"" >> "${INSTALLDIR}"/toolchain.conf
+echo "ENABLE_CUDA=\"${ENABLE_CUDA}\"" >> "${INSTALLDIR}"/toolchain.conf
+echo "ENABLE_HIP=\"${ENABLE_HIP}\"" >> "${INSTALLDIR}"/toolchain.conf
+echo "ENABLE_OPENCL=\"${ENABLE_OPENCL}\"" >> "${INSTALLDIR}"/toolchain.conf
 if [ "${ENABLE_CUDA}" == "__TRUE__" ] || [ "${ENABLE_HIP}" == "__TRUE__" ]; then
-  echo "gpu_ver=\"${GPUVER}\"" >> "${INSTALLDIR}"/toolchain.conf
+  echo "GPU_VER=\"${GPUVER}\"" >> "${INSTALLDIR}"/toolchain.conf
 fi
 for ii in ${package_list}; do
   install_mode=$(eval "echo \${with_${ii}}")
diff --git a/tools/toolchain/scripts/stage7/install_fmt.sh b/tools/toolchain/scripts/stage7/install_fmt.sh
index 6ffde7b19a..24b27e61da 100755
--- a/tools/toolchain/scripts/stage7/install_fmt.sh
+++ b/tools/toolchain/scripts/stage7/install_fmt.sh
@@ -39,6 +39,7 @@ case "$with_fmt" in
         -DCMAKE_INSTALL_PREFIX="${pkg_install_dir}" \
         -DCMAKE_INSTALL_LIBDIR="lib" \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
+        -DFMT_TEST=OFF \
         > configure.log 2>&1 || tail_excerpt configure.log
       make install -j $(get_nprocs) > make.log 2>&1 || tail_excerpt make.log
       cd ..