diff --git a/cipd_manifest.txt b/cipd_manifest.txt
index 323afa7d3..66b374f01 100644
--- a/cipd_manifest.txt
+++ b/cipd_manifest.txt
@@ -37,4 +37,4 @@ infra/tools/prpc/${platform} git_revision:edd5644be66d37cdf82978efb0e5d6504d0d55
 infra/tools/luci-auth/${platform} git_revision:edd5644be66d37cdf82978efb0e5d6504d0d552f
 
 # LUCI Buildbucket CLI
-infra/tools/bb/${platform} git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+infra/tools/bb/${platform} git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
diff --git a/cipd_manifest.versions b/cipd_manifest.versions
index 94fdf7c9f..08e9c4f63 100644
--- a/cipd_manifest.versions
+++ b/cipd_manifest.versions
@@ -2,56 +2,56 @@
 # Do not modify manually. All changes will be overwritten.
 
 infra/tools/bb/linux-386
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	mPwoDv1jAOnI6IrgKLik9VsIGR1nmwD9BcgiNfpSzA8C
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	G7atvrSPcroX-5haKy6fEUXXkpSw7hSDxSz0-CH8WnsC
 
 infra/tools/bb/linux-amd64
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	2wMQ5j_ByIl56Eq3j8u6kN_mQON5GGdCBWHKE4YIKDEC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	Orm-aYhVAiNt2HpBJfu8AJwg2WFJVItcXoyMEGfWTlIC
 
 infra/tools/bb/linux-arm64
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	0-5oMrOVGiEJWTxR9jY8pKLv_ffThuYybmdrKhQChCcC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	2Du2_EbnjDvj5VqOvA95H_t4wuAcQ80QC7bxqdQB2R0C
 
 infra/tools/bb/linux-armv6l
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	JL8_joC43BLGHsdPGR5f5TwGM00Y7NPT_zuqrsTDLi8C
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	Ft4Ldo4EabXn-myg-X76zT4_Sn_l8GB4Z87VLBT4wzAC
 
 infra/tools/bb/linux-mips64
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	fn1456KC8ezsgvQmlW1D8Q1T7u6yHXkCRBNCVwmecPEC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	4cgFd53ZdXqdt8EPsWV8HRag20iArQi4aN_6HR8FAz4C
 
 infra/tools/bb/linux-mips64le
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	ifekKtHB94cXgccpNOe9iPVRL4idOPAIloSKEwbUPtoC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	gX_ePGolsnkMCKA_FNpM9Z8f5RuTGBbaq10vHlK1LVYC
 
 infra/tools/bb/linux-mipsle
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	l1nvhdR1pYh59T4skedAejQ_kmXG9CIgnJmizIu8W1MC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	v3utjvUmWzn75tmlg-PYFL7PSwFQ3zDaqcWyPJwcmBcC
 
 infra/tools/bb/linux-ppc64
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	GTGT_OIBGiYxP6lb-0j-DP23X3Xlf99TG_leUNeeSyYC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	5wBR3JwuFG_-tZ-om-JnGkQifmG0YsVV_3fMp0uDdRkC
 
 infra/tools/bb/linux-ppc64le
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	zGq06mfS4zadQrd5RuCbf3ofv1mPJXQawAh9X-77ZhcC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	8oMIA9rIybPtXl7SzqQbOXVyjUMp90udZSqKys35ibIC
 
 infra/tools/bb/linux-s390x
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	wugZfzRY-uA5dj3k-PuWKaL2AivjzduVDwaQN1jtbsYC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	jof9K-baEvuYIMxZmiiOWc7YgBTWQLph2OIIj9eEndwC
 
 infra/tools/bb/mac-amd64
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	EfjHvgv9SLiyjziwWJv1Thr8ZNwR9OjY8gMKPflIbMwC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	nhPDa7Lc3lAW53NMjoSobzKyKq-7c4RQzPhEqmM1Hl0C
 
 infra/tools/bb/windows-386
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	upzKAIlXjpJo64ai4pL9orgWye-pxmIeUCLA_v8496AC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	juXw7qkywl8XfoXUVUzmbqLmH7L221ZJrjSbl3YfQxcC
 
 infra/tools/bb/windows-amd64
-	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
-	1SDEYRowxYupUnZU_aPlbNayPslK3IvSRhQ0s9TK5jkC
+	git_revision:8cd86fd0ecb15b4169d14f889c911f82e37996d5
+	8VLXB7qBmDL7T0DUpKXKJueP8HDbgZTchgvzCA643VUC
 
 infra/tools/luci-auth/linux-386
 	git_revision:edd5644be66d37cdf82978efb0e5d6504d0d552f