diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index d52766e..58afca3 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -87,6 +87,7 @@
       name: "archive"
       mixins: "linux"
       execution_timeout_secs: 1800  # 1/2h
+      dimensions: "archive_bot:true"
       recipe {
         properties: "archive:True"
       }
@@ -95,6 +96,7 @@
       name: "archive_release"
       mixins: "linux"
       execution_timeout_secs: 1800  # 1/2h
+      dimensions: "archive_bot:true"
       recipe {
         properties: "archive:True"
       }
@@ -191,6 +193,7 @@
     builders {
       name: "d8-linux-jctf"
       mixins: "linux"
+      dimensions: "jctf:true"
       execution_timeout_secs: 43200  # 12h
       recipe {
         properties: "tool:d8"
@@ -201,6 +204,7 @@
     builders {
       name: "d8-linux-jctf_release"
       mixins: "linux"
+      dimensions: "jctf:true"
       execution_timeout_secs: 43200  # 12h
       recipe {
         properties: "tool:d8"
@@ -326,6 +330,7 @@
     builders {
       name: "linux-jctf"
       mixins: "linux"
+      dimensions: "jctf:true"
       execution_timeout_secs: 43200  # 12h
       recipe {
         properties: "tool:r8"
@@ -336,6 +341,7 @@
     builders {
       name: "linux-jctf_release"
       mixins: "linux"
+      dimensions: "jctf:true"
       execution_timeout_secs: 43200  # 12h
       recipe {
         properties: "tool:r8"
@@ -346,6 +352,7 @@
     builders {
       name: "r8cf-linux-jctf"
       mixins: "linux"
+      dimensions: "jctf:true"
       execution_timeout_secs: 43200  # 12h
       recipe {
         properties: "tool:r8cf"
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 145c0c6..2b67476 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -40,11 +40,9 @@
   triggers: "linux-android-6.0.1"
   triggers: "linux-android-7.0.0"
   triggers: "linux-internal"
+  triggers: "linux-jctf"
+  triggers: "r8cf-linux-jctf"
   triggers: "windows"
-
-  # TODO(ricow): enable remaining
-  #  triggers: "linux-jctf"
-  #  triggers: "r8cf-linux-jctf"
 }
 
 trigger {
@@ -60,6 +58,7 @@
   triggers: "d8-linux-android-5.1.1_release"
   triggers: "d8-linux-android-6.0.1_release"
   triggers: "d8-linux-android-7.0.0_release"
+  triggers: "d8-linux-jctf_release"
   triggers: "d8-linux_release"
   triggers: "linux-android-4.0.4_release"
   triggers: "linux-android-4.4.4_release"
@@ -67,12 +66,9 @@
   triggers: "linux-android-6.0.1_release"
   triggers: "linux-android-7.0.0_release"
   triggers: "linux-internal_release"
+  triggers: "linux-jctf_release"
   triggers: "linux_release"
   triggers: "windows_release"
-  
-  # TODO(ricow): enable remaining
-  #  triggers: "d8-linux-jctf_release"
-  #  triggers: "linux-jctf_release"
 }
 
 job {