diff --git a/templates/elmer/8.4/data.elmer.amd.cpu.config b/templates/elmer/8.4/data.elmer.amd.cpu.config
index cd6ac04f96cf502959ef67ae2a3b77ccc2742e40..f2d50235eb08615b5bd09e2a7370517064d212cf 100644
--- a/templates/elmer/8.4/data.elmer.amd.cpu.config
+++ b/templates/elmer/8.4/data.elmer.amd.cpu.config
@@ -8,13 +8,14 @@ elmer/test https://sources.debian.org/data/non-free/e/elmer-doc/2014.02.06-1~bpo
 [DEPENDENCY]
 set -e
 set -x
-./jarvis -install gcc/9.3.0 com
-module purge
+./jarvis -install kgcc/10.3.1 com
 module use ./software/modulefiles
-module load gcc/9.3.0
+module purge
+module load kgcc/10.3.1
 export CC=`which gcc`
 export CXX=`which g++`
 export FC=`which gfortran`
+module use ./software/moduledeps/kgcc10.3.1
 ./jarvis -install hmpi/1.1.1 gcc
 ./jarvis -install openblas/0.3.6 gcc
 ./jarvis -install cmake/3.23.1 gcc
@@ -27,7 +28,8 @@ tar -xvf ${JARVIS_DOWNLOAD}/ElmerTutorialsFiles_nonGUI.tar.gz -C ${JARVIS_TMP}/e
 [ENV]
 module use ./software/modulefiles
 module purge
-module load gcc/9.3.0
+module load kgcc/10.3.1
+module use ./software/moduledeps/kgcc10.3.1
 module load hmpi/1.1.1
 module load cmake/3.23.1
 module load openblas/0.3.6
@@ -40,13 +42,32 @@ binary_dir =
 case_dir = ${JARVIS_TMP}/elmerfem-scc20/tutorials_files/FlowResistance
 
 [BUILD]
+sed -i 's/CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)/cmake_minimum_required(VERSION 3.10...3.25)/g' fem/tests/CMakeLists.txt
+sed -i '15,27d' fem/tests/CMakeLists.txt
+cat > temp_insert.txt << 'EOF'
+MACRO(SUBDIRLIST result curdir)
+  FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
+  SET(dirlist "")
+  FOREACH(child ${children})
+    IF(IS_DIRECTORY ${curdir}/${child})
+      LIST(APPEND dirlist ${child})
+    ENDIF()
+  ENDFOREACH()
+  SET(${result} ${dirlist})
+ENDMACRO()
+EOF
+sed -i '14r temp_insert.txt' fem/tests/CMakeLists.txt
+rm -rf temp_insert.txt
+sed -i 's/SUBDIRLIST(SUBDIRS \${CMAKE_CURRENT_SOURCE_DIR} 2)/SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR})/g' fem/tests/CMakeLists.txt
+
+rm -rf build
 mkdir build
 cd build
-cmake -DCMAKE_C_FLAGS="-O3" -DCMAKE_CXX_FLAGS="-O3" -DCMAKE_Fortran_FLAGS="-O3" ../
+cmake -DCMAKE_C_FLAGS="-O3" -DCMAKE_CXX_FLAGS="-O3" -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" ../
 make -j
 make install
 
 [RUN]
 run = ElmerGrid 1 2 hole.grd && mpirun --allow-run-as-root -mca btl ^openib -np 1 ElmerSolver
 binary =
-nodes = 1
\ No newline at end of file
+nodes = 1