diff --git a/templates/common/build_icon.sh b/templates/common/build_icon.sh
index 8ad3ebee85ef40a426c27afde73205f3446352f3..0761921ac49098482e894704b2ff4f3d86e1990d 100644
--- a/templates/common/build_icon.sh
+++ b/templates/common/build_icon.sh
@@ -1,6 +1,8 @@
 # Get some variables provided by autosubmit.
 # TODO: What do we do to ensure that these variables are defined in the proj file?
 WORKDIR=%HPCROOTDIR%
+ICON_VERSION=%ICON.VERSION%
+COMPILER=%SPACK.COMPILER%
 
 # If the workdir directory does not exist create it
 if [ ! -d ${WORKDIR} ]; then
@@ -33,7 +35,7 @@ else
 fi
 
 # Need to get ECCODES DWD definitions:
-eccodes_version=$(spack find eccodes | grep eccodes@ | cut -d "@" -f 2)
+eccodes_version=$(spack spec icon-nwp@${ICON_VERSION}%${COMPILER} | grep eccodes | grep -o "@.*%" | grep -o "[0-9\.]*")
 
 definitions_tar_file=eccodes_definitions.edzw-${eccodes_version}-1.tar.bz2
 if [ ! -f "${definitions_tar_file}" ]; then