diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 1e22adb4f..aec494249 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -16,7 +16,7 @@
   "deps": {
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "04b3acea0bf45c9e1076079998b6378caa5570d2",
+      "revision": "a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md
index a8844e7c3..b74a05f9e 100644
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -1181,25 +1181,25 @@ PYTHON_VERSION_COMPATIBILITY: PY2+3
 
 — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#16)(api):**
 
-[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-assertions
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-commit_position
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-cq
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-led
-[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-milo
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-resultdb
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-time
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-url
-[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/README.recipes.md#recipe_modules-version
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04b3acea0bf45c9e1076079998b6378caa5570d2/recipe_engine/recipe_api.py#886
+[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-assertions
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-commit_position
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-cq
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-led
+[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-milo
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-resultdb
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-time
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-url
+[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/README.recipes.md#recipe_modules-version
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a58dd35fb76ad00a77bd44508f1b6aaafdbb1a2b/recipe_engine/recipe_api.py#886
diff --git a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
index c179c5aa1..c2b411dda 100644
--- a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
@@ -221,7 +221,7 @@
   },
   {
     "cmd": [
-      "vpython",
+      "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
       "--json-output",