diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index f573e0ecf2..03b14e22ce 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -762,6 +762,7 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str
 // dependency.
 func recreateSKPs(b *specs.TasksCfgBuilder, name string) string {
 	task := kitchenTask(name, "recreate_skps", "swarm_recipe.isolate", SERVICE_ACCOUNT_RECREATE_SKPS, linuxGceDimensions(), nil, OUTPUT_NONE)
+	task.CipdPackages = append(task.CipdPackages, CIPD_PKGS_GIT...)
 	task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go"))
 	task.ExecutionTimeout = 4 * time.Hour
 	task.IoTimeout = 4 * time.Hour // With kitchen, step logs don't count toward IoTimeout.
@@ -809,6 +810,7 @@ func housekeeper(b *specs.TasksCfgBuilder, name, compileTaskName string) string
 // in the generated chain of tasks, which the Job should add as a dependency.
 func bookmaker(b *specs.TasksCfgBuilder, name, compileTaskName string) string {
 	task := kitchenTask(name, "bookmaker", "swarm_recipe.isolate", SERVICE_ACCOUNT_BOOKMAKER, linuxGceDimensions(), nil, OUTPUT_NONE)
+	task.CipdPackages = append(task.CipdPackages, CIPD_PKGS_GIT...)
 	task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go"))
 	task.Dependencies = append(task.Dependencies, compileTaskName)
 	task.ExecutionTimeout = 2 * time.Hour
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index fb7fa5b2cc..48521324e5 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -14878,6 +14878,21 @@
           "path": "cipd_bin_packages",
           "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82"
         },
+        {
+          "name": "infra/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "version:2.15.0.chromium12"
+        },
+        {
+          "name": "infra/tools/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b"
+        },
+        {
+          "name": "infra/tools/luci/git-credential-luci/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82"
+        },
         {
           "name": "skia/bots/go",
           "path": "go",
@@ -14973,6 +14988,21 @@
           "path": "cipd_bin_packages",
           "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82"
         },
+        {
+          "name": "infra/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "version:2.15.0.chromium12"
+        },
+        {
+          "name": "infra/tools/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b"
+        },
+        {
+          "name": "infra/tools/luci/git-credential-luci/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82"
+        },
         {
           "name": "skia/bots/go",
           "path": "go",
@@ -15278,6 +15308,21 @@
           "path": "cipd_bin_packages",
           "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82"
         },
+        {
+          "name": "infra/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "version:2.15.0.chromium12"
+        },
+        {
+          "name": "infra/tools/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b"
+        },
+        {
+          "name": "infra/tools/luci/git-credential-luci/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82"
+        },
         {
           "name": "skia/bots/go",
           "path": "go",
@@ -15743,6 +15788,21 @@
           "path": "cipd_bin_packages",
           "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82"
         },
+        {
+          "name": "infra/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "version:2.15.0.chromium12"
+        },
+        {
+          "name": "infra/tools/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b"
+        },
+        {
+          "name": "infra/tools/luci/git-credential-luci/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82"
+        },
         {
           "name": "skia/bots/go",
           "path": "go",
diff --git a/infra/bots/upload_skps.py b/infra/bots/upload_skps.py
index b7bb0cfb6f..ba472d2ff6 100644
--- a/infra/bots/upload_skps.py
+++ b/infra/bots/upload_skps.py
@@ -35,7 +35,7 @@ def main(target_dir):
          'gen_tasks.go failed, not uploading SKP update:\n\n%s' % e.output)
       sys.exit(1)
 
-    # Upload the new version, land the update CL as the update-skps user.
+    # Upload the new version, land the update CL as the recreate-skps user.
     with git_utils.GitBranch(branch_name='update_skp_version',
                              commit_msg=COMMIT_MSG,
                              commit_queue=True):