diff --git a/src/libkernelbot/consts.py b/src/libkernelbot/consts.py
index b1a5d222..f60764de 100644
--- a/src/libkernelbot/consts.py
+++ b/src/libkernelbot/consts.py
@@ -20,6 +20,7 @@ class GitHubGPU(Enum):
     NVIDIA = "NVIDIA"
     MI300 = "MI300"
     MI250 = "MI250"
+    MI300x8 = "MI300x8"
 
 
 class ModalGPU(Enum):
@@ -118,6 +119,7 @@ class RankCriterion(Enum):
     "B200": "100",
     "NVIDIA": None,
     "MI300": None,
+    "MI300x8": None,
     "MI250": None,
 }
 
diff --git a/src/libkernelbot/launchers/github.py b/src/libkernelbot/launchers/github.py
index 4b895b10..5e29fa83 100644
--- a/src/libkernelbot/launchers/github.py
+++ b/src/libkernelbot/launchers/github.py
@@ -53,11 +53,13 @@ async def run_submission(
         self, config: dict, gpu_type: GPU, status: RunProgressReporter
     ) -> FullResult:
         gpu_vendor = None
-        if gpu_type.value in ["MI300", "MI250"]:
+        if gpu_type.value in ["MI300", "MI250", "MI300x8"]:
             selected_workflow = "amd_workflow.yml"
-            runner_name = {"MI300": "amdgpu-mi300-x86-64", "MI250": "amdgpu-mi250-x86-64"}[
-                gpu_type.value
-            ]
+            runner_name = {
+                "MI300": "amdgpu-mi300-x86-64",
+                "MI250": "amdgpu-mi250-x86-64",
+                "MI300x8": "amdgpu-mi300-8-x86-64",
+            }[gpu_type.value]
             gpu_vendor = "AMD"
             requirements = AMD_REQUIREMENTS
         elif gpu_type.value == "NVIDIA":
diff --git a/src/libkernelbot/task.py b/src/libkernelbot/task.py
index 26c90780..04ae944d 100644
--- a/src/libkernelbot/task.py
+++ b/src/libkernelbot/task.py
@@ -147,7 +147,8 @@ def make_task_definition(yaml_file: str | Path) -> LeaderboardDefinition:  # noq
         assert lang in ["CUDA", "Python", "Triton", "HIP"]
         templates[lang] = (root / source).read_text()
 
-    del raw["templates"]
+    if templates:
+        del raw["templates"]
     description = raw["description"]
     del raw["description"]
     task = LeaderboardTask.from_dict(raw)