diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 72ce1bb..2ea779f 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -22,22 +22,22 @@
   "deps": {
     "build": {
       "branch": "refs/heads/master",
-      "revision": "3ea60ddfa686c9987d0d687a9bb1aeecb378d373",
+      "revision": "24a97e79937905dee04e34c3e6ef7d8624bab380",
       "url": "https://chromium.googlesource.com/chromium/tools/build"
     },
     "depot_tools": {
       "branch": "refs/heads/master",
-      "revision": "9b4a0570e51dd3ba8d419518b1a5537da40bb893",
+      "revision": "1fbaf73aef262941d88558e4214b39d43da9d849",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "fuchsia": {
       "branch": "refs/heads/master",
-      "revision": "ab5c0465d8c4f96c4db67696c60cfddc10e8cce7",
+      "revision": "6143b2bea47b8e5ebb4c4cfcb5953da3c8485d3f",
       "url": "https://fuchsia.googlesource.com/infra/recipes.git"
     },
     "recipe_engine": {
       "branch": "refs/heads/master",
-      "revision": "a24b238dfe4332ff9e6a55285a1068625418d059",
+      "revision": "0e48470a5ac2b31561146925f2d52ae3e120bc4e",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipes/engine.expected/Linux Fuchsia failing test.json b/recipes/engine.expected/Linux Fuchsia failing test.json
index ffc5738..24bce8c 100644
--- a/recipes/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine.expected/Linux Fuchsia failing test.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3755,7 +3765,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4248,7 +4260,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4657,7 +4671,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5302,7 +5318,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5916,7 +5934,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6530,7 +6550,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7218,7 +7240,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7900,7 +7924,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8279,7 +8305,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8657,7 +8685,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9010,7 +9040,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9756,7 +9788,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10109,7 +10143,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10899,7 +10935,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11252,7 +11290,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11951,7 +11991,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12304,7 +12346,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13094,7 +13138,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13447,7 +13493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14146,7 +14194,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14499,7 +14549,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/clobber.json b/recipes/engine.expected/clobber.json
index 49857d5..5a9ebb3 100644
--- a/recipes/engine.expected/clobber.json
+++ b/recipes/engine.expected/clobber.json
@@ -647,7 +647,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1125,7 +1127,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1507,7 +1511,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1860,7 +1866,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2242,7 +2250,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3380,7 +3390,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3841,7 +3853,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4251,7 +4265,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4765,7 +4781,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5248,7 +5266,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5731,7 +5751,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6189,7 +6211,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6767,7 +6791,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7147,7 +7173,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7526,7 +7554,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7880,7 +7910,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8462,7 +8494,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8816,7 +8850,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9408,7 +9444,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9762,7 +9800,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10297,7 +10337,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10651,7 +10693,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11243,7 +11287,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11597,7 +11643,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12132,7 +12180,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12486,7 +12536,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13474,7 +13526,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14488,7 +14542,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/experimental.json b/recipes/engine.expected/experimental.json
index e733185..29120e1 100644
--- a/recipes/engine.expected/experimental.json
+++ b/recipes/engine.expected/experimental.json
@@ -632,7 +632,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1110,7 +1112,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1492,7 +1496,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1845,7 +1851,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2227,7 +2235,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3365,7 +3375,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3826,7 +3838,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4236,7 +4250,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4750,7 +4766,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5233,7 +5251,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5716,7 +5736,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6174,7 +6196,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6752,7 +6776,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7132,7 +7158,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7511,7 +7539,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7865,7 +7895,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8447,7 +8479,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8801,7 +8835,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9393,7 +9429,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9747,7 +9785,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10282,7 +10322,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10636,7 +10678,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11228,7 +11272,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11582,7 +11628,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12117,7 +12165,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12471,7 +12521,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13451,7 +13503,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14431,7 +14485,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index f971ba9..8c95b40 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -632,7 +632,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1110,7 +1112,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1492,7 +1496,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1845,7 +1851,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2227,7 +2235,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3761,7 +3771,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4255,7 +4267,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4665,7 +4679,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5311,7 +5327,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5926,7 +5944,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6541,7 +6561,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7230,7 +7252,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7913,7 +7937,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8293,7 +8319,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8672,7 +8700,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9026,7 +9056,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9773,7 +9805,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10127,7 +10161,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10918,7 +10954,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11272,7 +11310,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11972,7 +12012,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12326,7 +12368,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13117,7 +13161,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13471,7 +13517,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14171,7 +14219,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14525,7 +14575,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -15868,7 +15920,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -16848,7 +16902,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/linux.json b/recipes/engine.expected/linux.json
index c95e1c7..600b539 100644
--- a/recipes/engine.expected/linux.json
+++ b/recipes/engine.expected/linux.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3359,7 +3369,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3819,7 +3831,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4228,7 +4242,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4741,7 +4757,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5223,7 +5241,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5705,7 +5725,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6162,7 +6184,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6739,7 +6763,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7118,7 +7144,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7496,7 +7524,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7849,7 +7879,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8430,7 +8462,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8783,7 +8817,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9374,7 +9410,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9727,7 +9765,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10261,7 +10301,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10614,7 +10656,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11205,7 +11249,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11558,7 +11604,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12092,7 +12140,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12445,7 +12495,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13424,7 +13476,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13784,7 +13838,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -13813,7 +13867,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -13896,7 +13950,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -13925,7 +13979,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -14403,7 +14457,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode.json b/recipes/engine.expected/linux_maven_or_bitcode.json
index c95e1c7..600b539 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3359,7 +3369,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3819,7 +3831,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4228,7 +4242,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4741,7 +4757,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5223,7 +5241,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5705,7 +5725,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6162,7 +6184,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6739,7 +6763,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7118,7 +7144,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7496,7 +7524,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7849,7 +7879,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8430,7 +8462,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8783,7 +8817,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9374,7 +9410,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9727,7 +9765,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10261,7 +10301,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10614,7 +10656,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11205,7 +11249,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11558,7 +11604,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12092,7 +12140,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12445,7 +12495,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13424,7 +13476,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13784,7 +13838,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -13813,7 +13867,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -13896,7 +13950,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -13925,7 +13979,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -14403,7 +14457,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index b2bb583..922f02e 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3755,7 +3765,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4248,7 +4260,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4657,7 +4671,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5302,7 +5318,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5916,7 +5934,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6530,7 +6550,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7218,7 +7240,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7900,7 +7924,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8279,7 +8305,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8657,7 +8685,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9010,7 +9040,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9756,7 +9788,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10109,7 +10143,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10899,7 +10935,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11252,7 +11290,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11951,7 +11991,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12304,7 +12346,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13094,7 +13138,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13447,7 +13493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14146,7 +14194,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14499,7 +14549,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -15841,7 +15893,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -16201,7 +16255,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -16230,7 +16284,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -16313,7 +16367,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -16342,7 +16396,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -16820,7 +16874,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode.json b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
index 8927597..f72b4f4 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3755,7 +3765,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4248,7 +4260,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4657,7 +4671,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5236,7 +5252,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5784,7 +5802,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6332,7 +6352,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6855,7 +6877,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7537,7 +7561,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7916,7 +7942,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8294,7 +8322,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8647,7 +8677,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9327,7 +9359,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9680,7 +9714,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10404,7 +10440,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10757,7 +10795,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11390,7 +11430,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11743,7 +11785,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12467,7 +12511,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12820,7 +12866,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13453,7 +13501,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13806,7 +13856,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14884,7 +14936,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -15244,7 +15298,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -15273,7 +15327,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -15356,7 +15410,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -15385,7 +15439,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -15863,7 +15917,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/mac.json b/recipes/engine.expected/mac.json
index 46ce339..f993540 100644
--- a/recipes/engine.expected/mac.json
+++ b/recipes/engine.expected/mac.json
@@ -810,7 +810,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1191,7 +1193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1543,7 +1547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1924,7 +1930,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2919,7 +2927,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3432,7 +3442,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3785,7 +3797,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4138,7 +4152,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4491,7 +4507,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4844,7 +4862,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5197,7 +5217,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6030,7 +6052,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6426,7 +6450,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6797,7 +6823,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8710,7 +8738,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9093,7 +9123,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9326,7 +9358,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -9355,7 +9387,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine.expected/mac_maven_or_bitcode.json b/recipes/engine.expected/mac_maven_or_bitcode.json
index 76aca9a..469f508 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode.json
@@ -810,7 +810,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1191,7 +1193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1543,7 +1547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1924,7 +1930,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2919,7 +2927,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3432,7 +3442,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3785,7 +3797,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4138,7 +4152,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4491,7 +4507,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4844,7 +4862,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5197,7 +5217,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6030,7 +6052,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6426,7 +6450,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6797,7 +6823,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7272,7 +7300,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7642,7 +7672,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8291,7 +8323,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8661,7 +8695,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9230,7 +9266,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9600,7 +9638,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10597,7 +10637,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10980,7 +11022,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11213,7 +11257,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -11242,7 +11286,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine.expected/mac_upload.json b/recipes/engine.expected/mac_upload.json
index b02ff65..ab9bb52 100644
--- a/recipes/engine.expected/mac_upload.json
+++ b/recipes/engine.expected/mac_upload.json
@@ -810,7 +810,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1191,7 +1193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1543,7 +1547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1924,7 +1930,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3249,7 +3257,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3762,7 +3772,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4115,7 +4127,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4468,7 +4482,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4821,7 +4837,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5174,7 +5192,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5527,7 +5547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6558,7 +6580,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6954,7 +6978,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7325,7 +7351,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9483,7 +9511,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9866,7 +9896,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10099,7 +10131,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -10128,7 +10160,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode.json b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
index acb10fe..d59a4aa 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
@@ -810,7 +810,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1191,7 +1193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1543,7 +1547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1924,7 +1930,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3249,7 +3257,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3762,7 +3772,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4115,7 +4127,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4468,7 +4482,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4821,7 +4837,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5174,7 +5192,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5527,7 +5547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6558,7 +6580,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6954,7 +6978,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7325,7 +7351,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7800,7 +7828,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8170,7 +8200,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8889,7 +8921,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9259,7 +9293,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9863,7 +9899,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10233,7 +10271,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11300,7 +11340,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11683,7 +11725,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11916,7 +11960,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -11945,7 +11989,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine.expected/pull_request.json b/recipes/engine.expected/pull_request.json
index 2152694..dd2ac08 100644
--- a/recipes/engine.expected/pull_request.json
+++ b/recipes/engine.expected/pull_request.json
@@ -634,7 +634,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1112,7 +1114,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1494,7 +1498,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1847,7 +1853,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2229,7 +2237,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3367,7 +3377,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3828,7 +3840,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4238,7 +4252,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4752,7 +4768,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5235,7 +5253,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5718,7 +5738,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6176,7 +6198,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6754,7 +6778,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7134,7 +7160,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7513,7 +7541,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7867,7 +7897,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8449,7 +8481,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8803,7 +8837,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9395,7 +9431,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9749,7 +9787,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10284,7 +10324,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10638,7 +10680,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11230,7 +11274,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11584,7 +11630,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12119,7 +12167,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12473,7 +12523,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13461,7 +13513,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14441,7 +14495,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine.expected/win.json b/recipes/engine.expected/win.json
index 47deec0..deda379 100644
--- a/recipes/engine.expected/win.json
+++ b/recipes/engine.expected/win.json
@@ -636,7 +636,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1043,7 +1045,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1452,7 +1456,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1832,7 +1838,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2185,7 +2193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3166,7 +3176,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3519,7 +3531,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3872,7 +3886,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4225,7 +4241,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4578,7 +4596,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4931,7 +4951,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/engine.expected/win_maven_or_bitcode.json b/recipes/engine.expected/win_maven_or_bitcode.json
index 47deec0..deda379 100644
--- a/recipes/engine.expected/win_maven_or_bitcode.json
+++ b/recipes/engine.expected/win_maven_or_bitcode.json
@@ -636,7 +636,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1043,7 +1045,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1452,7 +1456,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1832,7 +1838,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2185,7 +2193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3166,7 +3176,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3519,7 +3531,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3872,7 +3886,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4225,7 +4241,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4578,7 +4596,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4931,7 +4951,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/engine.expected/win_upload.json b/recipes/engine.expected/win_upload.json
index 077e3c0..9e47a98 100644
--- a/recipes/engine.expected/win_upload.json
+++ b/recipes/engine.expected/win_upload.json
@@ -636,7 +636,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1043,7 +1045,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1452,7 +1456,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1832,7 +1838,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2185,7 +2193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3463,7 +3473,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3816,7 +3828,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4169,7 +4183,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4522,7 +4538,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4875,7 +4893,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5228,7 +5248,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode.json b/recipes/engine.expected/win_upload_maven_or_bitcode.json
index 077e3c0..9e47a98 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode.json
@@ -636,7 +636,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1043,7 +1045,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1452,7 +1456,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1832,7 +1838,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2185,7 +2193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3463,7 +3473,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3816,7 +3828,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4169,7 +4183,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4522,7 +4538,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4875,7 +4893,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5228,7 +5248,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json b/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
index a400e3a..eb42b6b 100644
--- a/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
@@ -518,7 +518,9 @@
       "--buildbot-buildername",
       "Linux Drone",
       "--buildbot-mastername",
-      "client.flutter"
+      "client.flutter",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -581,7 +583,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -596,7 +598,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine_builder_v1_17_0.expected/Schedule two builds one with goma and one without.json b/recipes/engine_builder_v1_17_0.expected/Schedule two builds one with goma and one without.json
index a400e3a..eb42b6b 100644
--- a/recipes/engine_builder_v1_17_0.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine_builder_v1_17_0.expected/Schedule two builds one with goma and one without.json
@@ -518,7 +518,9 @@
       "--buildbot-buildername",
       "Linux Drone",
       "--buildbot-mastername",
-      "client.flutter"
+      "client.flutter",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -581,7 +583,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -596,7 +598,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine_v1_17_0.expected/Linux Fuchsia failing test.json b/recipes/engine_v1_17_0.expected/Linux Fuchsia failing test.json
index 37c9887..79d4086 100644
--- a/recipes/engine_v1_17_0.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine_v1_17_0.expected/Linux Fuchsia failing test.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3446,7 +3456,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3940,7 +3952,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4585,7 +4599,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5199,7 +5215,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5813,7 +5831,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6501,7 +6521,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7183,7 +7205,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7562,7 +7586,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7940,7 +7966,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8293,7 +8321,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9039,7 +9069,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9392,7 +9424,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10182,7 +10216,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10535,7 +10571,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11234,7 +11272,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11587,7 +11627,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12377,7 +12419,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12730,7 +12774,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13429,7 +13475,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13782,7 +13830,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/clobber.json b/recipes/engine_v1_17_0.expected/clobber.json
index a92d5e1..d146890 100644
--- a/recipes/engine_v1_17_0.expected/clobber.json
+++ b/recipes/engine_v1_17_0.expected/clobber.json
@@ -647,7 +647,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1125,7 +1127,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1507,7 +1511,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1860,7 +1866,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2242,7 +2250,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3170,7 +3180,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3632,7 +3644,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4146,7 +4160,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4629,7 +4645,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5112,7 +5130,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5570,7 +5590,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6148,7 +6170,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6528,7 +6552,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6907,7 +6933,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7261,7 +7289,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7843,7 +7873,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8197,7 +8229,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8789,7 +8823,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9143,7 +9179,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9678,7 +9716,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10032,7 +10072,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10624,7 +10666,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10978,7 +11022,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11513,7 +11559,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11867,7 +11915,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12855,7 +12905,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13823,7 +13875,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/experimental.json b/recipes/engine_v1_17_0.expected/experimental.json
index ded8315..86b604c 100644
--- a/recipes/engine_v1_17_0.expected/experimental.json
+++ b/recipes/engine_v1_17_0.expected/experimental.json
@@ -632,7 +632,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1110,7 +1112,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1492,7 +1496,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1845,7 +1851,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2227,7 +2235,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3155,7 +3165,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3617,7 +3629,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4131,7 +4145,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4614,7 +4630,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5097,7 +5115,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5555,7 +5575,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6133,7 +6155,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6513,7 +6537,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6892,7 +6918,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7246,7 +7274,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7828,7 +7858,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8182,7 +8214,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8774,7 +8808,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9128,7 +9164,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9663,7 +9701,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10017,7 +10057,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10609,7 +10651,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10963,7 +11007,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11498,7 +11544,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11852,7 +11900,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12832,7 +12882,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13766,7 +13818,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/experimental_upload.json b/recipes/engine_v1_17_0.expected/experimental_upload.json
index fdd0c0b..a4916af 100644
--- a/recipes/engine_v1_17_0.expected/experimental_upload.json
+++ b/recipes/engine_v1_17_0.expected/experimental_upload.json
@@ -632,7 +632,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1110,7 +1112,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1492,7 +1496,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1845,7 +1851,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2227,7 +2235,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3452,7 +3462,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3947,7 +3959,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4593,7 +4607,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5208,7 +5224,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5823,7 +5841,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6512,7 +6532,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7195,7 +7217,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7575,7 +7599,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7954,7 +7980,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8308,7 +8336,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9055,7 +9085,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9409,7 +9441,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10200,7 +10234,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10554,7 +10590,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11254,7 +11292,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11608,7 +11648,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12399,7 +12441,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12753,7 +12797,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13453,7 +13499,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13807,7 +13855,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -15150,7 +15200,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -16084,7 +16136,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/linux.json b/recipes/engine_v1_17_0.expected/linux.json
index 6494a22..86591e4 100644
--- a/recipes/engine_v1_17_0.expected/linux.json
+++ b/recipes/engine_v1_17_0.expected/linux.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3149,7 +3159,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3610,7 +3622,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4123,7 +4137,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4605,7 +4621,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5087,7 +5105,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5544,7 +5564,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6121,7 +6143,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6500,7 +6524,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6878,7 +6904,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7231,7 +7259,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7812,7 +7842,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8165,7 +8197,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8756,7 +8790,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9109,7 +9145,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9643,7 +9681,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9996,7 +10036,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10587,7 +10629,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10940,7 +10984,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11474,7 +11520,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11827,7 +11875,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12806,7 +12856,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13136,7 +13188,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -13165,7 +13217,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -13248,7 +13300,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -13277,7 +13329,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -13739,7 +13791,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/linux_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/linux_maven_or_bitcode.json
index 6494a22..86591e4 100644
--- a/recipes/engine_v1_17_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/linux_maven_or_bitcode.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3149,7 +3159,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3610,7 +3622,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4123,7 +4137,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4605,7 +4621,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5087,7 +5105,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5544,7 +5564,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6121,7 +6143,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6500,7 +6524,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6878,7 +6904,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7231,7 +7259,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7812,7 +7842,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8165,7 +8197,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8756,7 +8790,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9109,7 +9145,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9643,7 +9681,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9996,7 +10036,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10587,7 +10629,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10940,7 +10984,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11474,7 +11520,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11827,7 +11875,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12806,7 +12856,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13136,7 +13188,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -13165,7 +13217,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -13248,7 +13300,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -13277,7 +13329,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -13739,7 +13791,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/linux_upload.json b/recipes/engine_v1_17_0.expected/linux_upload.json
index a364350..7c2e331 100644
--- a/recipes/engine_v1_17_0.expected/linux_upload.json
+++ b/recipes/engine_v1_17_0.expected/linux_upload.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3446,7 +3456,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3940,7 +3952,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4585,7 +4599,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5199,7 +5215,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5813,7 +5831,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6501,7 +6521,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7183,7 +7205,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7562,7 +7586,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7940,7 +7966,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8293,7 +8321,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9039,7 +9069,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9392,7 +9424,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10182,7 +10216,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10535,7 +10571,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11234,7 +11272,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11587,7 +11627,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12377,7 +12419,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12730,7 +12774,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13429,7 +13475,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13782,7 +13830,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -15124,7 +15174,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -15454,7 +15506,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -15483,7 +15535,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -15566,7 +15618,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -15595,7 +15647,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -16057,7 +16109,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/linux_upload_maven_or_bitcode.json
index a824636..11bf34d 100644
--- a/recipes/engine_v1_17_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/linux_upload_maven_or_bitcode.json
@@ -631,7 +631,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1108,7 +1110,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1489,7 +1493,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1841,7 +1847,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2222,7 +2230,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3446,7 +3456,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3940,7 +3952,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4519,7 +4533,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5067,7 +5083,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5615,7 +5633,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6138,7 +6158,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6820,7 +6842,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7199,7 +7223,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7577,7 +7603,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7930,7 +7958,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8610,7 +8640,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8963,7 +8995,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9687,7 +9721,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10040,7 +10076,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10673,7 +10711,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11026,7 +11066,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11750,7 +11792,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12103,7 +12147,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12736,7 +12782,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13089,7 +13137,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14167,7 +14217,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14497,7 +14549,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -14526,7 +14578,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -14609,7 +14661,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -14638,7 +14690,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -15100,7 +15152,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Linux Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Linux Engine"
+      "Linux Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/mac.json b/recipes/engine_v1_17_0.expected/mac.json
index d882aba..cb153a4 100644
--- a/recipes/engine_v1_17_0.expected/mac.json
+++ b/recipes/engine_v1_17_0.expected/mac.json
@@ -810,7 +810,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1191,7 +1193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1543,7 +1547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1924,7 +1930,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2919,7 +2927,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3432,7 +3442,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3785,7 +3797,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4138,7 +4152,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4491,7 +4507,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4844,7 +4862,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5197,7 +5217,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6030,7 +6052,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6426,7 +6450,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8339,7 +8365,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8722,7 +8750,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8939,7 +8969,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -8968,7 +8998,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine_v1_17_0.expected/mac_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/mac_maven_or_bitcode.json
index aac0e88..e5b09af 100644
--- a/recipes/engine_v1_17_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/mac_maven_or_bitcode.json
@@ -810,7 +810,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1191,7 +1193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1543,7 +1547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1924,7 +1930,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2919,7 +2927,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3432,7 +3442,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3785,7 +3797,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4138,7 +4152,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4491,7 +4507,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4844,7 +4862,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5197,7 +5217,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6030,7 +6052,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6426,7 +6450,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6901,7 +6927,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7271,7 +7299,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7920,7 +7950,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8290,7 +8322,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8859,7 +8893,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9229,7 +9265,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10226,7 +10264,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10609,7 +10649,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10826,7 +10868,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -10855,7 +10897,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine_v1_17_0.expected/mac_upload.json b/recipes/engine_v1_17_0.expected/mac_upload.json
index 7f515b5..8c884d5 100644
--- a/recipes/engine_v1_17_0.expected/mac_upload.json
+++ b/recipes/engine_v1_17_0.expected/mac_upload.json
@@ -810,7 +810,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1191,7 +1193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1543,7 +1547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1924,7 +1930,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3249,7 +3257,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3762,7 +3772,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4115,7 +4127,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4468,7 +4482,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4821,7 +4837,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5174,7 +5192,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5527,7 +5547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6558,7 +6580,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6954,7 +6978,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9112,7 +9138,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9495,7 +9523,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9712,7 +9742,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -9741,7 +9771,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine_v1_17_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/mac_upload_maven_or_bitcode.json
index 3da7288..e8e18d1 100644
--- a/recipes/engine_v1_17_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/mac_upload_maven_or_bitcode.json
@@ -810,7 +810,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1191,7 +1193,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1543,7 +1547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1924,7 +1930,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3249,7 +3257,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3762,7 +3772,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4115,7 +4127,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4468,7 +4482,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4821,7 +4837,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5174,7 +5192,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5527,7 +5547,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6558,7 +6580,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6954,7 +6978,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7429,7 +7455,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7799,7 +7827,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8518,7 +8548,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8888,7 +8920,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9492,7 +9526,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9862,7 +9898,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10929,7 +10967,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11312,7 +11352,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Mac Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Mac Engine"
+      "Mac Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11529,7 +11571,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -11558,7 +11600,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine_v1_17_0.expected/pull_request.json b/recipes/engine_v1_17_0.expected/pull_request.json
index c8d496c..07fb7e0 100644
--- a/recipes/engine_v1_17_0.expected/pull_request.json
+++ b/recipes/engine_v1_17_0.expected/pull_request.json
@@ -634,7 +634,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1112,7 +1114,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1494,7 +1498,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1847,7 +1853,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2229,7 +2237,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3157,7 +3167,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3619,7 +3631,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4133,7 +4147,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4616,7 +4632,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5099,7 +5117,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -5557,7 +5577,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6135,7 +6157,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6515,7 +6539,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -6894,7 +6920,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7248,7 +7276,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7830,7 +7860,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8184,7 +8216,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8776,7 +8810,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9130,7 +9166,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9665,7 +9703,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10019,7 +10059,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10611,7 +10653,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -10965,7 +11009,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11500,7 +11546,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -11854,7 +11902,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -12842,7 +12892,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13776,7 +13828,9 @@
       "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
-      "Linux Host Engine"
+      "Linux Host Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/win.json b/recipes/engine_v1_17_0.expected/win.json
index 27d475d..9be407b 100644
--- a/recipes/engine_v1_17_0.expected/win.json
+++ b/recipes/engine_v1_17_0.expected/win.json
@@ -636,7 +636,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1045,7 +1047,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1425,7 +1429,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1778,7 +1784,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2759,7 +2767,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3112,7 +3122,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3465,7 +3477,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3818,7 +3832,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4171,7 +4187,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4524,7 +4542,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/win_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/win_maven_or_bitcode.json
index 27d475d..9be407b 100644
--- a/recipes/engine_v1_17_0.expected/win_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/win_maven_or_bitcode.json
@@ -636,7 +636,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1045,7 +1047,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1425,7 +1429,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1778,7 +1784,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2759,7 +2767,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3112,7 +3122,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3465,7 +3477,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3818,7 +3832,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4171,7 +4187,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4524,7 +4542,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/win_upload.json b/recipes/engine_v1_17_0.expected/win_upload.json
index 01ce2c7..37636f8 100644
--- a/recipes/engine_v1_17_0.expected/win_upload.json
+++ b/recipes/engine_v1_17_0.expected/win_upload.json
@@ -636,7 +636,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1045,7 +1047,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1425,7 +1429,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1778,7 +1784,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3056,7 +3064,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3409,7 +3419,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3762,7 +3774,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4115,7 +4129,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4468,7 +4484,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4821,7 +4839,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/engine_v1_17_0.expected/win_upload_maven_or_bitcode.json b/recipes/engine_v1_17_0.expected/win_upload_maven_or_bitcode.json
index 01ce2c7..37636f8 100644
--- a/recipes/engine_v1_17_0.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine_v1_17_0.expected/win_upload_maven_or_bitcode.json
@@ -636,7 +636,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1045,7 +1047,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1425,7 +1429,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1778,7 +1784,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3056,7 +3064,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3409,7 +3419,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3762,7 +3774,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4115,7 +4129,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4468,7 +4484,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4821,7 +4839,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"Win Engine\", \"project\": \"flutter\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "Win Engine"
+      "Win Engine",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/flutter.expected/linux_master.json b/recipes/flutter.expected/linux_master.json
index 809b1c8..c807632 100644
--- a/recipes/flutter.expected/linux_master.json
+++ b/recipes/flutter.expected/linux_master.json
@@ -465,7 +465,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -492,7 +492,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -578,7 +578,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -605,7 +605,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/flutter.expected/linux_master_coverage_.json b/recipes/flutter.expected/linux_master_coverage_.json
index 121dcc7..d9cf8a1 100644
--- a/recipes/flutter.expected/linux_master_coverage_.json
+++ b/recipes/flutter.expected/linux_master_coverage_.json
@@ -454,7 +454,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -480,7 +480,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -564,7 +564,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -590,7 +590,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/flutter.expected/linux_master_coverage__upload.json b/recipes/flutter.expected/linux_master_coverage__upload.json
index ef1f4bf..ffcde50 100644
--- a/recipes/flutter.expected/linux_master_coverage__upload.json
+++ b/recipes/flutter.expected/linux_master_coverage__upload.json
@@ -454,7 +454,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -480,7 +480,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -564,7 +564,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -590,7 +590,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/flutter.expected/linux_master_upload.json b/recipes/flutter.expected/linux_master_upload.json
index 2b4a82b..50b5ed1 100644
--- a/recipes/flutter.expected/linux_master_upload.json
+++ b/recipes/flutter.expected/linux_master_upload.json
@@ -454,7 +454,7 @@
       "-root",
       "[CACHE]/isolated_client",
       "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
+      "infra/tools/luci/isolated/${platform} isolated_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -480,7 +480,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-isolated_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -564,7 +564,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -590,7 +590,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/web_engine.expected/linux-post-submit.json b/recipes/web_engine.expected/linux-post-submit.json
index c2f65f8..4727c11 100644
--- a/recipes/web_engine.expected/linux-post-submit.json
+++ b/recipes/web_engine.expected/linux-post-submit.json
@@ -483,7 +483,9 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci"
+      "--is-luci",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/web_engine.expected/linux-pre-submit.json b/recipes/web_engine.expected/linux-pre-submit.json
index 92bab3d..c9310e7 100644
--- a/recipes/web_engine.expected/linux-pre-submit.json
+++ b/recipes/web_engine.expected/linux-pre-submit.json
@@ -498,7 +498,9 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci"
+      "--is-luci",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/web_engine.expected/mac-post-submit.json b/recipes/web_engine.expected/mac-post-submit.json
index 588b5cc..91aa171 100644
--- a/recipes/web_engine.expected/mac-post-submit.json
+++ b/recipes/web_engine.expected/mac-post-submit.json
@@ -584,7 +584,9 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci"
+      "--is-luci",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/web_engine.expected/windows-post-submit.json b/recipes/web_engine.expected/windows-post-submit.json
index 43826d2..a96e6d5 100644
--- a/recipes/web_engine.expected/windows-post-submit.json
+++ b/recipes/web_engine.expected/windows-post-submit.json
@@ -483,7 +483,9 @@
       "[TMP_BASE]\\crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci"
+      "--is-luci",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
diff --git a/recipes/web_engine_v1_17_0.expected/linux-post-submit.json b/recipes/web_engine_v1_17_0.expected/linux-post-submit.json
index c2f65f8..4727c11 100644
--- a/recipes/web_engine_v1_17_0.expected/linux-post-submit.json
+++ b/recipes/web_engine_v1_17_0.expected/linux-post-submit.json
@@ -483,7 +483,9 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci"
+      "--is-luci",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/web_engine_v1_17_0.expected/linux-pre-submit.json b/recipes/web_engine_v1_17_0.expected/linux-pre-submit.json
index 92bab3d..c9310e7 100644
--- a/recipes/web_engine_v1_17_0.expected/linux-pre-submit.json
+++ b/recipes/web_engine_v1_17_0.expected/linux-pre-submit.json
@@ -498,7 +498,9 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci"
+      "--is-luci",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/web_engine_v1_17_0.expected/mac-post-submit.json b/recipes/web_engine_v1_17_0.expected/mac-post-submit.json
index 588b5cc..91aa171 100644
--- a/recipes/web_engine_v1_17_0.expected/mac-post-submit.json
+++ b/recipes/web_engine_v1_17_0.expected/mac-post-submit.json
@@ -584,7 +584,9 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci"
+      "--is-luci",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/web_engine_v1_17_0.expected/windows-post-submit.json b/recipes/web_engine_v1_17_0.expected/windows-post-submit.json
index 43826d2..a96e6d5 100644
--- a/recipes/web_engine_v1_17_0.expected/windows-post-submit.json
+++ b/recipes/web_engine_v1_17_0.expected/windows-post-submit.json
@@ -483,7 +483,9 @@
       "[TMP_BASE]\\crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci"
+      "--is-luci",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {