diff --git a/src/ci/citool/src/jobs.rs b/src/ci/citool/src/jobs.rs
index 5600d7b4db59b..6dbe2bd6c1383 100644
--- a/src/ci/citool/src/jobs.rs
+++ b/src/ci/citool/src/jobs.rs
@@ -85,14 +85,14 @@ impl JobDatabase {
 }
 
 pub fn load_job_db(db: &str) -> anyhow::Result<JobDatabase> {
-    let mut db: Value = serde_yaml::from_str(db)?;
+    let mut db: Value = serde_yaml::from_str(db).context("failed to parse YAML content")?;
 
     // We need to expand merge keys (<<), because serde_yaml can't deal with them
     // `apply_merge` only applies the merge once, so do it a few times to unwrap nested merges.
-    db.apply_merge()?;
-    db.apply_merge()?;
+    db.apply_merge().context("failed to apply merge keys")?;
+    db.apply_merge().context("failed to apply merge keys")?;
 
-    let db: JobDatabase = serde_yaml::from_value(db)?;
+    let db: JobDatabase = serde_yaml::from_value(db).context("failed to parse job database")?;
     Ok(db)
 }
 
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 005007bbccdd1..76117b9092e7d 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -351,6 +351,12 @@ auto:
       DOCKER_SCRIPT: x86_64-gnu-llvm3.sh
     <<: *job-linux-4c
 
+  - name: x86_64-gnu-llvm-19
+    env:
+      ENABLE_GCC_CODEGEN: "1"
+      DOCKER_SCRIPT: x86_64-gnu-llvm.sh
+    <<: *job-linux-36c-codebuild
+
   # The x86_64-gnu-llvm-19 job is split into multiple jobs to run tests in parallel.
   # x86_64-gnu-llvm-19-1 skips tests that run in x86_64-gnu-llvm-19-{2,3}.
   - name: x86_64-gnu-llvm-19-1
@@ -380,9 +386,7 @@ auto:
     <<: *job-linux-4c
 
   - name: x86_64-gnu-tools
-    env:
-      DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
-    <<: *job-linux-4c
+    <<: *job-linux-36c-codebuild
 
   ####################
   #  macOS Builders  #