diff --git a/ci/install_compilers.sh b/ci/install_compilers.sh
index 75d576efc7587b27cf1be38b8a24c9918f28c3c3..a6d3d0456eff453f251aa9a1f6c5547258db1e59 100755
--- a/ci/install_compilers.sh
+++ b/ci/install_compilers.sh
@@ -73,6 +73,12 @@ for c in  "core_compilers" "compilers"; do
     fi
 done
 
+export target=$(jq -Mrc '
+.stack.targets
+ | to_entries.[]
+ | select(.key == env.environment)
+ |.value' ${STACK_CONFIG})
+
 compilers_specs=$(jq -Mr '
 .stack
  | .system_arch as $arch
@@ -89,14 +95,15 @@ system_compiler=$(jq -Mrc '
 ' ${STACK_CONFIG})
 
 core_compilers=$(jq -Mrc '.stack
+ | .system_arch as $arch
  | .system_compiler + .core_compilers
- | map("\(.compiler)@\(.version)")
+ | map("\(.compiler)@\(.version) \($arch)")
 ' ${STACK_CONFIG})
 
 compilers=$(jq -Mrc '.stack
  | .compilers
  | map(select(.constraint == null))
- | map("\(.compiler)@\(.version)")
+ | map("\(.compiler)@\(.version) target=\(env.target)")
 ' ${STACK_CONFIG})
 
 echo "definitions:" > ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
@@ -123,7 +130,7 @@ jq -Mrc '
  | .system_arch as $arch
  | .compilers
  | to_entries
- | map(" - compiler_\(.key): [\(.value.compiler)@\(.value.version)]")
+ | map(" - compiler_\(.key): [\(.value.compiler)@\(.value.version) target=\(env.target)]")
  | .[]
 '  ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
 
diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index 4be26e51e621447adc2123a778011716bad808bc..644aa7dad028e831178e7a06370a934ed4a06660 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -22,6 +22,13 @@
                 "version": "11.4.1"
             }
         },
+        "targets": {
+            "helvetios": "skylake_avx512",
+            "izar": "cascadelake",
+            "jed": "icelake",
+            "kuma_l40s": "zen4",
+            "kuma_h100": "zen4"
+        },
         "compilers": {
             "gcc_stable": {
                 "compiler": "gcc",