diff --git a/src/mpsd_software_manager/spack.py b/src/mpsd_software_manager/spack.py
index 51b3dd5a3eee01b91a7153f86d69a20066190d7c..f85269ffacddb7bb4b5740adc1389d8e0e32863e 100644
--- a/src/mpsd_software_manager/spack.py
+++ b/src/mpsd_software_manager/spack.py
@@ -630,26 +630,15 @@ def install_toolchain_compiler(spack_environment: str) -> dict[str, dict[str, st
             spack(f"compiler find --scope site {compiler_path}").stdout.strip()
         )
 
-    if False:  # len(compilers) == 2:
+    if compilers["default"]["name"].startswith("intel"):
         gcc = compilers["fallback"]
         intel = compilers["default"]
         arch_tag = platform.machine()
-        gcc_root = spack(f"location -i {gcc['package']}").stdout.strip()
-        cflags = (
-            f" -gcc-name={gcc_root}/bin/gcc"
-            f" -idirafter/usr/include/{arch_tag}-linux-gnu"
-            " -diag-disable=10441"
-        )
+        cflags = f" -idirafter/usr/include/{arch_tag}-linux-gnu" " -diag-disable=10441"
         cxxflags = (
-            f" -gxx-name={gcc_root}/bin/g++"
-            f" -idirafter/usr/include/{arch_tag}-linux-gnu"
-            " -diag-disable=10441"
-        )
-        fflags = (
-            f" -gcc-name={gcc_root}/bin/gcc"
-            f" -idirafter/usr/include/{arch_tag}-linux-gnu"
-            " -diag-disable=10441"
+            f" -idirafter/usr/include/{arch_tag}-linux-gnu" " -diag-disable=10441"
         )
+        fflags = f" -idirafter/usr/include/{arch_tag}-linux-gnu" " -diag-disable=10441"
 
         intel_spec = intel["name"].replace("@", "@=")