diff --git a/script/job_generator/generate_job_yaml.py b/script/job_generator/generate_job_yaml.py
index 17511df11e08..137f70d0206a 100644
--- a/script/job_generator/generate_job_yaml.py
+++ b/script/job_generator/generate_job_yaml.py
@@ -349,6 +349,12 @@ def job_variables(job: Dict[str, Tuple[str, str]]) -> Dict[str, str]:
             variables["ALPAKA_CI_CLANG_VER"] = "15"
         elif job[DEVICE_COMPILER][VERSION] == "5.5":
             variables["ALPAKA_CI_CLANG_VER"] = "16"
+        elif job[DEVICE_COMPILER][VERSION] == "5.6":
+            variables["ALPAKA_CI_CLANG_VER"] = "16"
+        elif job[DEVICE_COMPILER][VERSION] == "5.7":
+            variables["ALPAKA_CI_CLANG_VER"] = "17"
+        elif job[DEVICE_COMPILER][VERSION] == "6.0":
+            variables["ALPAKA_CI_CLANG_VER"] = "17"
         else:
             raise RuntimeError(
                 "generate_job_yaml.job_variables(): unknown hip version: "
diff --git a/script/job_generator/versions.py b/script/job_generator/versions.py
index d45f74d4b42d..41c6ac7182fa 100644
--- a/script/job_generator/versions.py
+++ b/script/job_generator/versions.py
@@ -27,7 +27,7 @@
         "12.1",
         "12.2",
     ],
-    HIPCC: ["5.0", "5.1", "5.2", "5.3", "5.4", "5.5"],
+    HIPCC: ["5.0", "5.1", "5.2", "5.3", "5.4", "5.5", "5.6", "5.7", "6.0"],
     ICPX: ["2023.1.0", "2023.2.0"],
     # Contains all enabled back-ends.
     # There are special cases for ALPAKA_ACC_GPU_CUDA_ENABLE and ALPAKA_ACC_GPU_HIP_ENABLE