diff --git a/script/job_generator/generate_job_yaml.py b/script/job_generator/generate_job_yaml.py
index 7e8ef1309e88..aa7db8db102e 100644
--- a/script/job_generator/generate_job_yaml.py
+++ b/script/job_generator/generate_job_yaml.py
@@ -15,7 +15,7 @@
 from util import print_warn, exit_error
 
 JOB_COMPILE_ONLY = "compile_only_job"
-JOB_RUNTIME = "runtime_job_gpu"
+JOB_GPU_RUNTIME = "runtime_job_gpu"
 JOB_CPU_RUNTIME = "runtime_job_cpu"
 JOB_ROCM_RUNTIME = "rocm_runtime_job"
 JOB_NVCC_GCC_RUNTIME = "nvcc_gcc_runtime_job"
@@ -26,7 +26,7 @@
 
 WAVE_GROUP_NAMES = [
     JOB_COMPILE_ONLY,
-    JOB_RUNTIME,
+    JOB_GPU_RUNTIME,
     JOB_CPU_RUNTIME,
     # can be enabled again, if fine granular scheduling is required
     # JOB_ROCM_RUNTIME,
@@ -541,19 +541,19 @@ def distribute_to_waves(
             sorted_groups[JOB_CPU_RUNTIME].append(job)
         elif job_name.startswith("linux_hipcc"):
             # sorted_groups[JOB_ROCM_RUNTIME].append(job)
-            sorted_groups[JOB_RUNTIME].append(job)
+            sorted_groups[JOB_GPU_RUNTIME].append(job)
         elif job_name.startswith("linux_nvcc") and "gcc" in job_name:
             # sorted_groups[JOB_NVCC_GCC_RUNTIME].append(job)
-            sorted_groups[JOB_RUNTIME].append(job)
+            sorted_groups[JOB_GPU_RUNTIME].append(job)
         elif job_name.startswith("linux_nvcc") and "clang" in job_name:
             # sorted_groups[JOB_NVCC_CLANG_RUNTIME].append(job)
-            sorted_groups[JOB_RUNTIME].append(job)
+            sorted_groups[JOB_GPU_RUNTIME].append(job)
         elif job_name.startswith("linux_clang-cuda"):
             # sorted_groups[JOB_CLANG_CUDA_RUNTIME].append(job)
-            sorted_groups[JOB_RUNTIME].append(job)
+            sorted_groups[JOB_GPU_RUNTIME].append(job)
         elif job_name.startswith("linux_icpx"):
             # sorted_groups[JOB_ICPX_RUNTIME].append(job)
-            sorted_groups[JOB_RUNTIME].append(job)
+            sorted_groups[JOB_CPU_RUNTIME].append(job)
         else:
             sorted_groups[JOB_UNKNOWN].append(job)
 
diff --git a/script/job_generator/job_modifier.py b/script/job_generator/job_modifier.py
index 3f6fa9a4db16..d43b64c2f8a4 100644
--- a/script/job_generator/job_modifier.py
+++ b/script/job_generator/job_modifier.py
@@ -133,5 +133,5 @@ def add_job_parameters(job_matrix: List[Dict[str, Tuple[str, str]]]):
 
     # run tests each time if a CPU backend is used
     for job in job_matrix:
-        if job[DEVICE_COMPILER][NAME] in [GCC, CLANG]:
+        if job[DEVICE_COMPILER][NAME] in [GCC, CLANG, ICPX]:
             job[JOB_EXECUTION_TYPE] = (JOB_EXECUTION_TYPE, JOB_EXECUTION_RUNTIME)