diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 272428e..203e7d5 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -86,13 +86,17 @@
     builders {
       name: "archive"
       mixins: "linux"
+      # TODO(ricow): set archive flag when we flip over
     }
     builders {
       name: "archive_release"
       mixins: "linux"
+      # TODO(ricow): set archive flag when we flip over
     }
     builders {
       name: "d8-linux"
+      properties: "tool:d8"
+      properties: "aosp_jar:True"
       mixins: "linux"
     }
     builders {
@@ -129,6 +133,8 @@
     }
     builders {
       name: "d8-linux-android-7.0.0"
+      properties: "tool:d8"
+      properties: "dex_vm:7.0.0"
       mixins: "linux"
     }
     builders {
@@ -150,6 +156,7 @@
     builders {
       name: "linux"
       mixins: "linux"
+      properties: "tool:r8"
     }
     builders {
       name: "linux-android-4.0.4"
@@ -185,6 +192,8 @@
     }
     builders {
       name: "linux-android-7.0.0"
+      properties: "tool:r8"
+      properties: "dex_vm:7.0.0"
       mixins: "linux"
     }
     builders {
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 653f1dc..eabdf66 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -24,45 +24,47 @@
     refs: "refs/heads/master"
   }
 
-  triggers: "archive"
-  triggers: "archive_release"
   triggers: "d8-linux"
-  triggers: "d8-linux-android-4.0.4"
-  triggers: "d8-linux-android-4.0.4_release"
-  triggers: "d8-linux-android-4.4.4"
-  triggers: "d8-linux-android-4.4.4_release"
-  triggers: "d8-linux-android-5.1.1"
-  triggers: "d8-linux-android-5.1.1_release"
-  triggers: "d8-linux-android-6.0.1"
-  triggers: "d8-linux-android-6.0.1_release"
-  triggers: "d8-linux-android-7.0.0"
-  triggers: "d8-linux-android-7.0.0_release"
-  triggers: "d8-linux-jctf"
-  triggers: "d8-linux-jctf_release"
-  triggers: "d8-linux_release"
   triggers: "linux"
-  triggers: "linux-android-4.0.4"
-  triggers: "linux-android-4.0.4_release"
-  triggers: "linux-android-4.4.4"
-  triggers: "linux-android-4.4.4_release"
-  triggers: "linux-android-5.1.1"
-  triggers: "linux-android-5.1.1_release"
-  triggers: "linux-android-6.0.1"
-  triggers: "linux-android-6.0.1_release"
+  triggers: "d8-linux-android-7.0.0"
   triggers: "linux-android-7.0.0"
-  triggers: "linux-android-7.0.0_release"
-  triggers: "linux-internal"
-  triggers: "linux-internal_release"
-  triggers: "linux-jctf"
-  triggers: "linux-jctf_release"
-  triggers: "linux_release"
-  triggers: "r8cf-linux-jctf"
-  triggers: "windows"
-  triggers: "windows_release"
 
+  # TODO(ricow): enable remaining
+  #  triggers: "archive"
+  #  triggers: "archive_release"
+  #  triggers: "d8-linux"
+  #  triggers: "d8-linux-android-4.0.4"
+  #  triggers: "d8-linux-android-4.0.4_release"
+  #  triggers: "d8-linux-android-4.4.4"
+  #  triggers: "d8-linux-android-4.4.4_release"
+  #  triggers: "d8-linux-android-5.1.1"
+  #  triggers: "d8-linux-android-5.1.1_release"
+  #  triggers: "d8-linux-android-6.0.1"
+  #  triggers: "d8-linux-android-6.0.1_release"
+  #  triggers: "d8-linux-android-7.0.0_release"
+  #  triggers: "d8-linux-jctf"
+  #  triggers: "d8-linux-jctf_release"
+  #  triggers: "d8-linux_release"
+  #  triggers: "linux"
+  #  triggers: "linux-android-4.0.4"
+  #  triggers: "linux-android-4.0.4_release"
+  #  triggers: "linux-android-4.4.4"
+  #  triggers: "linux-android-4.4.4_release"
+  #  triggers: "linux-android-5.1.1"
+  #  triggers: "linux-android-5.1.1_release"
+  #  triggers: "linux-android-6.0.1"
+  #  triggers: "linux-android-6.0.1_release"
+  #  triggers: "linux-android-7.0.0_release"
+  #  triggers: "linux-internal"
+  #  triggers: "linux-internal_release"
+  #  triggers: "linux-jctf"
+  #  triggers: "linux-jctf_release"
+  #  triggers: "linux_release"
+  #  triggers: "r8cf-linux-jctf"
+  #  triggers: "windows"
+  #  triggers: "windows_release"
 }
 
-
 job {
   id: "archive"
   acl_sets: "default"