diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index e1d76fb..37ecc5f 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -2840,10 +2840,10 @@
     )
 
   site_config.Add(
-      'grunt-android-pi-pre-flight-branch',
+      'kevin-android-pi-pre-flight-branch',
       site_config.templates.pre_flight_branch,
       display_label=config_lib.DISPLAY_LABEL_PI_ANDROID_PFQ,
-      boards=['grunt'],
+      boards=['kevin'],
       sync_chrome=True,
       android_rev=constants.ANDROID_REV_LATEST,
       android_package='android-container-pi',
@@ -3013,14 +3013,14 @@
 
   RELEASES = [
       ('release-R88-13597.B',
-       ['grunt-android-pi-pre-flight-branch'],
+       ['kevin-android-pi-pre-flight-branch'],
        '',
        [],
        [],
        config_lib.LUCI_BUILDER_LEGACY_RELEASE),
 
       ('release-R87-13505.B',
-       ['grunt-android-pi-pre-flight-branch'],
+       ['kevin-android-pi-pre-flight-branch'],
        'chell-chrome-no-afdo-uprev-pre-flight-branch',
        ['orderfile-generate-toolchain',
         'orderfile-verify-toolchain'],
@@ -3031,7 +3031,7 @@
        config_lib.LUCI_BUILDER_LEGACY_RELEASE),
 
       ('release-R84-13099.B',
-       ['grunt-android-pi-pre-flight-branch'],
+       ['kevin-android-pi-pre-flight-branch'],
        'chell-chrome-no-afdo-uprev-pre-flight-branch',
        ['orderfile-generate-toolchain',
         'orderfile-verify-toolchain'],
@@ -3042,7 +3042,7 @@
        config_lib.LUCI_BUILDER_LEGACY_RELEASE),
 
       ('release-R86-13421.B',
-       ['grunt-android-pi-pre-flight-branch'],
+       ['kevin-android-pi-pre-flight-branch'],
        'chell-chrome-no-afdo-uprev-pre-flight-branch',
        ['orderfile-generate-toolchain',
         'orderfile-verify-toolchain'],
diff --git a/config/config_dump.json b/config/config_dump.json
index be50bbb..b5c7aa9 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -11894,34 +11894,6 @@
         "suite_scheduling": false,
         "workspace_branch": "factory-gru-9017.B"
     },
-    "grunt-android-pi-pre-flight-branch": {
-        "_template": "pre_flight_branch",
-        "android_import_branch": "git_pi-arc-m86",
-        "android_package": "android-container-pi",
-        "android_rev": "latest_release",
-        "boards": [
-            "grunt"
-        ],
-        "display_label": "pi_android_pfq",
-        "sync_chrome": true,
-        "vm_tests_override": null
-    },
-    "grunt-android-pi-pre-flight-branch-tryjob": {
-        "_template": "pre_flight_branch",
-        "android_import_branch": "git_pi-arc-m86",
-        "android_package": "android-container-pi",
-        "android_rev": "latest_release",
-        "boards": [
-            "grunt"
-        ],
-        "debug": true,
-        "debug_cidb": true,
-        "display_label": "tryjob",
-        "hw_tests_override": null,
-        "luci_builder": "Try",
-        "sync_chrome": true,
-        "vm_tests_override": null
-    },
     "grunt-factory-grunt-11164.B-factorybranch": {
         "_template": "factorybranch",
         "boards": [
@@ -14967,6 +14939,34 @@
         "kernel_afdo_verify": true,
         "luci_builder": "Try"
     },
+    "kevin-android-pi-pre-flight-branch": {
+        "_template": "pre_flight_branch",
+        "android_import_branch": "git_pi-arc-m86",
+        "android_package": "android-container-pi",
+        "android_rev": "latest_release",
+        "boards": [
+            "kevin"
+        ],
+        "display_label": "pi_android_pfq",
+        "sync_chrome": true,
+        "vm_tests_override": null
+    },
+    "kevin-android-pi-pre-flight-branch-tryjob": {
+        "_template": "pre_flight_branch",
+        "android_import_branch": "git_pi-arc-m86",
+        "android_package": "android-container-pi",
+        "android_rev": "latest_release",
+        "boards": [
+            "kevin"
+        ],
+        "debug": true,
+        "debug_cidb": true,
+        "display_label": "tryjob",
+        "hw_tests_override": null,
+        "luci_builder": "Try",
+        "sync_chrome": true,
+        "vm_tests_override": null
+    },
     "kevin-arc64-full": {
         "_template": "full",
         "boards": [
diff --git a/config/luci-scheduler.cfg b/config/luci-scheduler.cfg
index f98d985..f238fc9 100644
--- a/config/luci-scheduler.cfg
+++ b/config/luci-scheduler.cfg
@@ -2604,7 +2604,7 @@
 }
 
 job {
-  id: "release-R88-13597.B-grunt-android-pi-pre-flight-branch"
+  id: "release-R88-13597.B-kevin-android-pi-pre-flight-branch"
   acl_sets: "default"
   schedule: "0 3,7,11,15,19,23 * * *"
   buildbucket: {
@@ -2612,10 +2612,10 @@
     bucket: "luci.chromeos.general"
     builder: "LegacyRelease"
     tags: "cbb_branch:release-R88-13597.B"
-    tags: "cbb_config:grunt-android-pi-pre-flight-branch"
+    tags: "cbb_config:kevin-android-pi-pre-flight-branch"
     tags: "cbb_display_label:release"
     properties: "cbb_branch:release-R88-13597.B"
-    properties: "cbb_config:grunt-android-pi-pre-flight-branch"
+    properties: "cbb_config:kevin-android-pi-pre-flight-branch"
     properties: "cbb_display_label:release"
     properties: "cbb_extra_args:[\"--buildbot\"]"
   }
@@ -2640,7 +2640,7 @@
 }
 
 job {
-  id: "release-R87-13505.B-grunt-android-pi-pre-flight-branch"
+  id: "release-R87-13505.B-kevin-android-pi-pre-flight-branch"
   acl_sets: "default"
   schedule: "0 2,6,10,14,18,22 * * *"
   buildbucket: {
@@ -2648,10 +2648,10 @@
     bucket: "luci.chromeos.general"
     builder: "LegacyRelease"
     tags: "cbb_branch:release-R87-13505.B"
-    tags: "cbb_config:grunt-android-pi-pre-flight-branch"
+    tags: "cbb_config:kevin-android-pi-pre-flight-branch"
     tags: "cbb_display_label:release"
     properties: "cbb_branch:release-R87-13505.B"
-    properties: "cbb_config:grunt-android-pi-pre-flight-branch"
+    properties: "cbb_config:kevin-android-pi-pre-flight-branch"
     properties: "cbb_display_label:release"
     properties: "cbb_extra_args:[\"--buildbot\"]"
   }
@@ -2802,7 +2802,7 @@
 }
 
 job {
-  id: "release-R84-13099.B-grunt-android-pi-pre-flight-branch"
+  id: "release-R84-13099.B-kevin-android-pi-pre-flight-branch"
   acl_sets: "default"
   schedule: "0 2,6,10,14,18,22 * * *"
   buildbucket: {
@@ -2810,10 +2810,10 @@
     bucket: "luci.chromeos.general"
     builder: "LegacyRelease"
     tags: "cbb_branch:release-R84-13099.B"
-    tags: "cbb_config:grunt-android-pi-pre-flight-branch"
+    tags: "cbb_config:kevin-android-pi-pre-flight-branch"
     tags: "cbb_display_label:release"
     properties: "cbb_branch:release-R84-13099.B"
-    properties: "cbb_config:grunt-android-pi-pre-flight-branch"
+    properties: "cbb_config:kevin-android-pi-pre-flight-branch"
     properties: "cbb_display_label:release"
     properties: "cbb_extra_args:[\"--buildbot\"]"
   }
@@ -2964,7 +2964,7 @@
 }
 
 job {
-  id: "release-R86-13421.B-grunt-android-pi-pre-flight-branch"
+  id: "release-R86-13421.B-kevin-android-pi-pre-flight-branch"
   acl_sets: "default"
   schedule: "0 3,7,11,15,19,23 * * *"
   buildbucket: {
@@ -2972,10 +2972,10 @@
     bucket: "luci.chromeos.general"
     builder: "LTSRelease"
     tags: "cbb_branch:release-R86-13421.B"
-    tags: "cbb_config:grunt-android-pi-pre-flight-branch"
+    tags: "cbb_config:kevin-android-pi-pre-flight-branch"
     tags: "cbb_display_label:release"
     properties: "cbb_branch:release-R86-13421.B"
-    properties: "cbb_config:grunt-android-pi-pre-flight-branch"
+    properties: "cbb_config:kevin-android-pi-pre-flight-branch"
     properties: "cbb_display_label:release"
     properties: "cbb_extra_args:[\"--buildbot\"]"
   }
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 7ce1def..7135136 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -895,7 +895,6 @@
   gnawty-unittest-stress
   gonzo-rapid
   gru-factory-gru-9017.B-factorybranch-tryjob
-  grunt-android-pi-pre-flight-branch-tryjob
   grunt-factory-grunt-11164.B-factorybranch-tryjob
   grunt-full-tryjob
   grunt-kernelnext-full-tryjob
@@ -1019,6 +1018,7 @@
   kernel-4_14-release-afdo-verify-tryjob
   kernel-4_19-release-afdo-verify-tryjob
   kernel-4_4-release-afdo-verify-tryjob
+  kevin-android-pi-pre-flight-branch-tryjob
   kevin-arc64-full-tryjob
   kevin-arc64-llvm-next-toolchain-tryjob
   kevin-arc64-llvm-toolchain-tryjob