diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index ca4bc25..0586776 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -151,7 +151,7 @@
       }
     }
     builders {
-      name: "lib_desugar-archive"
+      name: "lib_desugar-archive-jdk11"
       swarming_host: "chrome-swarming.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cores:8"
@@ -167,6 +167,41 @@
         '{'
         '  "builder_group": "internal.client.r8",'
         '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--variant=jdk11"'
+        '  ],'
+        '  "test_wrapper": "tools/archive_desugar_jdk_libs.py"'
+        '}'
+      priority: 25
+      execution_timeout_secs: 3600
+      expiration_secs: 126000
+      build_numbers: YES
+      service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "lib_desugar-archive-jdk8"
+      swarming_host: "chrome-swarming.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.r8.ci"
+      exe {
+        cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "builder_group": "internal.client.r8",'
+        '  "recipe": "rex",'
+        '  "test_options": ['
+        '    "--variant=jdk8"'
+        '  ],'
         '  "test_wrapper": "tools/archive_desugar_jdk_libs.py"'
         '}'
       priority: 25
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index e07a48e..9aaa005 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -121,9 +121,14 @@
     short_name: "kotlin_old"
   }
   builders {
-    name: "buildbucket/luci.r8.ci/lib_desugar-archive"
+    name: "buildbucket/luci.r8.ci/lib_desugar-archive-jdk11"
     category: "library_desugar"
-    short_name: "archive"
+    short_name: "jdk11"
+  }
+  builders {
+    name: "buildbucket/luci.r8.ci/lib_desugar-archive-jdk8"
+    category: "library_desugar"
+    short_name: "jdk8"
   }
   builders {
     name: "buildbucket/luci.r8.ci/desugared_library-head"
diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index 2c77bc7..10dd059 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -63,7 +63,7 @@
   }
 }
 job {
-  id: "lib_desugar-archive"
+  id: "lib_desugar-archive-jdk11"
   realm: "ci"
   acl_sets: "ci"
   triggering_policy {
@@ -74,7 +74,22 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci"
-    builder: "lib_desugar-archive"
+    builder: "lib_desugar-archive-jdk11"
+  }
+}
+job {
+  id: "lib_desugar-archive-jdk8"
+  realm: "ci"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "lib_desugar-archive-jdk8"
   }
 }
 job {
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index d1529cf..f93a678 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -240,12 +240,15 @@
             dimensions = dimensions, category = category, release_trigger=release_trigger)
 
 def archivers():
-  for name in ["archive", "archive_release", "lib_desugar-archive"]:
+  for name in ["archive", "archive_release", "lib_desugar-archive-jdk11", "lib_desugar-archive-jdk8"]:
     desugar = "desugar" in name
     properties = {
         "test_wrapper" : "tools/archive_desugar_jdk_libs.py" if desugar else "tools/archive.py",
         "builder_group" : "internal.client.r8"
     }
+    if desugar:
+      properties["test_options"] = ["--variant=jdk11" if "jdk11" in name else "--variant=jdk8"]
+
     r8_builder(
         name,
         category = "library_desugar" if desugar else "archive",