diff --git a/conf/common/build.yml b/conf/common/build.yml
index 249a1af969770677fe141cad1fef77f2990e346e..9b3cedb6b7ac1935b9c03cac1b92ab16593b8fe8 100644
--- a/conf/common/build.yml
+++ b/conf/common/build.yml
@@ -12,7 +12,7 @@ spack:
   disable_local_config: true # if false, spack install into home folder
 
 icon:
-  build_cmd: "icon-nwp@%ICON.VERSION%% %SPACK.COMPILER% ^openmpi+pmi+legacylaunchers schedulers=slurm fabrics=ucx ucx+dc+dm+ib_hw_tm+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs ^gettext@0.20.2 "
+  build_cmd: "icon-nwp@%ICON.VERSION%% %SPACK.COMPILER% target=x86_64_v2 ^openmpi+pmi+legacylaunchers schedulers=slurm fabrics=ucx ucx+dc+dm+ib_hw_tm+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs"
   version: 2.6.5-nwp0
 
 python_environment:
diff --git a/templates/common/build_icon.sh b/templates/common/build_icon.sh
index 67c648af491decfa1dda3e3e2e5c03520939453f..3307881ea638ae5f40fd5f8eee766671eaa62835 100644
--- a/templates/common/build_icon.sh
+++ b/templates/common/build_icon.sh
@@ -16,8 +16,7 @@ cd ${WORKDIR}
 load_spack "%spack.init%" "%spack.root%" "%spack.url%" "%spack.branch%" "%spack.compiler%" "%spack.disable_local_config%" "%spack.user_cache_path%" "%spack.user_config_path%"
 
 
-
-SPACK_BUILD_ICON="%spack.build_cmd%"
+SPACK_BUILD_ICON="%ICON.BUILD_CMD%"
 if [ ! -z "$SPACK_BUILD_ICON" ]; then
   echo "Installing ICON with spack!"
   echo "cmd=$SPACK_BUILD_ICON"