diff --git a/compiler/ci/ci_common/gate.jsonnet b/compiler/ci/ci_common/gate.jsonnet
index 17b3c85dac61..1db0d342b25b 100644
--- a/compiler/ci/ci_common/gate.jsonnet
+++ b/compiler/ci/ci_common/gate.jsonnet
@@ -414,10 +414,9 @@
       "bootstrap_full"
     ]
 
-    # Run jobs on latest and last LTS (21)
+    # Run jobs on latest
     for jdk in [
-      self.jdk_latest,
-      "21"
+      self.jdk_latest
     ]
     for os_arch in all_os_arches
   ],
diff --git a/compiler/ci/ci_includes/baseline-benchmarks.jsonnet b/compiler/ci/ci_includes/baseline-benchmarks.jsonnet
index 5c165ef76622..1b816d908f11 100644
--- a/compiler/ci/ci_includes/baseline-benchmarks.jsonnet
+++ b/compiler/ci/ci_includes/baseline-benchmarks.jsonnet
@@ -11,7 +11,7 @@
       c.weekly + hw.e3 + jdk + cc.c2 + suite,
       c.weekly + hw.a12c + jdk + cc.c2 + suite
     ]
-  for jdk in cc.jdks_of_interest
+  for jdk in cc.product_jdks
   for suite in bench.groups.all_suites
   ]),